Browse Source

[as3] Port fix to AnimationState, see #1092

badlogic 7 years ago
parent
commit
4981aa69b9

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


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

@@ -478,9 +478,9 @@ package spine.animation {
 						if (last.loop)
 						    delay += duration * (1 + (int)(last.trackTime / duration));
 						else
-						    delay += duration;						
+						    delay += Math.max(duration, last.trackTime);						
 					} else
-						delay = 0;
+						delay = last.trackTime;
 				}
 			}
 

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


+ 1 - 1
spine-starling/spine-starling-example/src/spine/examples/OwlExample.as

@@ -52,7 +52,7 @@ package spine.examples {
 			up = skeleton.state.setAnimationByName(4, "up", true);
 			down = skeleton.state.setAnimationByName(5, "down", true);
 			
-			left.alpha = right.alpha = up.alpha = down.alpha = 0;
+			left.alpha = right.alpha = up.alpha = down.alpha = 0;			
 			left.mixBlend = right.mixBlend = up.mixBlend = down.mixBlend = MixBlend.add;
 			
 			skeleton.state.timeScale = 0.5;

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