Browse Source

[as3] Ported latest AnimationState changes. See #792

badlogic 8 years ago
parent
commit
ee9b03bc9d

BIN
spine-as3/spine-as3-example/lib/spine-as3.swc


+ 2 - 2
spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -366,7 +366,7 @@ public class AnimationState {
 			from.timelinesRotation.length = 0;
 			from.timelinesRotation.length = 0;
 
 
 			// If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
 			// If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
-			if (from.mixingFrom != null) current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
+			if (from.mixingFrom != null && from.mixDuration > 0) current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
 		}
 		}
 
 
 		queue.start(current);
 		queue.start(current);
@@ -485,7 +485,7 @@ public class AnimationState {
 		entry.trackTime = 0;
 		entry.trackTime = 0;
 		entry.trackLast = -1;
 		entry.trackLast = -1;
 		entry.nextTrackLast = -1;
 		entry.nextTrackLast = -1;
-		entry.trackEnd = loop ? int.MAX_VALUE : entry.animationEnd;
+		entry.trackEnd = int.MAX_VALUE;
 		entry.timeScale = 1;
 		entry.timeScale = 1;
 
 
 		entry.alpha = 1;
 		entry.alpha = 1;

BIN
spine-starling/spine-starling-example/lib/spine-as3.swc


BIN
spine-starling/spine-starling/lib/spine-as3.swc