diff --git a/spine-libgdx/spine-libgdx-tests/assets/test/test.json b/spine-libgdx/spine-libgdx-tests/assets/test/test.json index e4d7dff06..e66d22d10 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/test/test.json +++ b/spine-libgdx/spine-libgdx-tests/assets/test/test.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "C7XH8P2ZH7KYz8kafheHFboZI1Q", "spine": "3.5.32", "width": 0, "height": 0 }, +"skeleton": { "hash": "aAa4C8T7UXyn4KV5wPxfo2zYuiA", "spine": "3.5.32", "width": 0, "height": 0 }, "bones": [ { "name": "root" } ], @@ -20,6 +20,13 @@ { "time": 0.4667, "name": "event", "string": "14" }, { "time": 1, "name": "event", "string": "30" } ] + }, + "events2": { + "events": [ + { "time": 0, "name": "event", "string": "0" }, + { "time": 0.4667, "name": "event", "string": "14" }, + { "time": 1, "name": "event", "string": "30" } + ] } } } \ No newline at end of file diff --git a/spine-libgdx/spine-libgdx-tests/assets/test/test.spine b/spine-libgdx/spine-libgdx-tests/assets/test/test.spine index 0eb86773e..4315dc10c 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/test/test.spine and b/spine-libgdx/spine-libgdx-tests/assets/test/test.spine differ diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTests.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTests.java index 4cae4af05..7d6391b6d 100644 --- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTests.java +++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTests.java @@ -562,13 +562,17 @@ public class AnimationStateTests { expect(0, "end", 0, 0.8f), // expect(0, "dispose", 0, 0.8f), // - expect(1, "start", 0, 0.8f), // - expect(1, "event 0", 0.1f, 0.9f), // - expect(1, "event 14", 0.5f, 1.3f), // - expect(1, "event 30", 1, 1.8f), // - expect(1, "complete", 1, 1.8f), // - expect(1, "end", 1, 1.9f), // - expect(1, "dispose", 1, 1.9f) // + expect(2, "start", 0, 0.8f), // + expect(2, "event 0", 0.1f, 0.9f), // + + expect(1, "end", 0.9f, 1), // + expect(1, "dispose", 0.9f, 1), // + + expect(2, "event 14", 0.5f, 1.3f), // + expect(2, "event 30", 1, 1.8f), // + expect(2, "complete", 1, 1.8f), // + expect(2, "end", 1, 1.9f), // + expect(2, "dispose", 1, 1.9f) // ); state.setAnimation(0, "events0", false); // First should be ignored. state.setAnimation(0, "events1", false); @@ -576,7 +580,7 @@ public class AnimationStateTests { public void frame (float time) { if (MathUtils.isEqual(time, 0.8f)) { state.setAnimation(0, "events0", false); // First should be ignored. - state.setAnimation(0, "events1", false); + state.setAnimation(0, "events2", false); } } });