Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix animatable loop #13196

Merged
merged 9 commits into from
Nov 3, 2022
Merged

Fix animatable loop #13196

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dce2c8f
fix alpha in glow layer
sebavan Oct 27, 2022
1c351e0
revert
sebavan Oct 27, 2022
91c3ec8
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
sebavan Oct 30, 2022
e59f35e
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
sebavan Oct 31, 2022
a9ee0c6
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
sebavan Nov 1, 2022
dd756db
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
sebavan Nov 2, 2022
0f37312
Fix animatable loop
sebavan Nov 3, 2022
a0a6e7a
Merge branch 'master' of https://github.com/sebavan/Babylon.js
sebavan Nov 3, 2022
11b185c
Fix
sebavan Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/dev/core/src/Animations/animatable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ export class Animatable {
animation._prepareForSpeedRatioChange(value);
}
this._speedRatio = value;

// Resync _manualJumpDelay in case goToFrame was called before speedRatio was set.
const runtimeAnimations = this._runtimeAnimations;
if (runtimeAnimations[0] && this._frameToSyncFromJump !== null) {
const fps = runtimeAnimations[0].animation.framePerSecond;
const delay = this.speedRatio === 0 ? 0 : (((runtimeAnimations[0].currentFrame - this._frameToSyncFromJump) / fps) * 1000) / this.speedRatio;
sebavan marked this conversation as resolved.
Show resolved Hide resolved
this._manualJumpDelay = -delay;
}
}

/**
Expand Down