浏览代码

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

NathanSweet 8 年之前
父节点
当前提交
40cbe8620d
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

+ 2 - 3
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -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);
 	}