From 7e921412155189e713b5eb42a8b8d94e1d7f9eb5 Mon Sep 17 00:00:00 2001 From: Davide Tantillo Date: Tue, 10 Dec 2024 14:14:21 +0100 Subject: [PATCH] [ts] Port of commit 8d058fb: Improved AnimationState behavior when paused. See #2705. --- spine-ts/spine-core/src/AnimationState.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/spine-ts/spine-core/src/AnimationState.ts b/spine-ts/spine-core/src/AnimationState.ts index bcfd6628c..60fadbe86 100644 --- a/spine-ts/spine-core/src/AnimationState.ts +++ b/spine-ts/spine-core/src/AnimationState.ts @@ -138,16 +138,18 @@ export class AnimationState { from.animationLast = from.nextAnimationLast; from.trackLast = from.nextTrackLast; - // Require mixTime > 0 to ensure the mixing from entry was applied at least once. - if (to.mixTime > 0 && to.mixTime >= to.mixDuration) { - // Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame). - if (from.totalAlpha == 0 || to.mixDuration == 0) { - to.mixingFrom = from.mixingFrom; - if (from.mixingFrom) from.mixingFrom.mixingTo = to; - to.interruptAlpha = from.interruptAlpha; - this.queue.end(from); + if (to.nextTrackLast != -1) { // The from entry was applied at least once. + const discard = to.mixTime == 0 && from.mixTime == 0; // Discard the from entry when neither have advanced yet. + if (to.mixTime >= to.mixDuration || discard) { + // 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; + if (from.mixingFrom != null) from.mixingFrom.mixingTo = to; + to.interruptAlpha = from.interruptAlpha; + this.queue.end(from); + } + return finished; } - return finished; } from.trackTime += delta * from.timeScale;