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

[libgdx] During mix, use timeScale from the most current animation.

Browse Source
This commit is contained in:
NathanSweet 2016-11-22 17:49:49 +01:00
parent 65982c7eca
commit 40cbe8620d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,9 +142,8 @@ public class AnimationState {
from.animationLast = from.nextAnimationLast;
from.trackLast = from.nextTrackLast;
float mixingFromDelta = delta * from.timeScale;
from.trackTime += mixingFromDelta;
entry.mixTime += mixingFromDelta;
from.trackTime += delta * from.timeScale;
entry.mixTime += delta * entry.timeScale;
updateMixingFrom(from, delta, canEnd && from.alpha == 1);
}