From e9a1a5d080710f162dfc2fc2d5f86deb951104be Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 28 Nov 2016 15:48:51 +0100 Subject: [PATCH] Added a third test event. --- .../spine-libgdx-tests/assets/test/test.json | 9 +++++++- .../spine-libgdx-tests/assets/test/test.spine | Bin 507 -> 534 bytes .../spine/AnimationStateTests.java | 20 +++++++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) 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 0eb86773e6a0e55aad206ad403b70aae3430ce48..4315dc10c1c34e265ff34c6477e152fe451c7806 100644 GIT binary patch literal 534 zcmV+x0_pv=RLyErQ4pT*{wFs-ZJM@8lUyTeAPAunDipP`{%pFj(msG#?jja*H9z9& zlI9IuxyUQHh{Y#x<3@ao?nH_dw{_;!Ym7=YQV-0>oH_S=GxJ^M#75;&85v3gF7l)S zUB7drLC2oKu>^8t0PP@<7#YON6tD#BMxV$Lh{-lC;0h!Jl5&s|nDsCm4v!ZlniI$i zED02VA|3{gr9pNYdIqLs^`H5zZfB%%9djJvLvgc+QwF%mzP^AI`&mtxbb*rs zVXpN_t;S8ZzLe_#F_?fY%$njpiW;&)(!SltU^(PQT$+<@Rv@G(&H95sr^!o}!gsnW zZ%&~*oSLpa`jw8mD46`MO%Cr2NF>CBhOZ+HD`O3-n2#i^;__cfI9W{T_nisZ^g^9K zg=}h>F8z~8`;kaj$0DtcMOwwRvlB_k&P*gl_Mb#zb9nILtjC3dizNFgwi&hswnera zO!{f%IlQz9@O&#QDl94V6rK}ASz!oOzCl(6{P6hCp9Jmho#toVva5Jo`SO1K@Wm^k zbsDXg{rGhm2nH_U{1$o~HtpET3 literal 507 zcmVm+6{-a2OYX^iXXc%E@0s@|+%NPCNKyiDkRc6d zdCfBoA$-u8iy}=r(C~fXNGBeKfGJ>AJ4CiXSf&vHM<6N?lLv8uNf*6d?|eqsv_M8+ zRv-)H@Yb&n@)VGn09grWNf@%Lci`1q&A!HUOfka`B~2khN#HT(p=rc9PidkQ61XT3 z#zKeGs4jAJq+A;a!vHK%)|B?yupu)b?Q%W3PXlhmp(&ZB1Oggvv-IZfZ8EY;_OINt zZ@0*uj4fB`|1ZZ~WDS1TBAaJAgb6U>;g_L@#VZd>crdiEgeUj1aI~2G&7FzZ_(nat zMQm)F=I><^0@!?}BJ9Up)c`mmn&a${M)$F_yfz@@#Fvi 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); } } });