Retropex/bitfeed
1
0
Fork 0
mirror of https://github.com/Retropex/bitfeed.git synced 2025-05-12 19:20:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
2.3.3 pre-release changes
This commit is contained in:
Mononaut 2022-06-11 18:53:02 +01:00 committed by GitHub
commit e3b5e7519a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/models/TxBlockScene.js
View File

@ -97,7 +97,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
color: tx.getColor('block', this.colorMode).color color: tx.getColor('block', this.colorMode).color
}, },
duration: this.laidOut ? 1000 : 2000, duration: this.laidOut ? 1000 : 2000,
delay: 50, delay: 200,
jitter: this.laidOut ? 500 : 1500, jitter: this.laidOut ? 500 : 1500,
smooth: true, smooth: true,
state: 'block' state: 'block'
@ -125,14 +125,14 @@ export default class TxBlockScene extends TxMondrianPoolScene {
state: 'ready' state: 'ready'
}) })
} else { } else {
const jitter = (Math.random() * 1200) const jitter = (Math.random() * 1500)
tx.view.update({ tx.view.update({
display: { display: {
position: { position: {
r: oldRadius + Math.max(2, oldRadius * 0.2) r: oldRadius + Math.max(2, oldRadius * 0.2)
}, },
}, },
delay: 50 + jitter, delay: 200 + jitter,
start: now, start: now,
duration: 750, duration: 750,
smooth: true, smooth: true,
@ -143,7 +143,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
color: ice(tx.colors[this.colorMode].block.color), color: ice(tx.colors[this.colorMode].block.color),
}, },
start: now, start: now,
delay: 50 + jitter, delay: 200 + jitter,
duration: 500, duration: 500,
}) })
} }
@ -180,7 +180,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
}, },
start, start,
duration: 2000, duration: 2000,
delay: 100, delay: 200,
jitter: 500, jitter: 500,
smooth: true, smooth: true,
}) })
@ -217,7 +217,7 @@ export default class TxBlockScene extends TxMondrianPoolScene {
alpha: 0 alpha: 0
} }
}, },
delay: 100, delay: 200,
start, start,
jitter: 500, jitter: 500,
duration: 2000, duration: 2000,

6
client/src/models/TxPoolScene.js
View File

@ -92,7 +92,7 @@ export default class TxPoolScene {
} }
clearOffscreenTx (tx) { 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) this.controller.destroyTx(tx.id)
} }
} }
@ -114,9 +114,9 @@ export default class TxPoolScene {
position: tx.screenPosition position: tx.screenPosition
}, },
duration: 1000, duration: 1000,
minDuration: 500, minDuration: 200,
start: now, start: now,
delay: 50, delay: 0,
smooth: true, smooth: true,
adjust: true adjust: true
}) })

11
client/src/models/TxSprite.js
View File

@ -22,7 +22,16 @@ function interpolateAttributeStart(attribute, now, modular) {
// transition in progress // transition in progress
// (interpolate) // (interpolate)
const progress = (now - attribute.t) 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 (modular && Math.abs(attribute.a - attribute.b) > 0.5) {
if (attribute.a > 0.5) { if (attribute.a > 0.5) {
attribute.a -= 1 attribute.a -= 1