From 895745484759f6b9ab73a46c43a251430e37e33c Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 2 Apr 2013 18:45:59 +0200 Subject: [PATCH] Better animation state test. --- .../com/esotericsoftware/spine/AnimationStateTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spine-libgdx/test/com/esotericsoftware/spine/AnimationStateTest.java b/spine-libgdx/test/com/esotericsoftware/spine/AnimationStateTest.java index 3abaea83f..32a23d6e1 100644 --- a/spine-libgdx/test/com/esotericsoftware/spine/AnimationStateTest.java +++ b/spine-libgdx/test/com/esotericsoftware/spine/AnimationStateTest.java @@ -57,6 +57,7 @@ public class AnimationStateTest extends ApplicationAdapter { // Define mixing between animations. AnimationStateData mixing = new AnimationStateData(); mixing.setMix(walkAnimation, jumpAnimation, 0.4f); + mixing.setMix(jumpAnimation, walkAnimation, 0.4f); state = new AnimationState(mixing); state.setAnimation(walkAnimation, true); @@ -77,8 +78,12 @@ public class AnimationStateTest extends ApplicationAdapter { batch.begin(); state.apply(skeleton); - // After one second, change the current animation. Mixing is done by AnimationState for you. - if (state.getTime() > 1 && state.getAnimation() == walkAnimation) state.setAnimation(jumpAnimation, false); + if (state.getAnimation() == walkAnimation) { + // After one second, change the current animation. Mixing is done by AnimationState for you. + if (state.getTime() > 2) state.setAnimation(jumpAnimation, false); + } else { + if (state.getTime() > 1) state.setAnimation(walkAnimation, true); + } skeleton.updateWorldTransform(); skeleton.draw(batch);