Merge pull request #53 from bitfeed-project/v2.3.3

2.3.3 pre-release changes
bitfeed-project · Jun 11, 2022 · e3b5e75 · e3b5e75
2 parents 6fb78ec + aa8f1cc
commit e3b5e75
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/client/src/models/TxBlockScene.js b/client/src/models/TxBlockScene.js
@@ -97,7 +97,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
           color: tx.getColor('block', this.colorMode).color
         },
         duration: this.laidOut ? 1000 : 2000,
-        delay: 50,
+        delay: 200,
         jitter: this.laidOut ? 500 : 1500,
         smooth: true,
         state: 'block'
@@ -125,14 +125,14 @@ export default class TxBlockScene extends TxMondrianPoolScene {
         state: 'ready'
       })
     } else {
-      const jitter = (Math.random() * 1200)
+      const jitter = (Math.random() * 1500)
       tx.view.update({
         display: {
           position: {
             r: oldRadius + Math.max(2, oldRadius * 0.2)
           },
         },
-        delay: 50 + jitter,
+        delay: 200 + jitter,
         start: now,
         duration: 750,
         smooth: true,
@@ -143,7 +143,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
           color: ice(tx.colors[this.colorMode].block.color),
         },
         start: now,
-        delay: 50 + jitter,
+        delay: 200 + jitter,
         duration: 500,
       })
     }
@@ -180,7 +180,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
       },
       start,
       duration: 2000,
-      delay: 100,
+      delay: 200,
       jitter: 500,
       smooth: true,
     })
@@ -217,7 +217,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
           alpha: 0
         }
       },
-      delay: 100,
+      delay: 200,
       start,
       jitter: 500,
       duration: 2000,

diff --git a/client/src/models/TxPoolScene.js b/client/src/models/TxPoolScene.js
@@ -92,7 +92,7 @@ export default class TxPoolScene {
   }
 
   clearOffscreenTx (tx) {
-    if (tx.pixelPosition && (tx.pixelPosition.y + tx.pixelPosition.r) < -(this.scene.offset.y + 100)) {
+    if (tx.pixelPosition && (tx.pixelPosition.y + tx.pixelPosition.r) < -(this.scene.offset.y + 50)) {
       this.controller.destroyTx(tx.id)
     }
   }
@@ -114,9 +114,9 @@ export default class TxPoolScene {
           position: tx.screenPosition
         },
         duration: 1000,
-        minDuration: 500,
+        minDuration: 200,
         start: now,
-        delay: 50,
+        delay: 0,
         smooth: true,
         adjust: true
       })

diff --git a/client/src/models/TxSprite.js b/client/src/models/TxSprite.js
@@ -22,7 +22,16 @@ function interpolateAttributeStart(attribute, now, modular) {
     // transition in progress
     // (interpolate)
     const progress = (now - attribute.t)
-    const delta = attribute.e ? smootherstep(progress / attribute.d) : (progress / attribute.d)
+    let delta = progress / attribute.d
+    if (attribute.boom) {
+      delta *= 2
+      if (delta > 1) {
+        delta = 2 - delta
+      }
+    }
+    if (attribute.e) {
+      delta = smootherstep(delta)
+    }
     if (modular && Math.abs(attribute.a - attribute.b) > 0.5) {
       if (attribute.a > 0.5) {
         attribute.a -= 1