From 4912ea8975281824cd84a21ab974453ed0aec79a Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Fri, 19 Aug 2016 11:32:29 +0200 Subject: [PATCH] Fixed start event not being triggered when addAnimation is used on an empty track. closes #634 --- .../esotericsoftware/spine/AnimationStateTest.java | 11 +++++++++++ .../com/esotericsoftware/spine/AnimationState.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java index 2590d5d3c..9320781f0 100644 --- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java +++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java @@ -364,6 +364,17 @@ public class AnimationStateTest { } }); + setup("add animation on empty track", // 14 + expect(0, "start", 0, 0), // s + expect(0, "event 0", 0, 0), // + expect(0, "event 14", 0.5f, 0.5f), // + expect(0, "event 30", 1, 1), // + expect(0, "complete 1", 1, 1), // + expect(0, "end", 1, 1.1f) // + ); + state.addAnimation(0, "events1", false, 0); + run(0.1f, 1.9f); + System.out.println("AnimationState tests passed."); } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java index 34a557af0..448b0afe3 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -301,7 +301,7 @@ public class AnimationState { last = last.next; last.next = entry; } else - tracks.set(trackIndex, entry); + setCurrent(trackIndex, entry); if (delay <= 0) { if (last != null)