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

Fixed mixing two animations using different time scales.

Browse Source
This commit is contained in:
NathanSweet 2014-04-23 15:35:58 +02:00
parent 52a4114d7a
commit 2c5db07f07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ public class AnimationState {
float trackDelta = delta * current.timeScale; float trackDelta = delta * current.timeScale;
current.time += trackDelta; current.time += trackDelta;
if (current.previous != null) { if (current.previous != null) {
current.previous.time += trackDelta; current.previous.time += delta * current.previous.timeScale;
current.mixTime += trackDelta; current.mixTime += trackDelta;
} }