From eb1c382a3bb31b43ce45d0e47180afaf8e658f50 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 14 Oct 2019 13:59:39 +0200 Subject: [PATCH] [libgdx] Fixed tests. AnimationStateTests failure was caused by a321aa76d556a618a09abb3adeb7473a6c099304, when `computeHold` was added, specifically `|| timeline instanceof EventTimeline`. The slight event order difference is unlikely to be an issue for anyone. --- .../assets/spineboy-old/spineboy-old.json | 682 ++++++++---------- .../assets/spineboy-old/spineboy-old.spine | Bin 0 -> 6829 bytes .../spine/AnimationStateTests.java | 8 +- .../spine/EventTimelineTests.java | 2 +- 4 files changed, 307 insertions(+), 385 deletions(-) create mode 100644 spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json index fa9c88089..aa4b25342 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json @@ -1,5 +1,14 @@ { -"skeleton": { "hash": "7ZwwnXuU4QeWBoMnt86GJ4+hiN0", "spine": "3.6.14-beta", "width": 161.12, "height": 343.58, "images": "./images/" }, +"skeleton": { + "hash": "L56RnW+mbehRLXsZX4oI9CbSsr8", + "spine": "3.8.75", + "x": -88.95, + "y": -2.26, + "width": 161.04, + "height": 343.56, + "images": "./images/", + "audio": "" +}, "bones": [ { "name": "root" }, { "name": "hip", "parent": "root", "x": 0.65, "y": 114.41 }, @@ -40,69 +49,73 @@ { "name": "right hand", "bone": "right hand", "attachment": "right-hand" }, { "name": "bb-head", "bone": "head", "attachment": "bb-head" } ], -"skins": { - "default": { - "bb-head": { +"skins": [ + { + "name": "default", + "attachments": { + "left arm": { + "left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.85, "width": 35, "height": 29 } + }, + "right upper leg": { + "right-upper-leg": { "x": 23.03, "y": 0.26, "rotation": 101.14, "width": 44, "height": 70 } + }, "bb-head": { - "type": "boundingbox", - "vertexCount": 5, - "vertices": [ 77.26, -53.83, 105.8, -32.42, 58.43, 40.35, 5.83, 37.01, -7.02, -42.24 ] + "bb-head": { + "type": "boundingbox", + "vertexCount": 5, + "vertices": [ 77.26, -53.83, 105.8, -32.42, 58.43, 40.35, 5.83, 37.01, -7.02, -42.24 ], + "color": "60ef00ff" + } + }, + "left lower leg": { + "left-lower-leg": { "x": 24.56, "y": -1.92, "rotation": 105.76, "width": 49, "height": 64 } + }, + "right arm": { + "right-arm": { "x": 18.34, "y": -2.65, "rotation": 94.32, "width": 21, "height": 45 } + }, + "left shoulder": { + "left-shoulder": { "x": 23.74, "y": 0.12, "rotation": 62.01, "width": 34, "height": 53 } + }, + "neck": { + "neck": { "x": 9.43, "y": -3.66, "rotation": -100.16, "width": 34, "height": 28 } + }, + "head": { + "head": { "x": 53.95, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 } + }, + "eyes": { + "eyes": { "x": 28.94, "y": -32.92, "rotation": -86.9, "width": 34, "height": 27 }, + "eyes-closed": { "x": 28.78, "y": -32.86, "rotation": -86.9, "width": 34, "height": 27 } + }, + "right hand": { + "right-hand": { "x": 6.83, "y": 1.26, "rotation": 91.96, "width": 32, "height": 32 } + }, + "right shoulder": { + "right-shoulder": { "x": 25.87, "y": 0.04, "rotation": 134.45, "width": 52, "height": 51 } + }, + "left foot": { + "left-foot": { "x": 24.35, "y": 8.89, "rotation": 3.32, "width": 65, "height": 30 } + }, + "left hand": { + "left-hand": { "x": 0.75, "y": 1.86, "rotation": 31.14, "width": 35, "height": 38 } + }, + "pelvis": { + "pelvis": { "x": -4.83, "y": 10.63, "width": 63, "height": 47 } + }, + "right lower leg": { + "right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.84, "width": 51, "height": 64 } + }, + "right foot": { + "right-foot": { "x": 19.03, "y": 8.47, "rotation": 1.53, "width": 67, "height": 30 } + }, + "torso": { + "torso": { "x": 44.58, "y": -7.08, "rotation": -94.95, "width": 68, "height": 92 } + }, + "left upper leg": { + "left-upper-leg": { "x": 26.12, "y": -1.86, "rotation": 89.1, "width": 33, "height": 67 } } - }, - "eyes": { - "eyes": { "x": 28.94, "y": -32.92, "rotation": -86.9, "width": 34, "height": 27 }, - "eyes-closed": { "x": 28.78, "y": -32.86, "rotation": -86.9, "width": 34, "height": 27 } - }, - "head": { - "head": { "x": 53.95, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 } - }, - "left arm": { - "left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.85, "width": 35, "height": 29 } - }, - "left foot": { - "left-foot": { "x": 24.35, "y": 8.89, "rotation": 3.32, "width": 65, "height": 30 } - }, - "left hand": { - "left-hand": { "x": 0.75, "y": 1.86, "rotation": 31.14, "width": 35, "height": 38 } - }, - "left lower leg": { - "left-lower-leg": { "x": 24.56, "y": -1.92, "rotation": 105.76, "width": 49, "height": 64 } - }, - "left shoulder": { - "left-shoulder": { "x": 23.74, "y": 0.12, "rotation": 62.01, "width": 34, "height": 53 } - }, - "left upper leg": { - "left-upper-leg": { "x": 26.12, "y": -1.86, "rotation": 89.1, "width": 33, "height": 67 } - }, - "neck": { - "neck": { "x": 9.43, "y": -3.66, "rotation": -100.16, "width": 34, "height": 28 } - }, - "pelvis": { - "pelvis": { "x": -4.83, "y": 10.63, "width": 63, "height": 47 } - }, - "right arm": { - "right-arm": { "x": 18.34, "y": -2.65, "rotation": 94.32, "width": 21, "height": 45 } - }, - "right foot": { - "right-foot": { "x": 19.03, "y": 8.47, "rotation": 1.53, "width": 67, "height": 30 } - }, - "right hand": { - "right-hand": { "x": 6.83, "y": 1.26, "rotation": 91.96, "width": 32, "height": 32 } - }, - "right lower leg": { - "right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.84, "width": 51, "height": 64 } - }, - "right shoulder": { - "right-shoulder": { "x": 25.87, "y": 0.04, "rotation": 134.45, "width": 52, "height": 51 } - }, - "right upper leg": { - "right-upper-leg": { "x": 23.03, "y": 0.26, "rotation": 101.14, "width": 44, "height": 70 } - }, - "torso": { - "torso": { "x": 44.58, "y": -7.08, "rotation": -94.95, "width": 68, "height": 92 } } } -}, +], "events": { "behind": {}, "headAttach": {}, @@ -113,7 +126,7 @@ "bones": { "head": { "rotate": [ - { "time": 0, "angle": 0 }, + {}, { "time": 0.9615, "angle": -23.11 }, { "time": 1.7856, "angle": -56.45 }, { "time": 2.6098, "angle": 1.39 }, @@ -125,142 +138,157 @@ { "time": 7.7675, "angle": 360 } ], "translate": [ - { - "time": 0, - "x": 0, - "y": 0, - "curve": [ 0.191, 0.41, 0.586, 0.76 ] - }, + { "curve": 0.191, "c2": 0.41, "c3": 0.586, "c4": 0.76 }, { "time": 0.5494, "x": 57.89, "y": -35.72, - "curve": [ 0.39, 0.54, 0.633, 0.73 ] + "curve": 0.39, + "c2": 0.54, + "c3": 0.633, + "c4": 0.73 }, { "time": 0.9615, "x": 87.26, "y": -87.9, - "curve": [ 0.325, 0.24, 0.588, 0.37 ] + "curve": 0.325, + "c2": 0.24, + "c3": 0.588, + "c4": 0.37 }, { "time": 1.3736, "x": 28.89, "y": -114.62, - "curve": [ 0.383, 0.23, 0.736, 0.56 ] + "curve": 0.383, + "c2": 0.23, + "c3": 0.736, + "c4": 0.56 }, { "time": 1.7856, "x": -76.58, "y": -124.99, - "curve": [ 0.129, 0.21, 0.547, 0.64 ] + "curve": 0.129, + "c2": 0.21, + "c3": 0.547, + "c4": 0.64 }, { "time": 2.1977, "x": -154.38, "y": -77.14, - "curve": [ 0.354, 0.49, 0.73, 0.9 ] + "curve": 0.354, + "c2": 0.49, + "c3": 0.73, + "c4": 0.9 }, { "time": 2.6098, "x": -181.02, "y": 18.57, - "curve": [ 0.064, 0.16, 0.521, 0.62 ] - }, - { - "time": 3.1592, - "x": -150.38, - "y": 128.68, - "curve": [ 0.382, 0.55, 0.778, 1 ] - }, - { - "time": 3.5713, - "x": -112.08, - "y": 146.28, - "curve": [ 0.242, 0, 0.626, 0.46 ] + "curve": 0.064, + "c2": 0.16, + "c3": 0.521, + "c4": 0.62 }, + { "time": 3.1592, "x": -150.38, "y": 128.68, "curve": 0.382, "c2": 0.55, "c3": 0.778 }, + { "time": 3.5713, "x": -112.08, "y": 146.28, "curve": 0.242, "c3": 0.626, "c4": 0.46 }, { "time": 3.846, "x": -63.71, "y": 111.22, - "curve": [ 0.399, 0.36, 0.786, 0.77 ] + "curve": 0.399, + "c2": 0.36, + "c3": 0.786, + "c4": 0.77 }, { "time": 4.258, "x": -48.94, "y": -1.55, - "curve": [ 0.189, 0.21, 0.575, 0.62 ] - }, - { - "time": 4.6701, - "x": -91.7, - "y": -91.93, - "curve": [ 0.363, 0.52, 0.766, 1 ] + "curve": 0.189, + "c2": 0.21, + "c3": 0.575, + "c4": 0.62 }, + { "time": 4.6701, "x": -91.7, "y": -91.93, "curve": 0.363, "c2": 0.52, "c3": 0.766 }, { "time": 5.2195, "x": -142.8, "y": -126.83, - "curve": [ 0.228, 0.35, 0.594, 0.76 ] + "curve": 0.228, + "c2": 0.35, + "c3": 0.594, + "c4": 0.76 }, { "time": 5.4943, "x": -176.7, "y": -98.33, - "curve": [ 0.26, 0.4, 0.612, 0.72 ] + "curve": 0.26, + "c2": 0.4, + "c3": 0.612, + "c4": 0.72 }, { "time": 5.769, "x": -163.95, "y": -24.05, - "curve": [ 0.339, 0.37, 0.676, 0.71 ] - }, - { - "time": 5.9063, - "x": -150.17, - "y": 10.72, - "curve": [ 0.388, 0.61, 0.742, 1 ] + "curve": 0.339, + "c2": 0.37, + "c3": 0.676, + "c4": 0.71 }, + { "time": 5.9063, "x": -150.17, "y": 10.72, "curve": 0.388, "c2": 0.61, "c3": 0.742 }, { "time": 6.181, "x": -102.45, "y": 45.92, - "curve": [ 0.31, 0.24, 0.648, 0.59 ] + "curve": 0.31, + "c2": 0.24, + "c3": 0.648, + "c4": 0.59 }, { "time": 6.4557, "x": -54, "y": 70.4, - "curve": [ 0.326, 0.29, 0.664, 0.63 ] + "curve": 0.326, + "c2": 0.29, + "c3": 0.664, + "c4": 0.63 }, { "time": 6.7305, "x": 1.89, "y": 55.55, - "curve": [ 0.387, 0.33, 0.769, 0.73 ] + "curve": 0.387, + "c2": 0.33, + "c3": 0.769, + "c4": 0.73 }, { "time": 7.1425, "x": 34.27, "y": 36.14, - "curve": [ 0.206, 0.28, 0.596, 0.68 ] + "curve": 0.206, + "c2": 0.28, + "c3": 0.596, + "c4": 0.68 }, - { - "time": 7.5546, - "x": 23.95, - "y": 1.01, - "curve": [ 0.373, 0.56, 0.759, 1 ] - }, - { "time": 7.9667, "x": 0, "y": 0 } + { "time": 7.5546, "x": 23.95, "y": 1.01, "curve": 0.373, "c2": 0.56, "c3": 0.759 }, + { "time": 7.9667 } ], "scale": [ - { "time": 1.6483, "x": 1, "y": 1 }, + { "time": 1.6483 }, { "time": 2.6098, "x": 0.743, "y": 0.743 }, - { "time": 3.5713, "x": 1, "y": 1 }, + { "time": 3.5713 }, { "time": 4.258, "x": 1.502, "y": 1.502 }, - { "time": 5.2195, "x": 1, "y": 1 }, + { "time": 5.2195 }, { "time": 5.9063, "x": 0.708, "y": 0.708 }, - { "time": 6.7305, "x": 1, "y": 1 } + { "time": 6.7305 } ] } }, @@ -289,7 +317,7 @@ { "time": 7.1425 } ], "events": [ - { "time": 0, "name": "headPop", "string": "pop.wav" }, + { "name": "headPop", "string": "pop.wav" }, { "time": 2.6098, "name": "behind" }, { "time": 5.9063, "name": "behind" }, { "time": 7.9667, "name": "headAttach", "string": "attach.wav" } @@ -299,27 +327,17 @@ "bones": { "hip": { "rotate": [ - { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.9333, "angle": 0, "curve": "stepped" }, - { "time": 1.3667, "angle": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "translate": [ - { "time": 0, "x": -11.57, "y": -3.01 }, + { "x": -11.57, "y": -3.01 }, { "time": 0.2333, "x": -16.2, "y": -19.44 }, - { - "time": 0.3333, - "x": 7.67, - "y": -8.49, - "curve": [ 0.057, 0.07, 0.713, 1 ] - }, + { "time": 0.3333, "x": 7.67, "y": -8.49, "curve": 0.057, "c2": 0.07, "c3": 0.713 }, { "time": 0.3667, "x": 15.39, "y": 5.02 }, { "time": 0.4667, "x": -7.85, "y": 57.22 }, - { - "time": 0.6, - "x": -10.82, - "y": 96.34, - "curve": [ 0.241, -0.01, 1, 1 ] - }, + { "time": 0.6, "x": -10.82, "y": 96.34, "curve": 0.241, "c2": -0.01 }, { "time": 0.7333, "x": -7.02, "y": 54.71 }, { "time": 0.8, "x": -10.58, "y": 32.2 }, { "time": 0.9333, "x": -31.99, "y": 0.45 }, @@ -327,14 +345,14 @@ { "time": 1.3667, "x": -11.57, "y": -3.01 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left upper leg": { "rotate": [ - { "time": 0, "angle": 17.14 }, + { "angle": 17.14 }, { "time": 0.2333, "angle": 44.35 }, { "time": 0.3333, "angle": 16.47 }, { "time": 0.4, "angle": -9.88 }, @@ -346,19 +364,19 @@ { "time": 1.3667, "angle": 17.14 } ], "translate": [ - { "time": 0, "x": -3, "y": -2.25, "curve": "stepped" }, + { "x": -3, "y": -2.25, "curve": "stepped" }, { "time": 0.9333, "x": -3, "y": -2.25, "curve": "stepped" }, { "time": 1.3667, "x": -3, "y": -2.25 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left lower leg": { "rotate": [ - { "time": 0, "angle": -16.25 }, + { "angle": -16.25 }, { "time": 0.2333, "angle": -52.21 }, { "time": 0.4, "angle": 15.05 }, { "time": 0.4667, "angle": -8.96 }, @@ -369,19 +387,19 @@ { "time": 1.3667, "angle": -16.25 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left foot": { "rotate": [ - { "time": 0, "angle": 0.34 }, + { "angle": 0.34 }, { "time": 0.2333, "angle": 6.2 }, { "time": 0.3333, "angle": 14.73 }, { "time": 0.4, "angle": -15.54 }, @@ -393,27 +411,23 @@ { "time": 1.3667, "angle": 0.34 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right upper leg": { "rotate": [ - { "time": 0, "angle": 25.97 }, + { "angle": 25.97 }, { "time": 0.2333, "angle": 46.43 }, { "time": 0.3333, "angle": 22.62 }, { "time": 0.4, "angle": 2.13 }, - { - "time": 0.4667, - "angle": 0.05, - "curve": [ 0, 0, 0.638, 0.99 ] - }, + { "time": 0.4667, "angle": 0.05, "curve": 0, "c3": 0.638, "c4": 0.99 }, { "time": 0.6, "angle": 65.55 }, { "time": 0.7667, "angle": 64.93 }, { "time": 0.9333, "angle": 41.08 }, @@ -421,7 +435,7 @@ { "time": 1.3667, "angle": 25.97 } ], "translate": [ - { "time": 0, "x": 5.75, "y": 0.61 }, + { "x": 5.75, "y": 0.61 }, { "time": 0.2333, "x": 4.8, "y": 1.8 }, { "time": 0.3333, "x": 6.05, "y": -4.56 }, { "time": 0.9333, "x": 4.8, "y": 1.8, "curve": "stepped" }, @@ -429,14 +443,14 @@ { "time": 1.3667, "x": 5.75, "y": 0.61 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right lower leg": { "rotate": [ - { "time": 0, "angle": -27.46 }, + { "angle": -27.46 }, { "time": 0.2333, "angle": -64.04 }, { "time": 0.4, "angle": -48.36 }, { "time": 0.5667, "angle": -76.86 }, @@ -447,19 +461,19 @@ { "time": 1.3667, "angle": -27.46 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right foot": { "rotate": [ - { "time": 0, "angle": 1.08 }, + { "angle": 1.08 }, { "time": 0.2333, "angle": 16.03 }, { "time": 0.3, "angle": 12.95 }, { "time": 0.3333, "angle": 15.17 }, @@ -474,19 +488,19 @@ { "time": 1.3667, "angle": 1.08 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "torso": { "rotate": [ - { "time": 0, "angle": -13.35 }, + { "angle": -13.35 }, { "time": 0.2333, "angle": -48.95 }, { "time": 0.4333, "angle": -35.77 }, { "time": 0.6, "angle": -4.59 }, @@ -496,19 +510,19 @@ { "time": 1.3667, "angle": -13.35 } ], "translate": [ - { "time": 0, "x": -3.67, "y": 1.69, "curve": "stepped" }, + { "x": -3.67, "y": 1.69, "curve": "stepped" }, { "time": 0.9333, "x": -3.67, "y": 1.69, "curve": "stepped" }, { "time": 1.3667, "x": -3.67, "y": 1.69 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "neck": { "rotate": [ - { "time": 0, "angle": 12.79 }, + { "angle": 12.79 }, { "time": 0.2333, "angle": 16.46 }, { "time": 0.4, "angle": 26.49 }, { "time": 0.6, "angle": 15.51 }, @@ -519,19 +533,19 @@ { "time": 1.3667, "angle": 12.79 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "head": { "rotate": [ - { "time": 0, "angle": 5.2 }, + { "angle": 5.2 }, { "time": 0.2333, "angle": 20.28 }, { "time": 0.4, "angle": 15.28 }, { "time": 0.6, "angle": -24.7 }, @@ -542,69 +556,57 @@ { "time": 1.3667, "angle": 5.2 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left shoulder": { "rotate": [ - { - "time": 0, - "angle": 0.05, - "curve": [ 0, 0, 0.621, 1 ] - }, - { - "time": 0.2333, - "angle": 279.66, - "curve": [ 0.218, 0.67, 0.661, 0.99 ] - }, - { - "time": 0.5, - "angle": 62.27, - "curve": [ 0.463, 0, 0.764, 0.58 ] - }, + { "angle": 0.05, "curve": 0, "c3": 0.621 }, + { "time": 0.2333, "angle": 279.66, "curve": 0.218, "c2": 0.67, "c3": 0.661, "c4": 0.99 }, + { "time": 0.5, "angle": 62.27, "curve": 0.463, "c3": 0.764, "c4": 0.58 }, { "time": 0.9333, "angle": 28.91 }, { "time": 1.0667, "angle": -8.63 }, { "time": 1.1667, "angle": -18.43 }, { "time": 1.3667, "angle": 0.05 } ], "translate": [ - { "time": 0, "x": -1.77, "y": 0.57, "curve": "stepped" }, + { "x": -1.77, "y": 0.57, "curve": "stepped" }, { "time": 0.9333, "x": -1.77, "y": 0.57, "curve": "stepped" }, { "time": 1.3667, "x": -1.77, "y": 0.57 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left hand": { "rotate": [ - { "time": 0, "angle": 11.59, "curve": "stepped" }, + { "angle": 11.59, "curve": "stepped" }, { "time": 0.9333, "angle": 11.59, "curve": "stepped" }, { "time": 1.3667, "angle": 11.59 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "left arm": { "rotate": [ - { "time": 0, "angle": 0.52 }, + { "angle": 0.52 }, { "time": 0.4333, "angle": 12.82 }, { "time": 0.6, "angle": 47.56 }, { "time": 0.9333, "angle": 12.82 }, @@ -612,95 +614,83 @@ { "time": 1.3667, "angle": 0.52 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right shoulder": { "rotate": [ - { - "time": 0, - "angle": 43.82, - "curve": [ 0, 0, 0.621, 1 ] - }, - { - "time": 0.2333, - "angle": -8.74, - "curve": [ 0.305, 0.58, 0.71, 0.97 ] - }, - { - "time": 0.5333, - "angle": -208.03, - "curve": [ 0.463, 0, 0.764, 0.58 ] - }, + { "angle": 43.82, "curve": 0, "c3": 0.621 }, + { "time": 0.2333, "angle": -8.74, "curve": 0.305, "c2": 0.58, "c3": 0.71, "c4": 0.97 }, + { "time": 0.5333, "angle": -208.03, "curve": 0.463, "c3": 0.764, "c4": 0.58 }, { "time": 0.9333, "angle": -246.72 }, { "time": 1.0667, "angle": -307.14 }, { "time": 1.1667, "angle": 37.15 }, { "time": 1.3667, "angle": 43.82 } ], "translate": [ - { "time": 0, "x": -7.84, "y": 7.19, "curve": "stepped" }, + { "x": -7.84, "y": 7.19, "curve": "stepped" }, { "time": 0.9333, "x": -7.84, "y": 7.19, "curve": "stepped" }, { "time": 1.3667, "x": -7.84, "y": 7.19 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right arm": { "rotate": [ - { "time": 0, "angle": -4.03 }, + { "angle": -4.03 }, { "time": 0.6, "angle": 17.51 }, { "time": 0.9333, "angle": -4.03 }, { "time": 1.1667, "angle": -16.73 }, { "time": 1.3667, "angle": -4.03 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "right hand": { "rotate": [ - { "time": 0, "angle": 22.92, "curve": "stepped" }, + { "angle": 22.92, "curve": "stepped" }, { "time": 0.9333, "angle": 22.92, "curve": "stepped" }, { "time": 1.3667, "angle": 22.92 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.3667, "x": 0, "y": 0 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 0.9333, "curve": "stepped" }, + { "time": 1.3667 } ] }, "root": { "rotate": [ - { "time": 0, "angle": 0 }, + {}, { "time": 0.4333, "angle": -14.53 }, { "time": 0.8, "angle": 9.87 }, - { "time": 1.3667, "angle": 0 } + { "time": 1.3667 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 1.3667, "x": 1, "y": 1 } + { "curve": "stepped" }, + { "time": 1.3667 } ] } } @@ -709,7 +699,7 @@ "bones": { "left upper leg": { "rotate": [ - { "time": 0, "angle": -26.56 }, + { "angle": -26.56 }, { "time": 0.1333, "angle": -8.79 }, { "time": 0.2667, "angle": 9.51 }, { "time": 0.4, "angle": 30.74 }, @@ -720,32 +710,24 @@ { "time": 1.0667, "angle": -26.56 } ], "translate": [ - { "time": 0, "x": -3, "y": -2.25 }, + { "x": -3, "y": -2.25 }, { "time": 0.4, "x": -2.18, "y": -2.25 }, { "time": 1.0667, "x": -3, "y": -2.25 } ] }, "right upper leg": { "rotate": [ - { "time": 0, "angle": 42.45 }, + { "angle": 42.45 }, { "time": 0.1333, "angle": 52.11 }, { "time": 0.2667, "angle": 5.96 }, { "time": 0.5333, "angle": -16.94 }, { "time": 0.6667, "angle": 1.9 }, - { - "time": 0.8, - "angle": 28.06, - "curve": [ 0.463, 0.12, 1, 1 ] - }, - { - "time": 0.9333, - "angle": 58.69, - "curve": [ 0.5, 0.02, 1, 1 ] - }, + { "time": 0.8, "angle": 28.06, "curve": 0.463, "c2": 0.12 }, + { "time": 0.9333, "angle": 58.69, "curve": 0.5, "c2": 0.02 }, { "time": 1.0667, "angle": 42.45 } ], "translate": [ - { "time": 0, "x": 8.12, "y": -2.36 }, + { "x": 8.12, "y": -2.36 }, { "time": 0.1333, "x": 10.04, "y": -2.57 }, { "time": 0.4, "x": 2.77, "y": -2.97 }, { "time": 0.5333, "x": 2.77, "y": -2.82 }, @@ -755,7 +737,7 @@ }, "left lower leg": { "rotate": [ - { "time": 0, "angle": -10.22 }, + { "angle": -10.22 }, { "time": 0.1333, "angle": -55.65 }, { "time": 0.2667, "angle": -68.13 }, { "time": 0.5333, "angle": 5.12 }, @@ -767,7 +749,7 @@ }, "left foot": { "rotate": [ - { "time": 0, "angle": -3.69 }, + { "angle": -3.69 }, { "time": 0.1333, "angle": -10.42 }, { "time": 0.2667, "angle": -17.15 }, { "time": 0.4, "angle": -2.84 }, @@ -780,21 +762,13 @@ }, "right shoulder": { "rotate": [ - { - "time": 0, - "angle": 20.9, - "curve": [ 0.264, 0, 0.75, 1 ] - }, - { - "time": 0.1333, - "angle": 3.72, - "curve": [ 0.273, 0, 0.842, 1 ] - }, + { "angle": 20.9, "curve": 0.264, "c3": 0.75 }, + { "time": 0.1333, "angle": 3.72, "curve": 0.273, "c3": 0.842 }, { "time": 0.6667, "angle": -278.28 }, { "time": 1.0667, "angle": 20.9 } ], "translate": [ - { "time": 0, "x": -7.84, "y": 7.19 }, + { "x": -7.84, "y": 7.19 }, { "time": 0.1333, "x": -6.36, "y": 6.42 }, { "time": 0.6667, "x": -11.08, "y": 5.25 }, { "time": 1.0667, "x": -7.84, "y": 7.19 } @@ -802,27 +776,15 @@ }, "right arm": { "rotate": [ - { - "time": 0, - "angle": -4.03, - "curve": [ 0.267, 0.01, 0.805, 0.99 ] - }, - { - "time": 0.1333, - "angle": -14, - "curve": [ 0.342, 0, 1, 1 ] - }, - { - "time": 0.6667, - "angle": 36.55, - "curve": [ 0.307, 0, 0.787, 0.99 ] - }, + { "angle": -4.03, "curve": 0.267, "c2": 0.01, "c3": 0.805, "c4": 0.99 }, + { "time": 0.1333, "angle": -14, "curve": 0.342 }, + { "time": 0.6667, "angle": 36.55, "curve": 0.307, "c3": 0.787, "c4": 0.99 }, { "time": 1.0667, "angle": -4.03 } ] }, "right hand": { "rotate": [ - { "time": 0, "angle": 22.92 }, + { "angle": 22.92 }, { "time": 0.4, "angle": -8.97 }, { "time": 0.6667, "angle": 0.51 }, { "time": 1.0667, "angle": 22.92 } @@ -830,41 +792,29 @@ }, "left shoulder": { "rotate": [ - { "time": 0, "angle": -1.48 }, + { "angle": -1.48 }, { "time": 0.1333, "angle": 13.61 }, { "time": 0.6667, "angle": 280.75 }, { "time": 1.0667, "angle": -1.48 } ], "translate": [ - { "time": 0, "x": -1.77, "y": 0.57 }, + { "x": -1.77, "y": 0.57 }, { "time": 0.6667, "x": -2.48, "y": 8.15 }, { "time": 1.0667, "x": -1.77, "y": 0.57 } ] }, "left hand": { "rotate": [ - { - "time": 0, - "angle": 11.59, - "curve": [ 0.17, 0.37, 0.632, 1.55 ] - }, - { - "time": 0.1333, - "angle": 28.13, - "curve": [ 0.693, 0.01, 0.693, 0.99 ] - }, - { - "time": 0.6667, - "angle": -27.43, - "curve": [ 0.118, 0.41, 0.739, 1.77 ] - }, + { "angle": 11.59, "curve": 0.17, "c2": 0.37, "c3": 0.632, "c4": 1.55 }, + { "time": 0.1333, "angle": 28.13, "curve": 0.693, "c2": 0.01, "c3": 0.693, "c4": 0.99 }, + { "time": 0.6667, "angle": -27.43, "curve": 0.118, "c2": 0.41, "c3": 0.739, "c4": 1.77 }, { "time": 0.8, "angle": -36.33 }, { "time": 1.0667, "angle": 11.59 } ] }, "left arm": { "rotate": [ - { "time": 0, "angle": -8.28 }, + { "angle": -8.28 }, { "time": 0.1333, "angle": 18.43 }, { "time": 0.6667, "angle": 0.88 }, { "time": 1.0667, "angle": -8.28 } @@ -872,23 +822,15 @@ }, "torso": { "rotate": [ - { "time": 0, "angle": -10.28 }, - { - "time": 0.1333, - "angle": -15.39, - "curve": [ 0.546, 0.01, 1, 1 ] - }, - { - "time": 0.4, - "angle": -9.78, - "curve": [ 0.58, 0.17, 1, 1 ] - }, + { "angle": -10.28 }, + { "time": 0.1333, "angle": -15.39, "curve": 0.546, "c2": 0.01 }, + { "time": 0.4, "angle": -9.78, "curve": 0.58, "c2": 0.17 }, { "time": 0.6667, "angle": -15.75 }, { "time": 0.9333, "angle": -7.07 }, { "time": 1.0667, "angle": -10.28 } ], "translate": [ - { "time": 0, "x": -3.67, "y": 1.69 }, + { "x": -3.67, "y": 1.69 }, { "time": 0.1333, "x": -3.67, "y": 0.69 }, { "time": 0.4, "x": -3.67, "y": 1.97 }, { "time": 0.6667, "x": -3.67, "y": -0.14 }, @@ -897,7 +839,7 @@ }, "right foot": { "rotate": [ - { "time": 0, "angle": -5.25 }, + { "angle": -5.25 }, { "time": 0.2667, "angle": -4.08 }, { "time": 0.4, "angle": -6.45 }, { "time": 0.5333, "angle": -5.4 }, @@ -908,48 +850,34 @@ }, "right lower leg": { "rotate": [ - { "time": 0, "angle": -3.39 }, + { "angle": -3.39 }, { "time": 0.1333, "angle": -45.53 }, { "time": 0.2667, "angle": -2.6 }, { "time": 0.5333, "angle": -19.53 }, { "time": 0.6667, "angle": -64.8 }, - { - "time": 0.8, - "angle": -82.56, - "curve": [ 0.557, 0.18, 1, 1 ] - }, + { "time": 0.8, "angle": -82.56, "curve": 0.557, "c2": 0.18 }, { "time": 1.0667, "angle": -3.39 } ] }, "hip": { "rotate": [ - { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 1.0667, "angle": 0 } + { "curve": "stepped" }, + { "time": 1.0667 } ], "translate": [ - { "time": 0, "x": 0, "y": 0 }, - { - "time": 0.1333, - "x": 0, - "y": -7.62, - "curve": [ 0.273, 0.86, 1, 1 ] - }, - { "time": 0.4, "x": 0, "y": 8.7 }, - { "time": 0.5333, "x": 0, "y": -0.42 }, - { - "time": 0.6667, - "x": 0, - "y": -7.06, - "curve": [ 0.236, 0.9, 1, 1 ] - }, - { "time": 0.8, "x": 0, "y": 2.92 }, - { "time": 0.9333, "x": 0, "y": 6.78 }, - { "time": 1.0667, "x": 0, "y": 0 } + {}, + { "time": 0.1333, "y": -7.62, "curve": 0.273, "c2": 0.86 }, + { "time": 0.4, "y": 8.7 }, + { "time": 0.5333, "y": -0.42 }, + { "time": 0.6667, "y": -7.06, "curve": 0.236, "c2": 0.9 }, + { "time": 0.8, "y": 2.92 }, + { "time": 0.9333, "y": 6.78 }, + { "time": 1.0667 } ] }, "neck": { "rotate": [ - { "time": 0, "angle": 3.6 }, + { "angle": 3.6 }, { "time": 0.1333, "angle": 17.5 }, { "time": 0.2667, "angle": 6.11 }, { "time": 0.4, "angle": 3.46 }, @@ -962,19 +890,11 @@ }, "head": { "rotate": [ - { - "time": 0, - "angle": 3.6, - "curve": [ 0, 0, 0.704, 1.62 ] - }, + { "angle": 3.6, "curve": 0, "c3": 0.704, "c4": 1.62 }, { "time": 0.1667, "angle": -0.21 }, { "time": 0.2667, "angle": 6.11 }, { "time": 0.4, "angle": 3.46 }, - { - "time": 0.5333, - "angle": 5.18, - "curve": [ 0, 0, 0.704, 1.62 ] - }, + { "time": 0.5333, "angle": 5.18, "curve": 0, "c3": 0.704, "c4": 1.62 }, { "time": 0.7, "angle": 1.11 }, { "time": 0.8, "angle": 6.09 }, { "time": 0.9333, "angle": 2.29 }, @@ -983,7 +903,7 @@ }, "root": { "rotate": [ - { "time": 0, "angle": 0 } + {} ] } } diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine new file mode 100644 index 0000000000000000000000000000000000000000..24aa9356f61e399e968c0e8aa3bf1f06758723ee GIT binary patch literal 6829 zcmX|mby!qi)U|@34$`A^NzEvX2m%g0#7L)vbobER4Bg$`C@CEZ(j_fj&d3lFGK4gI z_9 zus%o1Wgbuc$dK1xQS$MN^V+w9yY4qUN4K{dqRwNvqqpkVnn<|;J)!+Vy5Q`Rby6}G zsmQ2!j4Q9)r;WK)fhIR>7$i}mUr)=~1aqQ3lIOmeaKpr{&^1 zpMZ&lLWNh-CCC?n)l4kRV znH%-y1(RKo2@|Vn54)X+dsT!}izHR9vm1$@c4EbnaF_d2tvIch9_HMS)6mmHSg9H? zfCwfQ8LJ2{jdl8?XSZ2Wsz9j5uv@~&j4WmP>Jg{FE9 zNWY`@Z)qRFr`Wpvn`7x9>RZ$ndG24Pfu$-$+*Usn4k!T$@`Rd97xABm*U^fmQL@$@NpXWq-`V`_y}S&dHT|S^8Lm&vlf~V zUNPDAZJrDFC+JR_#kWF)&zcvkgrvxoJLml=CI6I)Kz7CI*ShEN=0b8;$p3$tvBjzi zZ6D{+*Uq7hdlQzs{xmOl8v)jLtq^E8R&HE`Y%?`(i^Wl2t4-r8wN_XKxfYjA#v}hj zZ_)P6n6dSzEcA??wNb?YNPh-_aKD#hRQ}%pM&a#WgI?SyFQ_&>XVu@?o1+M{o6>H2 zKDlVyU>EZ#!_LIZLTn~9Ai8hhm}pxnr0TvlO>rZWc2>-+r`D(|jg3A+Wu!cw>W|2R zHNu08(Bgm7_6Sv*x5V66p!qRqFDoZJ85qcIqq`#M{p5duTdOrvqNn0YcyjRU>>?om z?bNzLAE$)HGU8~*cN~wi-#3wva72Gv5bmc@h+~(Q3sjjF7@^eAqx1dvc@^|XmwIOr zC>JeqGkou266fM${nkjlOmCIEt{CHE0HG^})Ro&2d>%X@kf@{^z*#td+`MMFD5fLh z-(KoUgm|-us4c*;1<85S$p3zjwCH>&Q=s}@dgEFTS{2Vlw|#yzkZE%?L5qg4l%YgZ zt}(2={EmVCXrvfZU~D!~U8gvg#z&>rrzyafJ%f+To@{SUidusX*_^Zi^UD)yV(2uI zh)`l+scTz0HD~({T11cc<5vhMCg&8$3znWpGotZ$*q+c;i|r= zT2zUZdAJ*@R-xx3?JuA9{;Yf~+fx7bW`FnQ)Dvm3@ss7cl4rPu&PID&c4hcJsYCbF zXxWxN9K6vwa4{#?dgz^%FSUJmV%23G_4q<&ko5a&E_^fYuH*>0U3m{8c@Ieac7!9S;}*o( z&a-6fw`i_Awx7En!}%NYDMGm3+oQ#Ofzo8(1Aif7;y##A&WB(N% z80j-{#zYq)hoIi@)c#Su9W-$aTPj^BoASC=-l4UxEWXnNz_0luPq}?bj8cQumHhCV zp6Y8m%g&`H-=iQtYV6ys%6$Z=E18+O*GYI~Jd4(BK(a~p0;sh80T#Rau90(|k0 z9>!pQq+fDVJHt857e5@`(>l6mtbpIhb>r(6$N$&QBt)IljUJhD0>5!;%qgX5Q~boab$*23Q#dr!l;_zvYt;_gdyAnYGoiAbp34VzoS6MPI%FdnEzh zpCb$(ir_@FRtJ_A?c-Q${9x9qBrY=0#iD!YW&;jpCKX4WAer;TvPXjF%VKj|*=6(& z&C9EZ<^64A03o5QXH%PY%yP2j1D$=^UopGE*FlpwNogK_e?*x2D9<-E*)S=votZ&G zLMi&aDJjvv)}BvUMXrmwHT=;vW^#Q%YQto7X>tXQ89nEE*3X&pWcEyW-T}L!-vVc8 zrSB;Pn^~A!7WH|ZcUu@yL|X3R#o|Lv#Zz`Zc^gtS%XFL)Tg0t4uekeproi}tbx4)7 z&tB4x=bbkWCL!r{M>iizIrq4xwJraM#PK1bqoAsn3x;y7Q>u)m6NY8UI)85?+D$(D zHS;??aEg~L70B;Fsk~%TFnR{dsWW!lYg~hiKA3`C?9ye zA9Y4cm_Gn<(Ivw~!2Or@e_Jz^2)#Lb$cE{2hnG_ew@g838gk|O31(()dI|odhJ)XG zfJ)3U3=4tbeC2CC&))5|G7d)gBZQesqkWtsWdfzNV|GiN->g%J)VN`H=?yN=){-yC zYX+73H%`-&4Q@;eWQzuhVn)ACRVW}U%YA!4tNIJE@j%G?$N9nS%|87^jSY1soeCEt z>G+)@r3KRR8FlL%NjPLY-W zL!zRG);)|1^12G+t@}yJp@$=)v9H}1Fk>xE4e#Y!4@EyI z3}=t~SHr1a${Lo=t*y`WckTBaP*nb~mAv%4Rk<Z{>id~c+4 z>*L_Hsk7-=F1xU!m^2dQPsUfSphAAffZHH?$rSQeEj9yo+)ex zwZmcbeb+|U3?0#J0rFjFEyG`un$hD^|KYyofhfDSg#DPKk727x5>83xDJ2z z_6+`}-5B_l669hbRzJqgLy_@BkgZ8YSigCJ;nWSkHyN9On6!uJ{Ep+3JC@E%%OJb7 zu==>B6|jFFih<1*4UT#@)$8zp0^&xrDD{{_H=?o+U-qU}E9Ch7^5*_UCb3a&svWha zJW-jXR+}M0_`zbGBr}F5GSG9SAr;5}DqJ$Ic7o)*TEWsqOZ}%6Jv9|tlkJr;P#$j` ztfhIGOA&ab7oXh8seALi2nMq4;e~b5^rv)$rGE#dvr&>8vcHg;j3U*U?XK2}C6f{= zA#sB`C3`+Ht2?{^kFHpSiIyr8aYMd(&`uQwCwS-BGgGo=Ers({tc#%noQI5n zWr;nY4{6y$GDDstnJ-}|MhGtdQ{XGh;Zgw9e@HT;sVi) zM!#>lE8cyQs@{@+z`xnu2T}})QmKRJ@+5VieEjFkFie_bS`Fm_v<+oFUnP4TsUJOG zckR*6!WtP~ZtoVyVn#1mSMbMaIQ-95o@RTMU46|iz;U%7Ol(Y3;T(K80G?;FA8qg6 zjZ>?IQiBB{TWt0@XZk?JEX9cxjg}&r*A%E5<9hC){r1`pR(4b8%N(=ACXk7JE}tb;6C?u z&Ls`d@=kwq)t~SqJ~*to>IBUZrou(4u;rS?3Z4(Gm-)is0BAz(0_}C67)EhV`7b$} zKvS1ra}o8T|Kdl(f)^Od43{(lJBtUHNXAY5l|6uQ657dJhblru81TaPn}B(vz2ET7 zyGbdshTQ=Monv7w%aBt{=fe*va~zu7C(Xlf0ob5kUpb`ygejY+rpl^Dk`8l!UU!fM zKCYta-9%&~5q_PVV^vTydT}c`Sa) zm0T>+uD8UOf>0YqTe728uO3-&V6&b)J94f>d+bCLQept5b-;vEwD zo5o!r#XjU663>DXjUB(WsRwt{v}kQ zmn`2=(tnN%+z0EKN+XhA;Fa*D?v9Dk34%GZTB6`QH>QnH_-Yq*^N z&!N~`QVZQ|WR7AC1w(~1fE$8!`@DX~?2L#==5RHVp$I!51J)VfCd+YwUb`Z7GnDT2c0bwJ8sq4sPUAyc#e-IX-h6|tZdRHQ1nkvuA5Hp?r7Q~ zUMJBiTx)4%hI&s`{u_lg^QwBrJu_gL(HQ6h@sV7j(M_%Oc_tx{zE7}PiB#};ks)1L zS$;%aK%&Ti*z!LXf2n8y8Li)$!(`iPZL!^2x5kB5L7qr8ck|@R_M>wdcfZi~de5W# zoaJY{Pt|><#z6C=**6F)fZMH%WVW5NtR|mr*KF4Oj&ThJX!`=MC~LoQTniTn7#Ac~ zhC5Q{M<+-s|fUEad<(v!$aAp@H@!MccY=sH&t`$8Hd=C{WF7OQy@o`t^GxW1N#VAI-Ld& zt;bu&NW_#`a6pSCi6Jt=`#;mB;z3^Y&%0H>cwEa46?iY!!?HnvFcq`j+bA zzhqCy333rIfKl~r1BO8hy0B9n2?D?$0b1co=B)jwaBy03N zpsiSiOyvIjgXClAep4F{kVw$o0`B;GEILua{Xd6@*I1nro7Kguf(bHfi3Lb@-5NDX$4fE+|IAJA%s z@Gdl0o7}E_HgcY_Ca>a_>Bh+Kn+9;)h+-KzYPrPCi zK1=(&qA$ufU?TtS;`N~FRIB3(FC-5YTTC9`IsZ+J%5Ht!;oVdeY{G*!;58CI9E#Sd%)A$ZKsI^? zzeQ5wW!-&`qRGMVt~X4MX-t0l#6^Z`tukLiHj~Xwbyw3oO38|PNp$S&fubj2DkRO3 z8jj5KYaKw{?97So8QUMDP$!lcM6NPWMt{){XP?lIMPlsCSoYLI_`Fc zVh&UMO`9mM`#Q!!TL&ko06|`#IkvDroI3|FR6gTU^4nfh;PGXsCt5O0jpWa?E*dXK zWx`>vC(zpZER=m_U-&MtfPkT+DF=N`U6em`!HdSksnnugcG~Aogi+zqh^WL({R=z4 z2PAroFOSyXgLk!2zYJcMaxWl88UhNm-+pEVRK0lyOsuSKhUj#`~L;s#8z@@ zMJ5eWl<7nxLv0xLwd54K&xd5rx~Z#`-!jd|%Up$$6y>8{IBtTA@~zpi4`6T@KRuFu zfoLtDcroWt%Z@OpTN8<*0n>}XWzHQ)oZ984bJ=|B&q^Wi*J-q}V6B;|sr)+C(7{C{ zn~*55<}!OKWN`AbPFTE5m8)%g*gNuN%`n#811qG4rb&oKZe*~T30-J8!C|M~Y#880 z0J9>DZM=AQxZ;~1OSsB}O9k;7R$gj?SLS}(noX-a0U!n`Gyek1<(q^=w3(2xGh`zb zy8W==CuN32OxP4D#R#Sj{|FDgUw1bv;Dw2n6YvMq1837666Yi$Y|9K&el6@LiDp#u zt7s%Wsp7LW)G(-ACx%S$K^bFHZyre$)7>^9tj#QPyq-*Hz~aQvZV;m@?>|*3BIOBp z(^U>5`JPZEvCcL(udvMY-DXdMxa_ey;NSpTY8Is;%3RU=mx*;eHJl*;~+~RzWr*VGVnhcT24Vt zG&Y09yKUT;u6x0n-i@)5WZ+HHWDxh`_G&VAfxFEc3hgU!c9Iq5hLDX7fprpA4sgjH z-bAA({(EqD=;chOxs3TPLr3#KLE>Tcc+frlH;HW&d%4*+1|K_w3Ll&iPh9u#qKjW< zzq<%qlJ;PJe47}|pLAd^<3aqmQ=wa!rAcL_5oT(r*_IH~;Fo5q%N%c*YdzRDCYc>qBSV@hr1O zYQyI9xqv)XM{G1BGfHAJ@M}@WO}o|bR-ZwOpQP@E1;AxWM;x6?$cx!TTnq0tzna3P zVU6l6J@?95S&z$x)NV18jyrRgUwtlC?@5Qt{?C6DiNOgKNieOHF4Pn@T4%Dx3h9$F zRIFx!4hx9$-R{>Yb(|SMSi{~|RaWRVq3be>zTP~haz`DuWwNRt+1S(Rw0m?Nt)I~C z;!1tZ;w&8{+PPkJxS&7w1`Z7|9oeM5hX|evqjA>{X+C-7-wsi+iiU33R|>z5i>8$| z|DJhajoK@g25XGD5*DO)afKE;$&ALNytK9!WerxgSveS5^8HSA#d2?-?75LiT%rr* z-=+QQ?SO7WkOkP{C9V7Zp`LqkSXo8sJOY0#fBe+hx+iqw-;nW(;2r9 F{~y21SA+ln literal 0 HcmV?d00001 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 b8e3a289c..74c20d6be 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 @@ -37,6 +37,7 @@ import com.badlogic.gdx.backends.lwjgl.LwjglFileHandle; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Pool; + import com.esotericsoftware.spine.AnimationState.AnimationStateListener; import com.esotericsoftware.spine.AnimationState.TrackEntry; import com.esotericsoftware.spine.attachments.AttachmentLoader; @@ -651,14 +652,15 @@ public class AnimationStateTests { expect(0, "start", 0, 0.4f), // expect(0, "event 0", 0.1f, 0.5f), // + + expect(1, "end", 0.8f, 0.9f), // + expect(1, "dispose", 0.8f, 0.9f), // + expect(0, "event 14", 0.5f, 0.9f), // expect(2, "end", 0.8f, 1.1f), // expect(2, "dispose", 0.8f, 1.1f), // - expect(1, "end", 0.8f, 1.1f), // - expect(1, "dispose", 0.8f, 1.1f), // - expect(0, "event 30", 1, 1.4f), // expect(0, "complete", 1, 1.4f), // expect(0, "end", 1, 1.5f), // diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java index db816aa05..b5c8d2e7d 100644 --- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java +++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/EventTimelineTests.java @@ -42,7 +42,7 @@ public class EventTimelineTests { private final SkeletonData skeletonData; private final Skeleton skeleton; private final Array firedEvents = new Array(); - private EventTimeline timeline = new EventTimeline(0); + private EventTimeline timeline = new EventTimeline(1); private char[] events; private float[] frames;