From e0ee76f8c3dc9efb6a5854ecca090fc92c71aa06 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 23 Apr 2014 15:40:17 +0200 Subject: [PATCH] Use previous animation's time scale for the mixing duration. --- .../src/com/esotericsoftware/spine/AnimationState.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java index 637ad2589..3508e8c13 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -59,11 +59,11 @@ public class AnimationState { TrackEntry current = tracks.get(i); if (current == null) continue; - float trackDelta = delta * current.timeScale; - current.time += trackDelta; + current.time += delta * current.timeScale; if (current.previous != null) { - current.previous.time += delta * current.previous.timeScale; - current.mixTime += trackDelta; + float previousDelta = delta * current.previous.timeScale; + current.previous.time += previousDelta; + current.mixTime += previousDelta; } TrackEntry next = current.next;