UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed animation not being mixed out in some cases.

Browse Source 
Repro, with any animation playing:
state.setAnimation(0, "shoot", true).setMixDuration(0.2f);
state.apply(skeleton);

Reverts 8d058fb4f4479a041fce1ff3379ba794856c9a3c. We can't know when it's safe to discard a queued animation. Users should avoid queuing animations they don't actually want.

Prefer `to.nextTrackLast != -1` for "was applied", as `to.mixTime > 0` is user writable and not quite the same.
This commit is contained in:
Nathan Sweet 2025-03-13 12:45:38 -04:00
parent 18d30af5a9
commit f1e0f0f728
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -180,11 +180,10 @@ public class AnimationState {
from.animationLast = from.nextAnimationLast; from.animationLast = from.nextAnimationLast;
from.trackLast = from.nextTrackLast; from.trackLast = from.nextTrackLast;
if (to.nextTrackLast != -1) { // The from entry was applied at least once. // The from entry was applied at least once and the mix is complete.
boolean discard = to.mixTime == 0 && from.mixTime == 0; // Discard the from entry when neither have advanced yet. if (to.nextTrackLast != -1 && to.mixTime >= to.mixDuration) {
if (to.mixTime >= to.mixDuration || discard) { // Mixing is complete for all entries before the from entry or the mix is instantaneous.
// Require totalAlpha == 0 to ensure mixing is complete or the transition is a single frame or discarded. if (from.totalAlpha == 0 || to.mixDuration == 0) {
if (from.totalAlpha == 0 || to.mixDuration == 0 || discard) {
to.mixingFrom = from.mixingFrom; to.mixingFrom = from.mixingFrom;
if (from.mixingFrom != null) from.mixingFrom.mixingTo = to; if (from.mixingFrom != null) from.mixingFrom.mixingTo = to;
to.interruptAlpha = from.interruptAlpha; to.interruptAlpha = from.interruptAlpha;
@ -192,7 +191,6 @@ public class AnimationState {
} }
return finished; return finished;
} }
}
from.trackTime += delta * from.timeScale; from.trackTime += delta * from.timeScale;
to.mixTime += delta; to.mixTime += delta;