UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Port of commit 8d058fb: Improved AnimationState behavior when paused. See #2705.

Browse Source
This commit is contained in:
Davide Tantillo 2024-12-10 14:14:21 +01:00
parent e9cce58a1f
commit 7e92141215
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-ts/spine-core/src/AnimationState.ts
View File

@ -138,17 +138,19 @@ export class AnimationState {
from.animationLast = from.nextAnimationLast; from.animationLast = from.nextAnimationLast;
from.trackLast = from.nextTrackLast; from.trackLast = from.nextTrackLast;
// Require mixTime > 0 to ensure the mixing from entry was applied at least once. if (to.nextTrackLast != -1) { // The from entry was applied at least once.
if (to.mixTime > 0 && to.mixTime >= to.mixDuration) { const discard = to.mixTime == 0 && from.mixTime == 0; // Discard the from entry when neither have advanced yet.
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame). if (to.mixTime >= to.mixDuration || discard) {
if (from.totalAlpha == 0 || to.mixDuration == 0) { // Require totalAlpha == 0 to ensure mixing is complete or the transition is a single frame or discarded.
if (from.totalAlpha == 0 || to.mixDuration == 0 || discard) {
to.mixingFrom = from.mixingFrom; to.mixingFrom = from.mixingFrom;
if (from.mixingFrom) from.mixingFrom.mixingTo = to; if (from.mixingFrom != null) from.mixingFrom.mixingTo = to;
to.interruptAlpha = from.interruptAlpha; to.interruptAlpha = from.interruptAlpha;
this.queue.end(from); this.queue.end(from);
} }
return finished; return finished;
} }
}
from.trackTime += delta * from.timeScale; from.trackTime += delta * from.timeScale;
to.mixTime += delta; to.mixTime += delta;