Parcourir la source

[libgdx] Updated examples.

NathanSweet il y a 9 ans
Parent
commit
00f75cf3fa
29 fichiers modifiés avec 393 ajouts et 2657 suppressions
  1. BIN
      examples/tank/export/raptor.skel
  2. 0 292
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.atlas
  3. 120 114
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.json
  4. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.png
  5. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.skel
  6. 0 292
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.atlas
  7. 16 15
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.json
  8. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.png
  9. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.skel
  10. 0 251
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.atlas
  11. 219 130
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.json
  12. BIN
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.png
  13. BIN
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.skel
  14. 0 166
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-diffuse.atlas
  15. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-diffuse.png
  16. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-normal.png
  17. 0 990
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old.json
  18. 0 194
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.atlas
  19. 25 32
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.json
  20. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.png
  21. BIN
      spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.skel
  22. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/Box2DExample.java
  23. 0 171
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/IkTest.java
  24. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/MixTest.java
  25. 6 3
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java
  26. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest1.java
  27. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest2.java
  28. 1 1
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest3.java
  29. 2 2
      spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SkeletonAttachmentTest.java

BIN
examples/tank/export/raptor.skel


+ 0 - 292
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.atlas

@@ -1,292 +0,0 @@
-
-goblins-mesh.png
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-dagger
-  rotate: false
-  xy: 2, 28
-  size: 26, 108
-  orig: 26, 108
-  offset: 0, 0
-  index: -1
-goblin/eyes-closed
-  rotate: false
-  xy: 137, 29
-  size: 34, 12
-  orig: 34, 12
-  offset: 0, 0
-  index: -1
-goblin/head
-  rotate: false
-  xy: 26, 357
-  size: 103, 66
-  orig: 103, 66
-  offset: 0, 0
-  index: -1
-goblin/left-arm
-  rotate: false
-  xy: 30, 28
-  size: 37, 35
-  orig: 37, 35
-  offset: 0, 0
-  index: -1
-goblin/left-foot
-  rotate: false
-  xy: 134, 260
-  size: 65, 31
-  orig: 65, 31
-  offset: 0, 0
-  index: -1
-goblin/left-hand
-  rotate: false
-  xy: 69, 25
-  size: 36, 41
-  orig: 36, 41
-  offset: 0, 0
-  index: -1
-goblin/left-lower-leg
-  rotate: false
-  xy: 134, 293
-  size: 33, 70
-  orig: 33, 70
-  offset: 0, 0
-  index: -1
-goblin/left-shoulder
-  rotate: false
-  xy: 137, 43
-  size: 29, 44
-  orig: 29, 44
-  offset: 0, 0
-  index: -1
-goblin/left-upper-leg
-  rotate: false
-  xy: 30, 65
-  size: 33, 73
-  orig: 33, 73
-  offset: 0, 0
-  index: -1
-goblin/neck
-  rotate: false
-  xy: 201, 387
-  size: 36, 41
-  orig: 36, 41
-  offset: 0, 0
-  index: -1
-goblin/pelvis
-  rotate: false
-  xy: 26, 140
-  size: 62, 43
-  orig: 62, 43
-  offset: 0, 0
-  index: -1
-goblin/right-arm
-  rotate: false
-  xy: 171, 84
-  size: 23, 50
-  orig: 23, 50
-  offset: 0, 0
-  index: -1
-goblin/right-foot
-  rotate: false
-  xy: 134, 225
-  size: 63, 33
-  orig: 63, 33
-  offset: 0, 0
-  index: -1
-goblin/right-hand
-  rotate: false
-  xy: 204, 258
-  size: 36, 37
-  orig: 36, 37
-  offset: 0, 0
-  index: -1
-goblin/right-lower-leg
-  rotate: false
-  xy: 201, 430
-  size: 36, 76
-  orig: 36, 76
-  offset: 0, 0
-  index: -1
-goblin/right-shoulder
-  rotate: false
-  xy: 130, 89
-  size: 39, 45
-  orig: 39, 45
-  offset: 0, 0
-  index: -1
-goblin/right-upper-leg
-  rotate: false
-  xy: 98, 214
-  size: 34, 63
-  orig: 34, 63
-  offset: 0, 0
-  index: -1
-goblin/torso
-  rotate: false
-  xy: 131, 410
-  size: 68, 96
-  orig: 68, 96
-  offset: 0, 0
-  index: -1
-goblin/undie-straps
-  rotate: false
-  xy: 2, 7
-  size: 55, 19
-  orig: 55, 19
-  offset: 0, 0
-  index: -1
-goblin/undies
-  rotate: false
-  xy: 199, 227
-  size: 36, 29
-  orig: 36, 29
-  offset: 0, 0
-  index: -1
-goblingirl/eyes-closed
-  rotate: false
-  xy: 59, 2
-  size: 37, 21
-  orig: 37, 21
-  offset: 0, 0
-  index: -1
-goblingirl/head
-  rotate: false
-  xy: 26, 425
-  size: 103, 81
-  orig: 103, 81
-  offset: 0, 0
-  index: -1
-goblingirl/left-arm
-  rotate: false
-  xy: 201, 190
-  size: 37, 35
-  orig: 37, 35
-  offset: 0, 0
-  index: -1
-goblingirl/left-foot
-  rotate: false
-  xy: 134, 192
-  size: 65, 31
-  orig: 65, 31
-  offset: 0, 0
-  index: -1
-goblingirl/left-hand
-  rotate: false
-  xy: 196, 109
-  size: 35, 40
-  orig: 35, 40
-  offset: 0, 0
-  index: -1
-goblingirl/left-lower-leg
-  rotate: false
-  xy: 169, 293
-  size: 33, 70
-  orig: 33, 70
-  offset: 0, 0
-  index: -1
-goblingirl/left-shoulder
-  rotate: false
-  xy: 107, 30
-  size: 28, 46
-  orig: 28, 46
-  offset: 0, 0
-  index: -1
-goblingirl/left-upper-leg
-  rotate: false
-  xy: 65, 68
-  size: 33, 70
-  orig: 33, 70
-  offset: 0, 0
-  index: -1
-goblingirl/neck
-  rotate: false
-  xy: 204, 297
-  size: 35, 41
-  orig: 35, 41
-  offset: 0, 0
-  index: -1
-goblingirl/pelvis
-  rotate: false
-  xy: 131, 365
-  size: 62, 43
-  orig: 62, 43
-  offset: 0, 0
-  index: -1
-goblingirl/right-arm
-  rotate: false
-  xy: 100, 97
-  size: 28, 50
-  orig: 28, 50
-  offset: 0, 0
-  index: -1
-goblingirl/right-foot
-  rotate: false
-  xy: 134, 157
-  size: 63, 33
-  orig: 63, 33
-  offset: 0, 0
-  index: -1
-goblingirl/right-hand
-  rotate: false
-  xy: 199, 151
-  size: 36, 37
-  orig: 36, 37
-  offset: 0, 0
-  index: -1
-goblingirl/right-lower-leg
-  rotate: false
-  xy: 96, 279
-  size: 36, 76
-  orig: 36, 76
-  offset: 0, 0
-  index: -1
-goblingirl/right-shoulder
-  rotate: false
-  xy: 204, 340
-  size: 39, 45
-  orig: 39, 45
-  offset: 0, 0
-  index: -1
-goblingirl/right-upper-leg
-  rotate: false
-  xy: 98, 149
-  size: 34, 63
-  orig: 34, 63
-  offset: 0, 0
-  index: -1
-goblingirl/torso
-  rotate: false
-  xy: 26, 259
-  size: 68, 96
-  orig: 68, 96
-  offset: 0, 0
-  index: -1
-goblingirl/undie-straps
-  rotate: false
-  xy: 134, 136
-  size: 55, 19
-  orig: 55, 19
-  offset: 0, 0
-  index: -1
-goblingirl/undies
-  rotate: false
-  xy: 196, 78
-  size: 36, 29
-  orig: 36, 29
-  offset: 0, 0
-  index: -1
-shield
-  rotate: false
-  xy: 26, 185
-  size: 70, 72
-  orig: 70, 72
-  offset: 0, 0
-  index: -1
-spear
-  rotate: false
-  xy: 2, 138
-  size: 22, 368
-  orig: 22, 368
-  offset: 0, 0
-  index: -1

+ 120 - 114
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.json

@@ -1,26 +1,27 @@
 {
+"skeleton": { "hash": "P7CQ4ImK+tcAICATgSttlZ5HOSM", "spine": "3.4.00", "width": 0, "height": 0, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.64, "y": 114.41 },
-	{ "name": "left upper leg", "parent": "hip", "length": 50.39, "x": 14.45, "y": 2.81, "rotation": -89.09 },
+	{ "name": "torso", "parent": "hip", "length": 85.82, "rotation": 93.92, "x": -6.42, "y": 1.97 },
+	{ "name": "neck", "parent": "torso", "length": 18.38, "rotation": -1.51, "x": 81.67, "y": -6.34 },
+	{ "name": "head", "parent": "neck", "length": 68.28, "rotation": -13.92, "x": 20.93, "y": 11.59 },
+	{ "name": "left shoulder", "parent": "torso", "length": 35.43, "rotation": -156.96, "x": 74.04, "y": -20.38 },
+	{ "name": "left arm", "parent": "left shoulder", "length": 35.62, "rotation": 28.16, "x": 37.85, "y": -2.34 },
+	{ "name": "left upper leg", "parent": "hip", "length": 50.39, "rotation": -89.09, "x": 14.45, "y": 2.81 },
+	{ "name": "left lower leg", "parent": "left upper leg", "length": 49.89, "rotation": -16.65, "x": 56.34, "y": 0.98 },
+	{ "name": "left foot", "parent": "left lower leg", "length": 46.5, "rotation": 102.43, "x": 58.94, "y": -7.61 },
+	{ "name": "left hand", "parent": "left arm", "length": 11.52, "rotation": 2.7, "x": 35.62, "y": 0.07 },
 	{ "name": "pelvis", "parent": "hip", "x": 1.41, "y": -6.57 },
-	{ "name": "right upper leg", "parent": "hip", "length": 42.45, "x": -20.07, "y": -6.83, "rotation": -97.49 },
-	{ "name": "torso", "parent": "hip", "length": 85.82, "x": -6.42, "y": 1.97, "rotation": 93.92 },
-	{ "name": "left lower leg", "parent": "left upper leg", "length": 49.89, "x": 56.34, "y": 0.98, "rotation": -16.65 },
-	{ "name": "left shoulder", "parent": "torso", "length": 35.43, "x": 74.04, "y": -20.38, "rotation": -156.96 },
-	{ "name": "neck", "parent": "torso", "length": 18.38, "x": 81.67, "y": -6.34, "rotation": -1.51 },
-	{ "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "x": 42.99, "y": -0.61, "rotation": -14.34 },
-	{ "name": "right shoulder", "parent": "torso", "length": 37.24, "x": 76.02, "y": 18.14, "rotation": 133.88 },
-	{ "name": "head", "parent": "neck", "length": 68.28, "x": 20.93, "y": 11.59, "rotation": -13.92 },
-	{ "name": "left arm", "parent": "left shoulder", "length": 35.62, "x": 37.85, "y": -2.34, "rotation": 28.16 },
-	{ "name": "left foot", "parent": "left lower leg", "length": 46.5, "x": 58.94, "y": -7.61, "rotation": 102.43 },
-	{ "name": "right arm", "parent": "right shoulder", "length": 36.74, "x": 37.6, "y": 0.31, "rotation": 36.32 },
-	{ "name": "right foot", "parent": "right lower leg", "length": 45.45, "x": 64.88, "y": 0.04, "rotation": 110.3 },
-	{ "name": "left hand", "parent": "left arm", "length": 11.52, "x": 35.62, "y": 0.07, "rotation": 2.7 },
-	{ "name": "right hand", "parent": "right arm", "length": 15.32, "x": 36.9, "y": 0.34, "rotation": 2.35 },
-	{ "name": "spear1", "parent": "left hand", "length": 65.06, "x": 0.48, "y": 17.03, "rotation": 102.43 },
-	{ "name": "spear2", "parent": "spear1", "length": 61.41, "x": 65.05, "y": 0.04, "rotation": 0.9 },
-	{ "name": "spear3", "parent": "spear2", "length": 76.79, "x": 61.88, "y": 0.57, "rotation": -0.9 }
+	{ "name": "right shoulder", "parent": "torso", "length": 37.24, "rotation": 133.88, "x": 76.02, "y": 18.14 },
+	{ "name": "right arm", "parent": "right shoulder", "length": 36.74, "rotation": 36.32, "x": 37.6, "y": 0.31 },
+	{ "name": "right upper leg", "parent": "hip", "length": 42.45, "rotation": -97.49, "x": -20.07, "y": -6.83 },
+	{ "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "rotation": -14.34, "x": 42.99, "y": -0.61 },
+	{ "name": "right foot", "parent": "right lower leg", "length": 45.45, "rotation": 110.3, "x": 64.88, "y": 0.04 },
+	{ "name": "right hand", "parent": "right arm", "length": 15.32, "rotation": 2.35, "x": 36.9, "y": 0.34 },
+	{ "name": "spear1", "parent": "left hand", "length": 65.06, "rotation": 102.43, "x": 0.48, "y": 17.03 },
+	{ "name": "spear2", "parent": "spear1", "length": 61.41, "rotation": 0.9, "x": 65.05, "y": 0.04 },
+	{ "name": "spear3", "parent": "spear2", "length": 76.79, "rotation": -0.9, "x": 61.88, "y": 0.57 }
 ],
 "slots": [
 	{ "name": "left shoulder", "bone": "left shoulder", "attachment": "left shoulder" },
@@ -52,12 +53,12 @@
 		"left hand item": {
 			"dagger": { "x": 7.88, "y": -23.45, "rotation": 10.47, "width": 26, "height": 108 },
 			"spear": {
-				"type": "skinnedmesh",
+				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54327, 0.22589, 0.38361, 0.2089, 0.21605, 0.20043, 0.13242, 0, 0.11519, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
-				"vertices": [ 1, 20, 38.54, -10.88, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.58, 0.51, 20, -0.31, -6.16, 0.48, 2, 18, 64.73, -5.03, 0.5, 19, -0.4, -5.06, 0.49, 1, 16, 4.56, 23.91, 1, 1, 16, 41.7, -138.95, 1, 1, 16, 32.42, -141.1, 1, 1, 16, -6.49, 22.4, 1, 2, 18, 65.48, 6.64, 0.5, 19, 0.53, 6.59, 0.49, 2, 19, 62.18, 6.66, 0.51, 20, 0.2, 6.09, 0.48, 1, 20, 30.96, 6.61, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.59, 1, 1, 20, 79.78, -1.29, 1 ],
-				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
+				"vertices": [ 1, 20, 38.54, -10.88, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.58, 0.5116, 20, -0.31, -6.16, 0.48839, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.06, 0.49728, 1, 10, 4.56, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.41999, -141.1, 1, 1, 10, -6.49, 22.4, 1, 2, 18, 65.48, 6.64, 0.50272, 19, 0.52999, 6.59, 0.49728, 2, 19, 62.18, 6.66, 0.5116, 20, 0.2, 6.09, 0.48839, 1, 20, 30.96, 6.61, 1, 1, 20, 37.25999, 11.09, 1, 1, 20, 79.75, 1.59, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
+				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],
 				"width": 22,
 				"height": 368
 			}
@@ -68,8 +69,8 @@
 				"uvs": [ 0.78091, 0.38453, 1, 0.38405, 1, 0.44881, 0.73953, 0.4687, 0.74641, 0.81344, 0.34022, 1, 0.15434, 1, 0.11303, 0.78858, 0.23007, 0.47367, 0, 0.45047, 0, 0.38621, 0.22367, 0.38573, 0.24384, 0, 1, 0 ],
 				"triangles": [ 0, 12, 13, 11, 12, 0, 0, 1, 2, 9, 10, 11, 3, 11, 0, 3, 0, 2, 8, 11, 3, 9, 11, 8, 5, 6, 7, 4, 5, 8, 4, 8, 3, 5, 7, 8 ],
 				"vertices": [ 15.49, -12.82, 21.13, -13.57, 20.16, -20.49, 13.15, -21.67, 8.13, -58.56, -5.13, -77.04, -9.92, -76.36, -7.79, -53.6, -0.03, -20.36, -5.6, -17.04, -4.63, -10.17, 1.12, -10.93, 7.46, 30.24, 26.93, 27.49 ],
-				"edges": [ 22, 20, 24, 26, 22, 24, 2, 0, 0, 22, 0, 26, 12, 14, 14, 16, 18, 20, 16, 18, 2, 4, 4, 6, 6, 8, 10, 12, 8, 10 ],
 				"hull": 14,
+				"edges": [ 22, 20, 24, 26, 22, 24, 2, 0, 0, 22, 0, 26, 12, 14, 14, 16, 18, 20, 16, 18, 2, 4, 4, 6, 6, 8, 10, 12, 8, 10 ],
 				"width": 26,
 				"height": 108
 			}
@@ -87,10 +88,10 @@
 				"name": "goblin/head",
 				"type": "mesh",
 				"uvs": [ 0, 0.60494, 0.14172, 0.5145, 0.24218, 0.55229, 0.32667, 0.67806, 0.37969, 0.79352, 0.53505, 0.93014, 0.86056, 1, 0.94071, 0.94169, 0.92098, 0.69923, 0.9888, 0.65497, 0.99003, 0.51643, 0.89632, 0.43561, 0.94487, 0.41916, 1, 0.39713, 1, 0.2836, 0.94017, 0.27027, 0.87906, 0.25666, 0.80754, 0.16044, 0.66698, 0.01997, 0.4734, 0.01805, 0.29215, 0.19893, 0.25392, 0.31823, 0.09117, 0.324, 0, 0.44331, 0.43271, 0.69153, 0.466, 0.47794, 0.35996, 0.31246, 0.73473, 0.68593, 0.72215, 0.57425, 0.88179, 0.5583, 0.80267, 0.51015 ],
-				"triangles": [ 26, 20, 19, 21, 20, 26, 15, 14, 13, 12, 15, 13, 11, 16, 15, 11, 15, 12, 26, 17, 25, 18, 26, 19, 17, 26, 18, 30, 25, 17, 30, 17, 16, 30, 16, 11, 1, 22, 21, 23, 22, 1, 2, 1, 21, 2, 21, 26, 29, 30, 11, 29, 11, 10, 28, 25, 30, 0, 23, 1, 9, 29, 10, 25, 3, 2, 25, 2, 26, 29, 27, 28, 29, 28, 30, 24, 3, 25, 24, 25, 28, 24, 28, 27, 8, 29, 9, 27, 29, 8, 4, 3, 24, 5, 24, 27, 4, 24, 5, 7, 6, 27, 7, 27, 8, 5, 27, 6 ],
-				"vertices": [ 14.56, 50.42, 23.12, 35.47, 17.46, 26.36, 11.57, 16.86, 3.74, 11.71, -5.89, -3.91, -11.83, -37.23, -8.31, -45.63, 7.75, -44.24, 10.39, -51.33, 19.52, -51.82, 25.21, -43.15, 26.12, -47.43, 27.35, -53.16, 34.84, -53.46, 35.96, -47.33, 37.11, -41.08, 43.75, -33.97, 53.58, -19.87, 54.5, 0.03, 43.31, 19.16, 35.6, 23.41, 35.89, 40.17, 28.39, 49.87, 10.25, 5.99, 24.2, 2, 35.55, 12.48, 9.39, -25.1, 16.8, -24.31, 17.2, -40.65, 20.68, -33.02 ],
-				"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
+				"triangles": [ 5, 27, 6, 7, 27, 8, 7, 6, 27, 4, 24, 5, 5, 24, 27, 4, 3, 24, 27, 29, 8, 8, 29, 9, 24, 28, 27, 24, 25, 28, 24, 3, 25, 29, 28, 30, 29, 27, 28, 25, 2, 26, 25, 3, 2, 9, 29, 10, 0, 23, 1, 28, 25, 30, 29, 11, 10, 29, 30, 11, 2, 21, 26, 2, 1, 21, 23, 22, 1, 1, 22, 21, 30, 16, 11, 30, 17, 16, 30, 25, 17, 17, 26, 18, 18, 26, 19, 26, 17, 25, 11, 15, 12, 11, 16, 15, 12, 15, 13, 15, 14, 13, 21, 20, 26, 26, 20, 19 ],
+				"vertices": [ 14.56, 50.42, 23.12, 35.47, 17.45999, 26.36, 11.57, 16.86, 3.74, 11.71, -5.89, -3.91, -11.83, -37.23, -8.31, -45.63, 7.75, -44.24, 10.39, -51.33, 19.52, -51.82, 25.21, -43.15, 26.12, -47.43, 27.35, -53.16, 34.84, -53.46, 35.96, -47.33, 37.11, -41.08, 43.75, -33.97, 53.58, -19.87, 54.5, 0.03, 43.31, 19.16, 35.59999, 23.41, 35.89, 40.16999, 28.39, 49.87, 10.25, 5.99, 24.2, 2, 35.55, 12.48, 9.39, -25.1, 16.79999, -24.31, 17.2, -40.65, 20.68, -33.02 ],
 				"hull": 24,
+				"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 26, 28, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 0, 46, 6, 48, 48, 50, 50, 52, 52, 42, 2, 4, 4, 6, 4, 52, 2, 44, 22, 32, 22, 24, 24, 26, 28, 30, 30, 32, 24, 30, 16, 54, 54, 56, 20, 58, 58, 54, 16, 58, 22, 60, 60, 56, 58, 60 ],
 				"width": 103,
 				"height": 66
 			}
@@ -100,10 +101,10 @@
 				"name": "goblin/left-arm",
 				"type": "mesh",
 				"uvs": [ 0.68992, 0.29284, 1, 0.46364, 1, 0.74643, 0.84089, 1, 0.66344, 1, 0.33765, 0.64284, 0, 0.44124, 0, 0, 0.34295, 0 ],
-				"triangles": [ 6, 7, 8, 5, 6, 8, 0, 5, 8, 0, 1, 2, 5, 0, 2, 4, 5, 2, 3, 4, 2 ],
-				"vertices": [ 18.6, 8.81, 32.19, 10.31, 38.02, 1.62, 38.08, -9.63, 32.31, -13.49, 14.37, -9.62, -0.75, -10.78, -9.84, 2.77, 1.29, 10.25 ],
-				"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 6, 4, 6, 8, 8, 10, 12, 14, 10, 12 ],
+				"triangles": [ 3, 4, 2, 4, 5, 2, 5, 0, 2, 0, 1, 2, 0, 5, 8, 5, 6, 8, 6, 7, 8 ],
+				"vertices": [ 18.6, 8.81, 32.18999, 10.31, 38.02, 1.62, 38.08, -9.63, 32.31, -13.49, 14.37, -9.62, -0.75, -10.78, -9.84, 2.77, 1.29, 10.25 ],
 				"hull": 9,
+				"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 6, 4, 6, 8, 8, 10, 12, 14, 10, 12 ],
 				"width": 37,
 				"height": 35
 			}
@@ -115,8 +116,8 @@
 				"uvs": [ 0.15733, 0.31873, 0.08195, 0.78502, 0.15884, 0.99366, 0.41633, 0.96804, 0.68822, 0.97636, 1, 0.96388, 0.99385, 0.73501, 0.85294, 0.51862, 0.61479, 0.31056, 0.46991, 0, 0.48032, 0.75604, 0.75994, 0.77706 ],
 				"triangles": [ 0, 9, 8, 10, 0, 8, 10, 8, 7, 11, 10, 7, 11, 7, 6, 1, 0, 10, 11, 6, 5, 3, 1, 10, 4, 10, 11, 4, 11, 5, 3, 10, 4, 2, 1, 3 ],
 				"vertices": [ 2.28, 13.07, -1.76, -1.64, 3.59, -7.8, 20.25, -6.04, 37.91, -5.27, 58.12, -3.71, 57.31, 3.34, 47.78, 9.51, 31.95, 15.05, 21.99, 24.11, 24.03, 0.75, 42.21, 1.16 ],
-				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
 				"hull": 10,
+				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 6, 20, 20, 16, 2, 20, 8, 22, 22, 14, 20, 22, 22, 10 ],
 				"width": 65,
 				"height": 31
 			}
@@ -127,9 +128,9 @@
 				"type": "mesh",
 				"uvs": [ 0.518, 0.12578, 1, 0.16285, 0.99788, 0.50578, 0.69745, 1, 0.37445, 1, 0, 0.80051, 0, 0.42792, 0.17601, 0, 0.43567, 0 ],
 				"triangles": [ 2, 0, 1, 0, 5, 6, 6, 7, 0, 0, 7, 8, 3, 4, 0, 4, 5, 0, 2, 3, 0 ],
-				"vertices": [ -3.11, 15.42, 10.83, 22.27, 15.5, 14.55, 18.35, -8.96, 9.48, -14.32, -4.58, -14.3, -11.63, -2.63, -14.89, 13.68, -7.75, 17.99 ],
-				"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
+				"vertices": [ -3.11, 15.42, 10.83, 22.27, 15.5, 14.55, 18.35, -8.96, 9.47999, -14.32, -4.58, -14.3, -11.63, -2.63, -14.89, 13.68, -7.75, 17.99 ],
 				"hull": 9,
+				"edges": [ 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 14, 16, 12, 14 ],
 				"width": 36,
 				"height": 41
 			}
@@ -140,9 +141,9 @@
 				"type": "mesh",
 				"uvs": [ 0.95508, 0.20749, 0.81927, 0.65213, 0.94754, 0.77308, 0.67842, 0.97346, 0.46463, 1, 0.26845, 1, 0.04963, 0.90706, 0.2106, 0.60115, 0.07478, 0.40195, 0.18545, 0, 0.28857, 0 ],
 				"triangles": [ 10, 8, 9, 1, 7, 10, 7, 8, 10, 0, 1, 10, 1, 4, 7, 3, 1, 2, 5, 6, 7, 7, 4, 5, 1, 3, 4 ],
-				"vertices": [ -0.19, 6.82, 30.97, 10.96, 37.97, 17.33, 53.88, 12.6, 57.58, 6.31, 59.34, 0.08, 55.04, -8.63, 32.99, -9.33, 20.79, -17.43, -7.27, -21.56, -8.19, -18.29 ],
-				"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
+				"vertices": [ -0.19, 6.82, 30.97, 10.96, 37.97, 17.33, 53.88, 12.6, 57.58, 6.31, 59.34, 0.08, 55.04, -8.63, 32.99, -9.33, 20.79, -17.43, -7.27, -21.56, -8.18999, -18.29 ],
 				"hull": 11,
+				"edges": [ 20, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 18, 20, 16, 18 ],
 				"width": 33,
 				"height": 70
 			}
@@ -152,10 +153,10 @@
 				"name": "goblin/left-shoulder",
 				"type": "mesh",
 				"uvs": [ 0.7377, 0.40692, 1, 0.75237, 1, 1, 0.62046, 1, 0.26184, 0.56601, 0, 0.29783, 0, 0, 0.44115, 0 ],
-				"triangles": [ 5, 6, 7, 4, 5, 7, 4, 7, 0, 3, 4, 0, 3, 0, 1, 3, 1, 2 ],
-				"vertices": [ 15.18, 5.74, 32.17, 5.32, 41.79, 0.21, 36.63, -9.5, 14.88, -9.72, 0.9, -10.89, -10.66, -4.74, -4.66, 6.54 ],
-				"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
+				"triangles": [ 3, 1, 2, 3, 0, 1, 3, 4, 0, 4, 7, 0, 4, 5, 7, 5, 6, 7 ],
+				"vertices": [ 15.18, 5.74, 32.16999, 5.32, 41.79, 0.21, 36.63, -9.5, 14.88, -9.72, 0.9, -10.89, -10.66, -4.73999, -4.66, 6.54 ],
 				"hull": 8,
+				"edges": [ 12, 14, 14, 0, 4, 2, 0, 2, 4, 6, 6, 8, 10, 12, 8, 10 ],
 				"width": 29,
 				"height": 44
 			}
@@ -167,8 +168,8 @@
 				"uvs": [ 1, 0.12167, 1, 0.54873, 0.91067, 0.78907, 0.76567, 1, 0.3087, 0.9579, 0, 0.68777, 0, 0.219, 0.51961, 0, 0.87552, 0 ],
 				"triangles": [ 7, 8, 0, 5, 6, 7, 0, 1, 7, 4, 5, 7, 1, 4, 7, 2, 4, 1, 3, 4, 2 ],
 				"vertices": [ 2.33, 13.06, 33.5, 12.57, 51, 9.34, 66.32, 4.31, 63, -10.71, 43.13, -20.58, 8.91, -20.04, -6.79, -2.64, -6.61, 9.1 ],
-				"edges": [ 10, 8, 8, 6, 6, 4, 4, 2, 10, 12, 12, 14, 14, 16, 2, 0, 16, 0 ],
 				"hull": 9,
+				"edges": [ 10, 8, 8, 6, 6, 4, 4, 2, 10, 12, 12, 14, 14, 16, 2, 0, 16, 0 ],
 				"width": 33,
 				"height": 73
 			}
@@ -178,10 +179,10 @@
 				"name": "goblin/neck",
 				"type": "mesh",
 				"uvs": [ 0.81967, 0.27365, 0.92101, 0.82048, 0.47134, 1, 0.15679, 0.9354, 0, 0.7556, 0.19268, 0.51833, 0.15468, 0.35706, 0, 0.21989, 0.13568, 0, 0.68878, 0, 0.70145, 0.53872 ],
-				"triangles": [ 6, 8, 9, 6, 9, 0, 7, 8, 6, 10, 5, 6, 0, 10, 6, 10, 0, 1, 3, 4, 5, 2, 5, 10, 2, 10, 1, 3, 5, 2 ],
-				"vertices": [ 18.62, -11.65, -3.98, -13.85, -10.28, 2.76, -6.91, 13.89, 0.8, 19.05, 10.06, 11.51, 16.74, 12.45, 22.71, 17.64, 31.4, 12.19, 30.12, -7.67, 8.05, -6.71 ],
-				"edges": [ 14, 12, 12, 10, 10, 8, 8, 6, 6, 4, 4, 2, 2, 20, 20, 0, 0, 18, 16, 18, 14, 16, 0, 2 ],
+				"triangles": [ 3, 5, 2, 2, 10, 1, 2, 5, 10, 3, 4, 5, 10, 0, 1, 0, 10, 6, 10, 5, 6, 7, 8, 6, 6, 9, 0, 6, 8, 9 ],
+				"vertices": [ 18.62, -11.65, -3.98, -13.85, -10.28, 2.76, -6.91, 13.89, 0.8, 19.04999, 10.06, 11.51, 16.74, 12.45, 22.71, 17.64, 31.4, 12.19, 30.12, -7.67, 8.05, -6.71 ],
 				"hull": 10,
+				"edges": [ 14, 12, 12, 10, 10, 8, 8, 6, 6, 4, 4, 2, 2, 20, 20, 0, 0, 18, 16, 18, 14, 16, 0, 2 ],
 				"width": 36,
 				"height": 41
 			}
@@ -193,8 +194,8 @@
 				"uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ],
 				"triangles": [ 1, 2, 3, 1, 3, 0 ],
 				"vertices": [ 25.38, -20.73, -36.61, -20.73, -36.61, 22.26, 25.38, 22.26 ],
-				"edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ],
 				"hull": 4,
+				"edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ],
 				"width": 62,
 				"height": 43
 			}
@@ -204,10 +205,10 @@
 				"name": "goblin/right-arm",
 				"type": "mesh",
 				"uvs": [ 1, 0.09223, 1, 0.8501, 0.72058, 1, 0.24384, 1, 0, 0.86558, 0.20822, 0.10919, 0.50903, 0, 0.85342, 0 ],
-				"triangles": [ 6, 7, 0, 2, 3, 5, 4, 5, 3, 1, 6, 0, 6, 2, 5, 1, 2, 6 ],
-				"vertices": [ -4.75, 8.89, 33.03, 11.74, 40.99, 5.89, 41.81, -5.03, 35.53, -11.13, -2.53, -9.2, -8.5, -2.71, -9.09, 5.18 ],
-				"edges": [ 8, 6, 4, 6, 4, 2, 12, 14, 2, 0, 14, 0, 10, 12, 8, 10 ],
+				"triangles": [ 1, 2, 6, 6, 2, 5, 1, 6, 0, 4, 5, 3, 2, 3, 5, 6, 7, 0 ],
+				"vertices": [ -4.75, 8.89, 33.03, 11.74, 40.99, 5.89, 41.81, -5.03, 35.53, -11.13, -2.53, -9.2, -8.5, -2.71, -9.09, 5.17999 ],
 				"hull": 8,
+				"edges": [ 8, 6, 4, 6, 4, 2, 12, 14, 2, 0, 14, 0, 10, 12, 8, 10 ],
 				"width": 23,
 				"height": 50
 			}
@@ -219,8 +220,8 @@
 				"uvs": [ 0.40851, 0.0047, 0.59087, 0.33404, 0.75959, 0.48311, 0.88907, 0.59751, 0.97532, 0.89391, 0.90385, 1, 0.6722, 1, 0.38633, 1, 0.08074, 1, 0, 0.88921, 0, 0.65984, 0, 0.46577, 0.0906, 0.0988, 0.305, 0, 0.47461, 0.71257, 0.715, 0.74681 ],
 				"triangles": [ 1, 10, 11, 1, 13, 0, 14, 1, 2, 1, 12, 13, 12, 1, 11, 14, 10, 1, 15, 14, 2, 15, 2, 3, 9, 10, 14, 15, 3, 4, 7, 8, 9, 14, 7, 9, 6, 14, 15, 5, 6, 15, 7, 14, 6, 4, 5, 15 ],
 				"vertices": [ 17.36, 25.99, 29.13, 15.44, 39.89, 10.8, 48.14, 7.24, 53.84, -2.38, 49.43, -6, 34.84, -6.39, 16.84, -6.87, -2.4, -7.38, -7.58, -3.86, -7.78, 3.7, -7.95, 10.1, -2.57, 22.36, 10.84, 25.97, 22.14, 2.75, 37.31, 2.03 ],
-				"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
 				"hull": 14,
+				"edges": [ 0, 2, 6, 8, 8, 10, 16, 18, 22, 24, 24, 26, 0, 26, 10, 12, 2, 4, 4, 6, 12, 14, 14, 16, 18, 20, 20, 22, 2, 28, 28, 14, 20, 28, 4, 30, 30, 12, 28, 30, 30, 8 ],
 				"width": 63,
 				"height": 33
 			}
@@ -231,9 +232,9 @@
 				"type": "mesh",
 				"uvs": [ 0.17957, 0, 0, 0.44772, 0, 0.79734, 0.20057, 0.94264, 0.55057, 1, 0.8539, 1, 0.89823, 0.82004, 0.8259, 0.74285, 0.84223, 0.49993, 0.96356, 0.34102, 0.66023, 0 ],
 				"triangles": [ 8, 10, 9, 0, 10, 1, 8, 2, 1, 8, 1, 10, 7, 3, 8, 3, 2, 8, 4, 3, 7, 5, 7, 6, 4, 7, 5 ],
-				"vertices": [ -10.82, -9.45, 5.95, -15.34, 18.88, -14.9, 24, -7.5, 25.69, 5.16, 25.31, 16.07, 18.61, 17.44, 15.84, 14.74, 6.84, 15.02, 0.81, 19.18, -11.41, 7.83 ],
-				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
+				"vertices": [ -10.82, -9.45, 5.95, -15.34, 18.87999, -14.9, 24, -7.5, 25.69, 5.16, 25.31, 16.07, 18.61, 17.44, 15.84, 14.74, 6.84, 15.02, 0.81, 19.18, -11.41, 7.83 ],
 				"hull": 11,
+				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20 ],
 				"width": 36,
 				"height": 37
 			}
@@ -245,8 +246,8 @@
 				"uvs": [ 0.88538, 0.22262, 0.76167, 0.3594, 0.75088, 0.78308, 0.95326, 0.84981, 1, 0.60302 ],
 				"triangles": [ 1, 0, 4, 2, 1, 4, 3, 2, 4 ],
 				"vertices": [ -2.82, 15.97, 2.4, 11.71, 18.08, 11.9, 20.27, 19.27, 11.09, 20.62 ],
-				"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
 				"hull": 5,
+				"edges": [ 2, 4, 4, 6, 6, 8, 2, 0, 0, 8 ],
 				"width": 36,
 				"height": 37
 			}
@@ -257,9 +258,9 @@
 				"type": "mesh",
 				"uvs": [ 1, 0.27261, 0.81312, 0.52592, 0.79587, 0.71795, 0.95544, 0.80988, 0.85193, 0.95493, 0.47241, 1, 0.14033, 1, 0, 0.8773, 0.14896, 0.67914, 0.1619, 0.30325, 0.60611, 0 ],
 				"triangles": [ 1, 10, 0, 9, 10, 1, 8, 9, 1, 2, 8, 1, 4, 2, 3, 6, 7, 8, 5, 6, 8, 2, 5, 8, 4, 5, 2 ],
-				"vertices": [ 6.26, 8.46, 23.32, 8.04, 37.1, 12.89, 41.45, 20.82, 53.07, 21.46, 61.33, 10.06, 65.77, -1.03, 58.99, -9.19, 43.02, -9.81, 16.33, -20, -12.79, -9.26 ],
-				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
+				"vertices": [ 6.26, 8.46, 23.32, 8.04, 37.09999, 12.89, 41.45, 20.82, 53.07, 21.46, 61.33, 10.06, 65.76999, -1.03, 58.99, -9.18999, 43.02, -9.81, 16.33, -20, -12.79, -9.26 ],
 				"hull": 11,
+				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 20, 18, 20 ],
 				"width": 36,
 				"height": 76
 			}
@@ -269,10 +270,10 @@
 				"name": "goblin/right-shoulder",
 				"type": "mesh",
 				"uvs": [ 0.62008, 0.03708, 0.92131, 0.09048, 1, 0.38319, 0.72049, 0.6937, 0.31656, 1, 0, 1, 0, 0.75106, 0.28233, 0.49988 ],
-				"triangles": [ 2, 3, 0, 2, 0, 1, 7, 0, 3, 4, 5, 6, 4, 7, 3, 4, 6, 7 ],
+				"triangles": [ 4, 6, 7, 4, 7, 3, 4, 5, 6, 7, 0, 3, 2, 0, 1, 2, 3, 0 ],
 				"vertices": [ -3.17, -11.05, -9, -0.57, -1.01, 10.33, 16.69, 11.17, 37.41, 8.2, 45.45, -1.16, 36.95, -8.46, 21.2, -7.47 ],
-				"edges": [ 10, 12, 12, 14, 14, 0, 0, 2, 2, 4, 4, 6, 8, 10, 6, 8 ],
 				"hull": 8,
+				"edges": [ 10, 12, 12, 14, 14, 0, 0, 2, 2, 4, 4, 6, 8, 10, 6, 8 ],
 				"width": 39,
 				"height": 45
 			}
@@ -283,9 +284,9 @@
 				"type": "mesh",
 				"uvs": [ 0.27018, 0, 0.11618, 0.18177, 0, 0.70688, 0, 0.89577, 0.26668, 1, 0.48718, 1, 0.67618, 0.83532, 1, 0.5161, 1, 0.25543, 0.74618, 0.0571 ],
 				"triangles": [ 9, 8, 7, 9, 1, 0, 6, 9, 7, 6, 1, 9, 2, 1, 6, 4, 3, 2, 6, 4, 2, 5, 4, 6 ],
-				"vertices": [ -9.85, -10.37, 2.17, -14.07, 35.49, -13.66, 47.29, -12.11, 52.61, -2.26, 51.63, 5.16, 40.51, 10.18, 19.13, 18.47, 2.85, 16.32, -8.4, 6.14 ],
-				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18 ],
+				"vertices": [ -9.85, -10.37, 2.17, -14.07, 35.49, -13.66, 47.29, -12.11, 52.61, -2.26, 51.63, 5.16, 40.50999, 10.18, 19.12999, 18.46999, 2.85, 16.32, -8.39999, 6.14 ],
 				"hull": 10,
+				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18 ],
 				"width": 34,
 				"height": 63
 			}
@@ -295,10 +296,10 @@
 				"name": "goblin/torso",
 				"type": "mesh",
 				"uvs": [ 0, 0.33287, 0.15945, 0.46488, 0.15761, 0.60314, 0.15502, 0.79806, 0.32807, 0.93478, 0.6875, 1, 0.80731, 1, 1, 0.77763, 1, 0.66147, 1, 0.56703, 0.93207, 0.4771, 0.86944, 0.39416, 0.83837, 0.226, 0.68085, 0, 0.14836, 0, 0, 0.07199, 0.78734, 0.86249, 0.43679, 0.79649, 0.76738, 0.61733, 0.44345, 0.58747, 0.54329, 0.38316, 0.77692, 0.73446, 0.66478, 0.51012 ],
-				"triangles": [ 0, 15, 14, 20, 14, 13, 20, 13, 12, 1, 0, 14, 20, 12, 11, 20, 1, 14, 22, 20, 11, 22, 11, 10, 19, 1, 20, 19, 20, 22, 2, 1, 19, 18, 22, 10, 18, 10, 9, 19, 22, 18, 18, 9, 8, 21, 18, 8, 21, 8, 7, 17, 2, 19, 21, 17, 19, 21, 19, 18, 3, 2, 17, 16, 21, 7, 17, 21, 16, 4, 3, 17, 5, 17, 16, 4, 17, 5, 6, 16, 7, 5, 16, 6 ],
-				"vertices": [ 56.93, 27.95, 43.37, 18.23, 30.16, 19.5, 11.53, 21.28, -2.55, 10.69, -10.89, -13.12, -11.59, -21.23, 8.54, -36.12, 19.65, -37.08, 28.68, -37.86, 37.68, -34, 45.98, -30.44, 56.4, -29.07, 84.78, -20.92, 87.9, 15.15, 81.88, 25.79, 1.67, -21.01, 10.03, 2.18, 25.23, -18.25, 29.98, 0, 48.54, -8.39, 13.98, -21.36, 35.9, -15.6 ],
-				"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 24, 26, 26, 28, 28, 30, 0, 30, 14, 32, 32, 34, 34, 6, 18, 36, 36, 38, 2, 4, 4, 6, 38, 4, 2, 40, 40, 22, 40, 38, 38, 34, 32, 10, 34, 8, 40, 28, 14, 16, 16, 18, 32, 42, 42, 36, 16, 42, 42, 34, 18, 20, 20, 22, 36, 44, 44, 40, 20, 44 ],
+				"triangles": [ 5, 16, 6, 6, 16, 7, 4, 17, 5, 5, 17, 16, 4, 3, 17, 17, 21, 16, 16, 21, 7, 3, 2, 17, 21, 19, 18, 21, 17, 19, 17, 2, 19, 21, 8, 7, 21, 18, 8, 18, 9, 8, 19, 22, 18, 18, 10, 9, 18, 22, 10, 2, 1, 19, 19, 20, 22, 19, 1, 20, 22, 11, 10, 22, 20, 11, 20, 1, 14, 20, 12, 11, 1, 0, 14, 20, 13, 12, 20, 14, 13, 0, 15, 14 ],
+				"vertices": [ 56.93, 27.95, 43.37, 18.23, 30.16, 19.5, 11.53, 21.28, -2.55, 10.69, -10.89, -13.12, -11.59, -21.23, 8.54, -36.12, 19.65, -37.08, 28.68, -37.86, 37.68, -34, 45.98, -30.44, 56.4, -29.07, 84.78, -20.92, 87.9, 15.15, 81.87999, 25.79, 1.67, -21.01, 10.03, 2.18, 25.23, -18.25, 29.98, 0, 48.54, -8.39, 13.98, -21.36, 35.9, -15.6 ],
 				"hull": 16,
+				"edges": [ 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 24, 26, 26, 28, 28, 30, 0, 30, 14, 32, 32, 34, 34, 6, 18, 36, 36, 38, 2, 4, 4, 6, 38, 4, 2, 40, 40, 22, 40, 38, 38, 34, 32, 10, 34, 8, 40, 28, 14, 16, 16, 18, 32, 42, 42, 36, 16, 42, 42, 34, 18, 20, 20, 22, 36, 44, 44, 40, 20, 44 ],
 				"width": 68,
 				"height": 96
 			}
@@ -309,9 +310,9 @@
 				"type": "mesh",
 				"uvs": [ 0.36097, 0.44959, 0.66297, 0.60591, 1, 0.19486, 1, 0.57117, 0.75897, 1, 0.38697, 1, 0, 0.26433, 0, 0, 0.12497, 0 ],
 				"triangles": [ 6, 7, 8, 6, 8, 0, 3, 1, 2, 5, 0, 1, 6, 0, 5, 4, 1, 3, 5, 1, 4 ],
-				"vertices": [ -10.56, 12.87, 6.53, 9.9, 25.62, 17.71, 25.62, 10.56, 11.97, 2.41, -9.09, 2.41, -31, 16.39, -31, 21.41, -23.92, 21.41 ],
-				"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
+				"vertices": [ -10.56, 12.87, 6.53, 9.89999, 25.62, 17.70999, 25.62, 10.56, 11.97, 2.41, -9.09, 2.41, -31, 16.39, -31, 21.41, -23.92, 21.41 ],
 				"hull": 9,
+				"edges": [ 14, 16, 16, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 12, 14, 10, 12, 0, 10, 2, 8 ],
 				"width": 55,
 				"height": 19
 			}
@@ -322,9 +323,9 @@
 				"type": "mesh",
 				"uvs": [ 0, 0.32029, 0.14893, 0.59457, 0.22437, 1, 0.35909, 1, 0.50998, 1, 0.79559, 0.58453, 0.9842, 0.28015, 1, 0.00588, 0.46957, 0.17646, 0, 0.03933, 0.48843, 0.59122, 0.48114, 0.43099 ],
 				"triangles": [ 6, 8, 7, 0, 9, 8, 11, 8, 6, 0, 8, 11, 5, 11, 6, 10, 11, 5, 1, 0, 11, 1, 11, 10, 3, 2, 1, 10, 3, 1, 4, 10, 5, 3, 10, 4 ],
-				"vertices": [ -13.22, 5.56, -8, -2.47, -5.49, -14.27, -0.64, -14.36, 4.78, -14.45, 15.27, -2.59, 22.22, 6.11, 22.92, 14.05, 3.75, 9.44, -13.08, 13.71, 4.21, -2.59, 4.03, 2.05 ],
-				"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
+				"vertices": [ -13.22, 5.56, -8, -2.47, -5.49, -14.27, -0.64, -14.36, 4.78, -14.45, 15.27, -2.58999, 22.22, 6.11, 22.92, 14.05, 3.75, 9.43999, -13.08, 13.71, 4.21, -2.58999, 4.03, 2.05 ],
 				"hull": 10,
+				"edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 0, 18, 4, 6, 6, 8, 6, 20, 16, 22, 22, 20, 0, 22, 22, 12, 2, 20, 20, 10 ],
 				"width": 36,
 				"height": 29
 			}
@@ -757,26 +758,31 @@
 				]
 			}
 		},
-		"ffd": {
+		"deform": {
 			"default": {
+				"left hand item": {
+					"spear": [
+						{ "time": 0 }
+					]
+				},
 				"right hand item": {
 					"dagger": [
 						{
 							"time": 0,
 							"offset": 26,
-							"vertices": [ 2.34, 0.14 ],
+							"vertices": [ 2.34754, 0.14469 ],
 							"curve": [ 0.25, 0, 0.75, 1 ]
 						},
 						{
 							"time": 0.5,
 							"offset": 8,
-							"vertices": [ -1.19, 4.31, 0.07, 6.41, 1.66, 6.18, 1.75, 3.59 ],
+							"vertices": [ -1.19415, 4.31531, 0.07279, 6.41351, 1.66048, 6.18882, 1.75232, 3.59555 ],
 							"curve": [ 0.25, 0, 0.75, 1 ]
 						},
 						{
 							"time": 1,
 							"offset": 26,
-							"vertices": [ 2.34, 0.14 ]
+							"vertices": [ 2.34754, 0.14469 ]
 						}
 					]
 				}
@@ -790,22 +796,22 @@
 						},
 						{
 							"time": 0.2,
-							"vertices": [ -10.97, -6.68, -4.68, -2.46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.08, 0.08, -1.08, 0.08, -1.08, 0.08, 0, 0, -2.22, 2.66, -4.83, 2.7, -5.7, -0.51, -3.15, -1.61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.64, 0.81, -11.82, -1.34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.08, 0.08 ],
+							"vertices": [ -10.97826, -6.68962, -4.68015, -2.46175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.08534, 0.08391, -1.08534, 0.08391, -1.08534, 0.08391, 0, 0, -2.22324, 2.66465, -4.83295, 2.70084, -5.70553, -0.51941, -3.15962, -1.61501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.64741, 0.81612, -11.82285, -1.34955, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.08534, 0.08391 ],
 							"curve": [ 0.25, 0, 0.75, 1 ]
 						},
 						{
 							"time": 0.3666,
-							"vertices": [ 10.69, 4.05, 3.66, 1.85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.47, 0.09, 1.47, 0.09, 1.47, 0.09, 0, 0, 2.69, -0.22, 3.77, 0.11, 3.68, 1.55, 2.49, 1.65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.45, -3.91, 9.19, -1.66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.47, 0.09 ],
+							"vertices": [ 10.69275, 4.05949, 3.66373, 1.85426, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.47305, 0.09017, 1.47305, 0.09017, 1.47305, 0.09017, 0, 0, 2.69652, -0.22738, 3.77135, 0.11417, 3.6893, 1.55352, 2.49594, 1.65501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.4588, -3.9113, 9.19593, -1.66854, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.47305, 0.09017 ],
 							"curve": [ 0.621, 0, 0.75, 1 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ -10.97, -6.68, -4.68, -2.46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.17, -0.17, -1.17, -0.17, -1.17, -0.17, 0, 0, -2.22, 2.66, -4.83, 2.7, -5.7, -0.51, -3.15, -1.61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.64, 0.81, -11.82, -1.34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.17, -0.17 ],
+							"vertices": [ -10.97826, -6.68962, -4.68015, -2.46175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.1755, -0.17183, -1.1755, -0.17182, -1.1755, -0.17183, 0, 0, -2.22324, 2.66465, -4.83295, 2.70084, -5.70553, -0.51941, -3.15962, -1.61501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -6.64741, 0.81612, -11.82285, -1.34955, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.1755, -0.17183 ],
 							"curve": [ 0.25, 0, 0.75, 1 ]
 						},
 						{
 							"time": 0.8666,
-							"vertices": [ 10.69, 4.05, 3.66, 1.85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.38, 0.08, 0.38, 0.08, 0.38, 0.08, 0, 0, 2.69, -0.22, 3.77, 0.11, 3.68, 1.55, 2.49, 1.65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.45, -3.91, 9.19, -1.66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.38, 0.08 ],
+							"vertices": [ 10.69275, 4.05949, 3.66373, 1.85426, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.38687, 0.08446, 0.38687, 0.08446, 0.38687, 0.08446, 0, 0, 2.69652, -0.22738, 3.77135, 0.11417, 3.6893, 1.55352, 2.49594, 1.65501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.4588, -3.9113, 9.19593, -1.66854, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.38687, 0.08446 ],
 							"curve": [ 0.25, 0, 0.75, 1 ]
 						},
 						{ "time": 1 }
@@ -816,35 +822,35 @@
 						{
 							"time": 0,
 							"offset": 8,
-							"vertices": [ 3.69, 2.37, -7.16, 18.79, -12.78, 14.77, -12.75, 6.5, -3.13, 1.98, -0.44, 0.36, 0, 0, -3.8, 2.98 ]
+							"vertices": [ 3.69298, 2.37572, -7.16969, 18.79732, -12.78161, 14.7778, -12.75775, 6.50514, -3.13475, 1.98906, -0.44401, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						},
 						{ "time": 0.1333 },
 						{
 							"time": 0.2333,
 							"offset": 8,
-							"vertices": [ -3.96, -2.34, -5.8, -12.47, -2.23, -12.99, 2.02, -9.1, 0, 0, 0, 0, 0, 0, -1.35, -5.28 ]
+							"vertices": [ -3.96072, -2.34594, -5.80445, -12.47629, -2.23129, -12.99037, 2.02941, -9.1036, 0, 0, 0, 0, 0, 0, -1.35254, -5.2883 ]
 						},
 						{
 							"time": 0.3666,
 							"offset": 8,
-							"vertices": [ 0.66, 0.33, 0.33, 2.69, -0.48, 2.54, -1.13, 1.38, 0, 0, 0, 0, 0, 0, -0.11, 0.79 ]
+							"vertices": [ 0.66504, 0.33548, 0.33902, 2.69014, -0.4817, 2.54524, -1.13592, 1.38562, 0, 0, 0, 0, 0, 0, -0.11907, 0.79273 ]
 						},
 						{ "time": 0.5, "curve": "stepped" },
 						{ "time": 0.6333 },
 						{
 							"time": 0.7333,
 							"offset": 8,
-							"vertices": [ -2.97, 9.4, -6.91, 19.92, -10.55, 18.41, -12.37, 12.38, -4.72, 6.3, 0, 0, -1.48, 4.88, -7.06, 10.7 ]
+							"vertices": [ -2.97737, 9.40254, -6.91661, 19.92794, -10.55287, 18.41085, -12.37161, 12.38473, -4.72606, 6.30798, 0, 0, -1.48902, 4.88944, -7.06773, 10.70101 ]
 						},
 						{
 							"time": 0.8333,
 							"offset": 6,
-							"vertices": [ 1.05, 1.56, -2.52, 7.99, -5.52, 17.14, -8.93, 15.79, -10.73, 10.22, -4.23, 5.36, 0, 0, 0, 0, -5.83, 8.55 ]
+							"vertices": [ 1.05318, 1.56361, -2.52722, 7.9974, -5.5203, 17.14136, -8.93317, 15.79635, -10.73747, 10.22055, -4.23801, 5.36992, 0, 0, 0, 0, -5.83147, 8.55531 ]
 						},
 						{
 							"time": 1,
 							"offset": 8,
-							"vertices": [ 3.69, 2.37, -7.16, 18.79, -12.78, 14.77, -12.75, 6.5, -3.13, 1.98, -0.44, 0.36, 0, 0, -3.8, 2.98 ]
+							"vertices": [ 3.69298, 2.37572, -7.16969, 18.79732, -12.78161, 14.7778, -12.75775, 6.50514, -3.13475, 1.98906, -0.44401, 0.36629, 0, 0, -3.80085, 2.98474 ]
 						}
 					]
 				},
@@ -854,22 +860,22 @@
 						{
 							"time": 0.1333,
 							"offset": 6,
-							"vertices": [ -0.68, -4.13 ]
+							"vertices": [ -0.68989, -4.13283 ]
 						},
 						{
 							"time": 0.3333,
 							"offset": 6,
-							"vertices": [ -1.04, -3.1 ]
+							"vertices": [ -1.04945, -3.10476 ]
 						},
 						{
 							"time": 0.7,
 							"offset": 6,
-							"vertices": [ -1.42, -6.3 ]
+							"vertices": [ -1.4245, -6.30616 ]
 						},
 						{
 							"time": 0.8666,
 							"offset": 6,
-							"vertices": [ -1.13, -1.79 ]
+							"vertices": [ -1.13541, -1.79035 ]
 						},
 						{ "time": 1 }
 					]
@@ -880,38 +886,38 @@
 						{
 							"time": 0.1333,
 							"offset": 2,
-							"vertices": [ -2.81, 2.63, -2.35, 3.89, -1.99, 4.86, -0.93, 5.57, -0.48, 5.09, -0.34, 3.42, -0.17, 1.36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.31, 1.91, -1.32, 3.65 ]
+							"vertices": [ -2.81258, 2.63114, -2.35238, 3.89441, -1.99921, 4.8639, -0.93273, 5.57982, -0.48886, 5.09854, -0.34812, 3.42912, -0.17445, 1.36898, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1.31305, 1.91371, -1.32986, 3.65703 ]
 						},
 						{
 							"time": 0.2333,
 							"offset": 2,
-							"vertices": [ -6.39, 6.41, -7.74, 8.27, -7.02, 11.35, -4.03, 13.93, -2.5, 12.62, -1.46, 7.58, -0.17, 1.36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3.84, 2.61, -4.53, 7.92 ]
+							"vertices": [ -6.39088, 6.41245, -7.74575, 8.27191, -7.02471, 11.35894, -4.0347, 13.93454, -2.50399, 12.62962, -1.46124, 7.58915, -0.17445, 1.36898, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3.84765, 2.61215, -4.53955, 7.92357 ]
 						},
 						{
 							"time": 0.3,
 							"offset": 2,
-							"vertices": [ -8.27, 6.68, -9.29, 10.13, -8.62, 14.71, -4.58, 18.81, -2.2, 17.1, -0.07, 9.9, 2.54, 1.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.94, 2.38, -4.59, 10.01 ]
+							"vertices": [ -8.27184, 6.68821, -9.29764, 10.13797, -8.62231, 14.71339, -4.58629, 18.81939, -2.20304, 17.10709, -0.07794, 9.9046, 2.54451, 1.01642, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.94624, 2.38007, -4.59398, 10.01888 ]
 						},
 						{
 							"time": 0.3666,
 							"offset": 2,
-							"vertices": [ -10.47, 9.44, -13.36, 12.4, -14.32, 16.94, -9.24, 23.55, -5.51, 21.51, -1.19, 11.53, 2.54, 1.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.14, 2.29, -6.63, 11.37 ]
+							"vertices": [ -10.47683, 9.44175, -13.36882, 12.40982, -14.32568, 16.94392, -9.24462, 23.55674, -5.51711, 21.51377, -1.19581, 11.53192, 2.54451, 1.01642, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.14847, 2.29389, -6.63418, 11.37127 ]
 						},
 						{
 							"time": 0.5,
 							"offset": 2,
-							"vertices": [ -5.42, 4.36, -10.59, 7.04, -11.64, 11.55, -6.19, 20.12, -1.45, 18.05, 4.86, 6.41, 2.81, 0.27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.96, 4.94 ]
+							"vertices": [ -5.42473, 4.36854, -10.59004, 7.04468, -11.64251, 11.55845, -6.19665, 20.12805, -1.45497, 18.05411, 4.86619, 6.41678, 2.81462, 0.27601, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.96412, 4.94829 ]
 						},
 						{ "time": 0.6333 },
 						{
 							"time": 0.7333,
 							"offset": 4,
-							"vertices": [ 1.31, -6.84, -0.87, -12.54, -5.98, -14.08, -7.15, -11.63, -5.67, -4.83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.06, -6.93 ]
+							"vertices": [ 1.31462, -6.84099, -0.87905, -12.54479, -5.9851, -14.08367, -7.15892, -11.63193, -5.6792, -4.83544, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.06163, -6.93844 ]
 						},
 						{
 							"time": 0.8,
 							"offset": 4,
-							"vertices": [ 0.65, -3.42, -0.43, -6.27, -2.99, -7.04, -3.57, -5.81, -2.83, -2.41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.79, -1.28, 0, 0, 0, 0, -1.03, -3.46 ]
+							"vertices": [ 0.65731, -3.42049, -0.43952, -6.27239, -2.99255, -7.04183, -3.57946, -5.81596, -2.83959, -2.41772, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.79687, -1.2802, 0, 0, 0, 0, -1.03081, -3.46922 ]
 						},
 						{ "time": 0.8666 }
 					]
@@ -921,13 +927,13 @@
 						{
 							"time": 0,
 							"offset": 4,
-							"vertices": [ -1.48, 0.34, 0, 0, 1.31, 0.08, 1.6, 0.09, 0.13, 0.15, 0, 0, 0, 0, -0.72, -0.04 ]
+							"vertices": [ -1.48416, 0.34736, 0, 0, 1.31152, 0.08085, 1.60295, 0.09881, 0.13673, 0.1547, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						},
 						{ "time": 0.5 },
 						{
 							"time": 1,
 							"offset": 4,
-							"vertices": [ -1.48, 0.34, 0, 0, 1.31, 0.08, 1.6, 0.09, 0.13, 0.15, 0, 0, 0, 0, -0.72, -0.04 ]
+							"vertices": [ -1.48416, 0.34736, 0, 0, 1.31152, 0.08085, 1.60295, 0.09881, 0.13673, 0.1547, 0, 0, 0, 0, -0.72862, -0.0449 ]
 						}
 					]
 				},
@@ -937,7 +943,7 @@
 						{
 							"time": 0.6,
 							"offset": 6,
-							"vertices": [ 1.8, -1.56 ]
+							"vertices": [ 1.80396, -1.56552 ]
 						},
 						{ "time": 1 }
 					]
@@ -946,17 +952,17 @@
 					"right upper leg": [
 						{
 							"time": 0,
-							"vertices": [ -6.03, -1.46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34, -1.93, -1.86, -5.05, -2.5, -3.09 ]
+							"vertices": [ -6.03856, -1.46324, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34684, -1.93101, -1.86047, -5.05265, -2.5014, -3.09984 ]
 						},
 						{ "time": 0.3333 },
 						{
 							"time": 0.8666,
 							"offset": 14,
-							"vertices": [ 0.13, -2.35, -1.33, -5.99, -1.35, -4.43 ]
+							"vertices": [ 0.13424, -2.35377, -1.33317, -5.99572, -1.35861, -4.43323 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ -6.03, -1.46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34, -1.93, -1.86, -5.05, -2.5, -3.09 ]
+							"vertices": [ -6.03856, -1.46324, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34684, -1.93101, -1.86047, -5.05265, -2.5014, -3.09984 ]
 						}
 					]
 				},
@@ -965,37 +971,37 @@
 						{
 							"time": 0,
 							"offset": 14,
-							"vertices": [ -1.48, -0.24, -2.72, -2.15, -0.51, -3.39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.09, -2.61, 0, 0, 0.57, -1.24, 0, 0, 0, 0, -2.11, -3.29 ]
+							"vertices": [ -1.48952, -0.24021, -2.72312, -2.15489, -0.51183, -3.39752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.0964, -2.61458, 0, 0, 0.57686, -1.24874, 0, 0, 0, 0, -2.11251, -3.29932 ]
 						},
 						{
 							"time": 0.1333,
 							"offset": 14,
-							"vertices": [ 1.31, -0.59, -0.97, -1.62, 0.74, -0.61, -1.44, 1.97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.65, -3.95, 0, 0, -1.46, -0.31, 0, 0, 0, 0, -3.31, -3.55, -2.56, 0.29 ]
+							"vertices": [ 1.31318, -0.59727, -0.97944, -1.62934, 0.74861, -0.6123, -1.44598, 1.97515, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.65701, -3.95221, 0, 0, -1.46987, -0.31373, 0, 0, 0, 0, -3.31756, -3.5535, -2.56329, 0.29673 ]
 						},
 						{
 							"time": 0.3,
 							"offset": 14,
-							"vertices": [ 6.03, -3.13, 7.55, -1.38, 6.79, 0.31, 4.23, 1.14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.07, -5.16, 0, 0, 4, 0.27, 0, 0, 0, 0, 3.43, -3.52 ]
+							"vertices": [ 6.03761, -3.13561, 7.55475, -1.38111, 6.79747, 0.31171, 4.23503, 1.14012, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.07575, -5.16824, 0, 0, 4.0041, 0.27245, 0, 0, 0, 0, 3.4376, -3.52286 ]
 						},
 						{
 							"time": 0.5,
 							"offset": 14,
-							"vertices": [ 2.25, -0.87, 2.57, -0.56, 3.17, -0.57, 1.48, 0.99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3.22, -4.43, 0, 0, 1.48, 0.01, 0, 0, 0, 0, 0.31, -3.28, -1.53, 0.17 ]
+							"vertices": [ 2.25942, -0.87202, 2.575, -0.56861, 3.17112, -0.57003, 1.48704, 0.9924, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3.22451, -4.43862, 0, 0, 1.48691, 0.01586, 0, 0, 0, 0, 0.31388, -3.28095, -1.53797, 0.17803 ]
 						},
 						{
 							"time": 0.6333,
 							"offset": 14,
-							"vertices": [ 0.75, -1.51, -0.97, -1.62, 0.74, -0.61, -1.44, 1.97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.65, -3.95, 0, 0, -1.46, -0.31, 0, 0, 0, 0, -3.31, -3.55, -2.56, 0.29 ]
+							"vertices": [ 0.75002, -1.51701, -0.97944, -1.62934, 0.74861, -0.6123, -1.44598, 1.97515, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.65701, -3.95221, 0, 0, -1.46987, -0.31373, 0, 0, 0, 0, -3.31756, -3.5535, -2.56329, 0.29673 ]
 						},
 						{
 							"time": 0.8666,
 							"offset": 14,
-							"vertices": [ 0.62, -1.26, 0.38, -2.2, 3.25, -0.5, 2.41, 2.39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.66, -3.1, 0, 0, 2.3, -1.15, 0, 0, 0, 0, -0.07, -3.63, -0.93, 0.1 ]
+							"vertices": [ 0.62202, -1.26262, 0.38489, -2.20701, 3.25048, -0.50042, 2.41108, 2.39315, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.6639, -3.10099, 0, 0, 2.30655, -1.15196, 0, 0, 0, 0, -0.07676, -3.63497, -0.9321, 0.1079 ]
 						},
 						{
 							"time": 1,
 							"offset": 14,
-							"vertices": [ -1.48, -0.24, -2.72, -2.15, -0.51, -3.39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.09, -2.61, 0, 0, 0.57, -1.24, 0, 0, 0, 0, -2.11, -3.29 ]
+							"vertices": [ -1.48952, -0.24021, -2.72312, -2.15489, -0.51183, -3.39752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1.0964, -2.61458, 0, 0, 0.57686, -1.24874, 0, 0, 0, 0, -2.11251, -3.29932 ]
 						}
 					]
 				},
@@ -1004,32 +1010,32 @@
 						{
 							"time": 0,
 							"offset": 2,
-							"vertices": [ -1.77, 0.54, -0.96, -1.03, -0.39, -0.24, -1.77, 0.54 ]
+							"vertices": [ -1.77696, 0.54759, -0.96145, -1.03793, -0.39148, -0.24071, -1.77696, 0.54759 ]
 						},
 						{
 							"time": 0.1333,
 							"offset": 2,
-							"vertices": [ -2.25, -1.03, -1.49, -4.23, -0.74, -2.84, -1.9, 0.54 ]
+							"vertices": [ -2.25683, -1.03177, -1.49719, -4.23861, -0.74469, -2.84906, -1.90072, 0.54477 ]
 						},
 						{
 							"time": 0.3333,
 							"offset": 2,
-							"vertices": [ -2.37, -0.05, -0.49, 0.19, -0.9, 1.16, -1.6, 2.7, 0.96, 0.8 ]
+							"vertices": [ -2.37974, -0.05431, -0.49433, 0.19436, -0.90861, 1.16519, -1.60956, 2.70798, 0.96186, 0.80615 ]
 						},
 						{
 							"time": 0.7,
 							"offset": 2,
-							"vertices": [ -0.91, -2.76, -0.62, -3.63, -0.84, -2.26, -2.56, 0.52 ]
+							"vertices": [ -0.91714, -2.76567, -0.62214, -3.63489, -0.8494, -2.26772, -2.56076, 0.5297 ]
 						},
 						{
 							"time": 0.8666,
 							"offset": 2,
-							"vertices": [ -2.56, 0.52, -1.58, 0.32, -1.38, 0.32, -2.56, 0.52 ]
+							"vertices": [ -2.56076, 0.5297, -1.58064, 0.32031, -1.3847, 0.32476, -2.56076, 0.5297 ]
 						},
 						{
 							"time": 1,
 							"offset": 2,
-							"vertices": [ -1.77, 0.54, -0.8, 0.53, -0.8, 0.53, -1.77, 0.54 ]
+							"vertices": [ -1.77696, 0.54759, -0.80128, 0.53413, -0.80128, 0.53413, -1.77696, 0.54759 ]
 						}
 					]
 				},
@@ -1037,35 +1043,35 @@
 					"undies": [
 						{
 							"time": 0,
-							"vertices": [ 0.43, 0.72, 10.6, -0.11, 2.29, 0, 2.29, 0, 2.29, 0, 0.58, 0.24, -2.4, -0.65, -2.27, -0.77, 2.29, 0, 0.58, -0.48, 4.98, -0.11, 6.5, -0.23 ]
+							"vertices": [ 0.43098, 0.722, 10.60295, -0.11699, 2.29598, 0, 2.29598, 0, 2.29598, 0, 0.58798, 0.24399, -2.40018, -0.65335, -2.2782, -0.77533, 2.29598, 0, 0.58798, -0.48799, 4.98697, -0.11699, 6.50796, -0.23399 ]
 						},
 						{
 							"time": 0.1333,
-							"vertices": [ 0.72, 0.43, 7.2, -0.16, 1.37, 0, 1.37, 0, 1.37, 0, 1.25, 0.04, -0.99, -2.95, -1.37, -3.07, 1.37, 0, 0.35, -0.29, 2.99, -0.07, 3.9, -0.14 ]
+							"vertices": [ 0.72659, 0.43319, 7.20416, -0.1638, 1.37759, 0, 1.37759, 0, 1.37759, 0, 1.25279, 0.0464, -0.99861, -2.95085, -1.37542, -3.07404, 1.37759, 0, 0.35279, -0.29279, 2.99218, -0.07019, 3.90478, -0.14039 ]
 						},
 						{
 							"time": 0.3333,
-							"vertices": [ 1.16, 0, 2.1, -0.23, 0, 0, 0, 0, 0, 0, 2.24, -0.24, -0.43, 0.6, -1.55, 0.48 ]
+							"vertices": [ 1.16999, 0, 2.10599, -0.234, 0, 0, 0, 0, 0, 0, 2.24999, -0.24999, -0.4344, 0.60551, -1.55939, 0.48051 ]
 						},
 						{
 							"time": 0.5333,
-							"vertices": [ 1.16, 0, -0.23, -0.93, -2.92, 0.35, 0, 0, 0, 0, 0.49, -0.24, -0.64, -2.07, -0.64, -2.07 ]
+							"vertices": [ 1.16999, 0, -0.234, -0.93599, -2.92499, 0.35099, 0, 0, 0, 0, 0.49999, -0.24999, -0.64078, -2.07914, -0.64078, -2.07914 ]
 						},
 						{
 							"time": 0.7,
-							"vertices": [ 1.86, -0.11, 4.66, -0.09, -1.76, 0.21, 0, 0, -0.56, 0.32, -1.13, -1.15, -2.19, -3.47, -1.29, -3.47, 0, 0, 0, 0, 1.58, -0.04, 2.65, 0.16 ]
+							"vertices": [ 1.8627, -0.11514, 4.66326, -0.09099, -1.76428, 0.21171, 0, 0, -0.56832, 0.32832, -1.13833, -1.1511, -2.19996, -3.47068, -1.29718, -3.47068, 0, 0, 0, 0, 1.58785, -0.04642, 2.65941, 0.16714 ]
 						},
 						{
 							"time": 0.8333,
-							"vertices": [ 2.41, -0.2, 8.58, 0.58, -0.83, 0.1, 0, 0, -1.02, 0.59, -2.44, -1.87, -1.62, 0, 0, 0, 0, 0, 0, 0, 2.85, -0.08, 4.78, 0.3 ]
+							"vertices": [ 2.41687, -0.20725, 8.58108, 0.585, -0.83571, 0.10028, 0, 0, -1.02299, 0.59098, -2.44899, -1.872, -1.62499, 0, 0, 0, 0, 0, 0, 0, 2.85813, -0.08356, 4.78695, 0.30086 ]
 						},
 						{
 							"time": 0.8666,
-							"vertices": [ 2.01, -0.02, 8.98, 0.44, -0.2, 0.08, 0.45, 0, -0.35, 0.47, -1.84, -1.44, -0.79, 1.26, 0.53, 1.23, 0.45, 0, 0.11, -0.09, 3.28, -0.09, 5.13, 0.19 ]
+							"vertices": [ 2.01969, -0.0214, 8.98545, 0.4446, -0.20937, 0.08022, 0.45919, 0, -0.35919, 0.47279, -1.84159, -1.4488, -0.79153, 1.2642, 0.53285, 1.23981, 0.45919, 0, 0.11759, -0.09759, 3.2839, -0.09025, 5.13115, 0.19388 ]
 						},
 						{
 							"time": 1,
-							"vertices": [ 0.43, 0.72, 10.6, -0.11, 2.29, 0, 2.29, 0, 2.29, 0, 0.58, 0.24, -2.4, -0.65, -2.27, -0.77, 2.29, 0, 0.58, -0.48, 4.98, -0.11, 6.5, -0.23 ]
+							"vertices": [ 0.43098, 0.722, 10.60295, -0.11699, 2.29598, 0, 2.29598, 0, 2.29598, 0, 0.58798, 0.24399, -2.40018, -0.65335, -2.2782, -0.77533, 2.29598, 0, 0.58798, -0.48799, 4.98697, -0.11699, 6.50796, -0.23399 ]
 						}
 					]
 				}

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.png


BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-mesh.skel


+ 0 - 292
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.atlas

@@ -1,292 +0,0 @@
-
-goblins.png
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-dagger
-  rotate: true
-  xy: 372, 100
-  size: 26, 108
-  orig: 26, 108
-  offset: 0, 0
-  index: -1
-goblin/eyes-closed
-  rotate: false
-  xy: 359, 6
-  size: 34, 12
-  orig: 34, 12
-  offset: 0, 0
-  index: -1
-goblin/head
-  rotate: false
-  xy: 107, 38
-  size: 103, 64
-  orig: 103, 66
-  offset: 0, 0
-  index: -1
-goblin/left-arm
-  rotate: false
-  xy: 903, 56
-  size: 37, 35
-  orig: 37, 35
-  offset: 0, 0
-  index: -1
-goblin/left-foot
-  rotate: false
-  xy: 729, 58
-  size: 65, 31
-  orig: 65, 31
-  offset: 0, 0
-  index: -1
-goblin/left-hand
-  rotate: true
-  xy: 316, 2
-  size: 36, 41
-  orig: 36, 41
-  offset: 0, 0
-  index: -1
-goblin/left-lower-leg
-  rotate: true
-  xy: 172, 2
-  size: 30, 70
-  orig: 33, 70
-  offset: 2, 0
-  index: -1
-goblin/left-shoulder
-  rotate: true
-  xy: 857, 62
-  size: 29, 44
-  orig: 29, 44
-  offset: 0, 0
-  index: -1
-goblin/left-upper-leg
-  rotate: true
-  xy: 654, 56
-  size: 33, 73
-  orig: 33, 73
-  offset: 0, 0
-  index: -1
-goblin/neck
-  rotate: true
-  xy: 509, 22
-  size: 36, 41
-  orig: 36, 41
-  offset: 0, 0
-  index: -1
-goblin/pelvis
-  rotate: true
-  xy: 310, 40
-  size: 62, 43
-  orig: 62, 43
-  offset: 0, 0
-  index: -1
-goblin/right-arm
-  rotate: false
-  xy: 552, 8
-  size: 23, 50
-  orig: 23, 50
-  offset: 0, 0
-  index: -1
-goblin/right-foot
-  rotate: false
-  xy: 882, 93
-  size: 63, 33
-  orig: 63, 33
-  offset: 0, 0
-  index: -1
-goblin/right-hand
-  rotate: false
-  xy: 942, 54
-  size: 36, 37
-  orig: 36, 37
-  offset: 0, 0
-  index: -1
-goblin/right-lower-leg
-  rotate: true
-  xy: 654, 91
-  size: 35, 76
-  orig: 36, 76
-  offset: 1, 0
-  index: -1
-goblin/right-shoulder
-  rotate: false
-  xy: 424, 20
-  size: 39, 42
-  orig: 39, 45
-  offset: 0, 0
-  index: -1
-goblin/right-upper-leg
-  rotate: true
-  xy: 107, 2
-  size: 34, 63
-  orig: 34, 63
-  offset: 0, 0
-  index: -1
-goblin/torso
-  rotate: true
-  xy: 212, 34
-  size: 68, 96
-  orig: 68, 96
-  offset: 0, 0
-  index: -1
-goblin/undie-straps
-  rotate: false
-  xy: 2, 2
-  size: 55, 19
-  orig: 55, 19
-  offset: 0, 0
-  index: -1
-goblin/undies
-  rotate: true
-  xy: 768, 20
-  size: 36, 29
-  orig: 36, 29
-  offset: 0, 0
-  index: -1
-goblingirl/eyes-closed
-  rotate: false
-  xy: 59, 6
-  size: 37, 15
-  orig: 37, 21
-  offset: 0, 0
-  index: -1
-goblingirl/head
-  rotate: false
-  xy: 2, 23
-  size: 103, 79
-  orig: 103, 81
-  offset: 0, 2
-  index: -1
-goblingirl/left-arm
-  rotate: true
-  xy: 980, 56
-  size: 37, 35
-  orig: 37, 35
-  offset: 0, 0
-  index: -1
-goblingirl/left-foot
-  rotate: false
-  xy: 947, 95
-  size: 65, 31
-  orig: 65, 31
-  offset: 0, 0
-  index: -1
-goblingirl/left-hand
-  rotate: false
-  xy: 577, 14
-  size: 35, 40
-  orig: 35, 40
-  offset: 0, 0
-  index: -1
-goblingirl/left-lower-leg
-  rotate: true
-  xy: 244, 2
-  size: 30, 70
-  orig: 33, 70
-  offset: 2, 0
-  index: -1
-goblingirl/left-shoulder
-  rotate: true
-  xy: 810, 63
-  size: 28, 45
-  orig: 28, 46
-  offset: 0, 1
-  index: -1
-goblingirl/left-upper-leg
-  rotate: true
-  xy: 810, 93
-  size: 33, 70
-  orig: 33, 70
-  offset: 0, 0
-  index: -1
-goblingirl/neck
-  rotate: true
-  xy: 614, 21
-  size: 33, 41
-  orig: 35, 41
-  offset: 0, 0
-  index: -1
-goblingirl/pelvis
-  rotate: false
-  xy: 355, 55
-  size: 59, 43
-  orig: 62, 43
-  offset: 1, 0
-  index: -1
-goblingirl/right-arm
-  rotate: true
-  xy: 657, 11
-  size: 22, 50
-  orig: 28, 50
-  offset: 3, 0
-  index: -1
-goblingirl/right-foot
-  rotate: false
-  xy: 359, 20
-  size: 63, 33
-  orig: 63, 33
-  offset: 0, 0
-  index: -1
-goblingirl/right-hand
-  rotate: true
-  xy: 729, 21
-  size: 35, 37
-  orig: 36, 37
-  offset: 1, 0
-  index: -1
-goblingirl/right-lower-leg
-  rotate: true
-  xy: 732, 91
-  size: 35, 76
-  orig: 36, 76
-  offset: 1, 0
-  index: -1
-goblingirl/right-shoulder
-  rotate: true
-  xy: 465, 19
-  size: 39, 42
-  orig: 39, 45
-  offset: 0, 0
-  index: -1
-goblingirl/right-upper-leg
-  rotate: true
-  xy: 416, 64
-  size: 34, 63
-  orig: 34, 63
-  offset: 0, 0
-  index: -1
-goblingirl/torso
-  rotate: true
-  xy: 482, 60
-  size: 66, 96
-  orig: 68, 96
-  offset: 0, 0
-  index: -1
-goblingirl/undie-straps
-  rotate: false
-  xy: 657, 35
-  size: 55, 19
-  orig: 55, 19
-  offset: 0, 0
-  index: -1
-goblingirl/undies
-  rotate: false
-  xy: 799, 32
-  size: 36, 29
-  orig: 36, 29
-  offset: 0, 0
-  index: -1
-shield
-  rotate: true
-  xy: 580, 56
-  size: 70, 72
-  orig: 70, 72
-  offset: 0, 0
-  index: -1
-spear
-  rotate: true
-  xy: 2, 104
-  size: 22, 368
-  orig: 22, 368
-  offset: 0, 0
-  index: -1

+ 16 - 15
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.json

@@ -1,23 +1,24 @@
 {
+"skeleton": { "hash": "XWev9W//Ru9qTfd6z9xOs5YG8F0", "spine": "3.4.00", "width": 0, "height": 0, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.64, "y": 114.41 },
-	{ "name": "left upper leg", "parent": "hip", "length": 50.39, "x": 14.45, "y": 2.81, "rotation": -89.09 },
+	{ "name": "torso", "parent": "hip", "length": 85.82, "rotation": 93.92, "x": -6.42, "y": 1.97 },
+	{ "name": "neck", "parent": "torso", "length": 18.38, "rotation": -1.51, "x": 81.67, "y": -6.34 },
+	{ "name": "head", "parent": "neck", "length": 68.28, "rotation": -13.92, "x": 20.93, "y": 11.59 },
+	{ "name": "left shoulder", "parent": "torso", "length": 35.43, "rotation": -156.96, "x": 74.04, "y": -20.38 },
+	{ "name": "left arm", "parent": "left shoulder", "length": 35.62, "rotation": 28.16, "x": 37.85, "y": -2.34 },
+	{ "name": "left upper leg", "parent": "hip", "length": 50.39, "rotation": -89.09, "x": 14.45, "y": 2.81 },
+	{ "name": "left lower leg", "parent": "left upper leg", "length": 49.89, "rotation": -16.65, "x": 56.34, "y": 0.98 },
+	{ "name": "left foot", "parent": "left lower leg", "length": 46.5, "rotation": 102.43, "x": 58.94, "y": -7.61 },
+	{ "name": "left hand", "parent": "left arm", "length": 11.52, "rotation": 2.7, "x": 35.62, "y": 0.07 },
 	{ "name": "pelvis", "parent": "hip", "x": 1.41, "y": -6.57 },
-	{ "name": "right upper leg", "parent": "hip", "length": 42.45, "x": -20.07, "y": -6.83, "rotation": -97.49 },
-	{ "name": "torso", "parent": "hip", "length": 85.82, "x": -6.42, "y": 1.97, "rotation": 93.92 },
-	{ "name": "left lower leg", "parent": "left upper leg", "length": 49.89, "x": 56.34, "y": 0.98, "rotation": -16.65 },
-	{ "name": "left shoulder", "parent": "torso", "length": 35.43, "x": 74.04, "y": -20.38, "rotation": -156.96 },
-	{ "name": "neck", "parent": "torso", "length": 18.38, "x": 81.67, "y": -6.34, "rotation": -1.51 },
-	{ "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "x": 42.99, "y": -0.61, "rotation": -14.34 },
-	{ "name": "right shoulder", "parent": "torso", "length": 37.24, "x": 76.02, "y": 18.14, "rotation": 133.88 },
-	{ "name": "head", "parent": "neck", "length": 68.28, "x": 20.93, "y": 11.59, "rotation": -13.92 },
-	{ "name": "left arm", "parent": "left shoulder", "length": 35.62, "x": 37.85, "y": -2.34, "rotation": 28.16 },
-	{ "name": "left foot", "parent": "left lower leg", "length": 46.5, "x": 58.94, "y": -7.61, "rotation": 102.43 },
-	{ "name": "right arm", "parent": "right shoulder", "length": 36.74, "x": 37.6, "y": 0.31, "rotation": 36.32 },
-	{ "name": "right foot", "parent": "right lower leg", "length": 45.45, "x": 64.88, "y": 0.04, "rotation": 110.3 },
-	{ "name": "left hand", "parent": "left arm", "length": 11.52, "x": 35.62, "y": 0.07, "rotation": 2.7 },
-	{ "name": "right hand", "parent": "right arm", "length": 15.32, "x": 36.9, "y": 0.34, "rotation": 2.35 }
+	{ "name": "right shoulder", "parent": "torso", "length": 37.24, "rotation": 133.88, "x": 76.02, "y": 18.14 },
+	{ "name": "right arm", "parent": "right shoulder", "length": 36.74, "rotation": 36.32, "x": 37.6, "y": 0.31 },
+	{ "name": "right upper leg", "parent": "hip", "length": 42.45, "rotation": -97.49, "x": -20.07, "y": -6.83 },
+	{ "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "rotation": -14.34, "x": 42.99, "y": -0.61 },
+	{ "name": "right foot", "parent": "right lower leg", "length": 45.45, "rotation": 110.3, "x": 64.88, "y": 0.04 },
+	{ "name": "right hand", "parent": "right arm", "length": 15.32, "rotation": 2.35, "x": 36.9, "y": 0.34 }
 ],
 "slots": [
 	{ "name": "left shoulder", "bone": "left shoulder", "attachment": "left shoulder" },

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.png


BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins.skel


+ 0 - 251
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.atlas

@@ -1,251 +0,0 @@
-
-raptor.png
-size: 1022,1022
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-back_arm
-  rotate: false
-  xy: 410, 545
-  size: 46, 29
-  orig: 46, 29
-  offset: 0, 0
-  index: -1
-back_bracer
-  rotate: false
-  xy: 540, 548
-  size: 39, 28
-  orig: 39, 28
-  offset: 0, 0
-  index: -1
-back_hand
-  rotate: true
-  xy: 504, 538
-  size: 36, 34
-  orig: 36, 34
-  offset: 0, 0
-  index: -1
-back_knee
-  rotate: false
-  xy: 299, 478
-  size: 49, 67
-  orig: 49, 67
-  offset: 0, 0
-  index: -1
-back_thigh
-  rotate: true
-  xy: 140, 247
-  size: 39, 24
-  orig: 39, 24
-  offset: 0, 0
-  index: -1
-eyes_open
-  rotate: true
-  xy: 2, 2
-  size: 47, 45
-  orig: 47, 45
-  offset: 0, 0
-  index: -1
-front_arm
-  rotate: false
-  xy: 360, 544
-  size: 48, 30
-  orig: 48, 30
-  offset: 0, 0
-  index: -1
-front_bracer
-  rotate: false
-  xy: 538, 578
-  size: 41, 29
-  orig: 41, 29
-  offset: 0, 0
-  index: -1
-front_hand
-  rotate: false
-  xy: 538, 609
-  size: 41, 38
-  orig: 41, 38
-  offset: 0, 0
-  index: -1
-front_open_hand
-  rotate: false
-  xy: 894, 782
-  size: 43, 44
-  orig: 43, 44
-  offset: 0, 0
-  index: -1
-front_thigh
-  rotate: false
-  xy: 942, 849
-  size: 57, 29
-  orig: 57, 29
-  offset: 0, 0
-  index: -1
-gun
-  rotate: false
-  xy: 785, 774
-  size: 107, 103
-  orig: 107, 103
-  offset: 0, 0
-  index: -1
-gun_nohand
-  rotate: false
-  xy: 614, 703
-  size: 105, 102
-  orig: 105, 102
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 2, 137
-  size: 136, 149
-  orig: 136, 149
-  offset: 0, 0
-  index: -1
-lower_leg
-  rotate: true
-  xy: 780, 699
-  size: 73, 98
-  orig: 73, 98
-  offset: 0, 0
-  index: -1
-mouth_smile
-  rotate: true
-  xy: 49, 2
-  size: 47, 30
-  orig: 47, 30
-  offset: 0, 0
-  index: -1
-neck
-  rotate: true
-  xy: 1001, 860
-  size: 18, 21
-  orig: 18, 21
-  offset: 0, 0
-  index: -1
-raptor_arm_back
-  rotate: false
-  xy: 940, 936
-  size: 82, 86
-  orig: 82, 86
-  offset: 0, 0
-  index: -1
-raptor_body
-  rotate: false
-  xy: 2, 737
-  size: 610, 285
-  orig: 610, 285
-  offset: 0, 0
-  index: -1
-raptor_front_arm
-  rotate: true
-  xy: 195, 464
-  size: 81, 102
-  orig: 81, 102
-  offset: 0, 0
-  index: -1
-raptor_front_leg
-  rotate: false
-  xy: 2, 478
-  size: 191, 257
-  orig: 191, 257
-  offset: 0, 0
-  index: -1
-raptor_hindleg_back
-  rotate: false
-  xy: 614, 807
-  size: 169, 215
-  orig: 169, 215
-  offset: 0, 0
-  index: -1
-raptor_horn
-  rotate: false
-  xy: 360, 655
-  size: 182, 80
-  orig: 182, 80
-  offset: 0, 0
-  index: -1
-raptor_horn_back
-  rotate: false
-  xy: 360, 576
-  size: 176, 77
-  orig: 176, 77
-  offset: 0, 0
-  index: -1
-raptor_jaw
-  rotate: false
-  xy: 785, 879
-  size: 153, 143
-  orig: 153, 143
-  offset: 0, 0
-  index: -1
-raptor_saddle_noshadow
-  rotate: false
-  xy: 2, 288
-  size: 163, 188
-  orig: 163, 188
-  offset: 0, 0
-  index: -1
-raptor_saddle_strap_front
-  rotate: false
-  xy: 721, 710
-  size: 57, 95
-  orig: 57, 95
-  offset: 0, 0
-  index: -1
-raptor_saddle_strap_rear
-  rotate: true
-  xy: 940, 880
-  size: 54, 74
-  orig: 54, 74
-  offset: 0, 0
-  index: -1
-raptor_saddle_w_shadow
-  rotate: false
-  xy: 195, 547
-  size: 163, 188
-  orig: 163, 188
-  offset: 0, 0
-  index: -1
-raptor_tongue
-  rotate: true
-  xy: 544, 649
-  size: 86, 64
-  orig: 86, 64
-  offset: 0, 0
-  index: -1
-stirrup_back
-  rotate: false
-  xy: 458, 539
-  size: 44, 35
-  orig: 44, 35
-  offset: 0, 0
-  index: -1
-stirrup_front
-  rotate: true
-  xy: 81, 4
-  size: 45, 50
-  orig: 45, 50
-  offset: 0, 0
-  index: -1
-stirrup_strap
-  rotate: true
-  xy: 894, 828
-  size: 49, 46
-  orig: 49, 46
-  offset: 0, 0
-  index: -1
-torso
-  rotate: true
-  xy: 610, 647
-  size: 54, 91
-  orig: 54, 91
-  offset: 0, 0
-  index: -1
-visor
-  rotate: false
-  xy: 2, 51
-  size: 131, 84
-  orig: 131, 84
-  offset: 0, 0
-  index: -1

Fichier diff supprimé car celui-ci est trop grand
+ 219 - 130
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.json


BIN
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.png


BIN
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor.skel


+ 0 - 166
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-diffuse.atlas

@@ -1,166 +0,0 @@
-
-spineboy-old-diffuse.png
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-eyes
-  rotate: false
-  xy: 380, 193
-  size: 34, 27
-  orig: 34, 27
-  offset: 0, 0
-  index: -1
-eyes-closed
-  rotate: false
-  xy: 344, 193
-  size: 34, 27
-  orig: 34, 27
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 2, 120
-  size: 121, 132
-  orig: 121, 132
-  offset: 0, 0
-  index: -1
-left-ankle
-  rotate: false
-  xy: 213, 171
-  size: 25, 32
-  orig: 25, 32
-  offset: 0, 0
-  index: -1
-left-arm
-  rotate: false
-  xy: 72, 17
-  size: 35, 29
-  orig: 35, 29
-  offset: 0, 0
-  index: -1
-left-foot
-  rotate: false
-  xy: 365, 222
-  size: 65, 30
-  orig: 65, 30
-  offset: 0, 0
-  index: -1
-left-hand
-  rotate: false
-  xy: 176, 135
-  size: 30, 38
-  orig: 30, 38
-  offset: 0, 0
-  index: -1
-left-lower-leg
-  rotate: false
-  xy: 125, 122
-  size: 49, 64
-  orig: 49, 64
-  offset: 0, 0
-  index: -1
-left-pant-bottom
-  rotate: false
-  xy: 2, 2
-  size: 44, 22
-  orig: 44, 22
-  offset: 0, 0
-  index: -1
-left-shoulder
-  rotate: false
-  xy: 153, 67
-  size: 34, 53
-  orig: 34, 53
-  offset: 0, 0
-  index: -1
-left-upper-leg
-  rotate: false
-  xy: 118, 52
-  size: 33, 66
-  orig: 33, 66
-  offset: 0, 0
-  index: -1
-neck
-  rotate: false
-  xy: 177, 175
-  size: 34, 28
-  orig: 34, 28
-  offset: 0, 0
-  index: -1
-pelvis
-  rotate: false
-  xy: 177, 205
-  size: 63, 47
-  orig: 63, 47
-  offset: 0, 0
-  index: -1
-right-ankle
-  rotate: false
-  xy: 297, 170
-  size: 25, 30
-  orig: 25, 30
-  offset: 0, 0
-  index: -1
-right-arm
-  rotate: false
-  xy: 274, 154
-  size: 21, 45
-  orig: 21, 45
-  offset: 0, 0
-  index: -1
-right-foot
-  rotate: false
-  xy: 296, 222
-  size: 67, 30
-  orig: 67, 30
-  offset: 0, 0
-  index: -1
-right-foot-idle
-  rotate: false
-  xy: 432, 224
-  size: 53, 28
-  orig: 53, 28
-  offset: 0, 0
-  index: -1
-right-hand
-  rotate: false
-  xy: 240, 167
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-right-lower-leg
-  rotate: false
-  xy: 125, 188
-  size: 50, 64
-  orig: 50, 64
-  offset: 0, 0
-  index: -1
-right-pant-bottom
-  rotate: false
-  xy: 296, 202
-  size: 46, 18
-  orig: 46, 18
-  offset: 0, 0
-  index: -1
-right-shoulder
-  rotate: false
-  xy: 242, 201
-  size: 52, 51
-  orig: 52, 51
-  offset: 0, 0
-  index: -1
-right-upper-leg
-  rotate: false
-  xy: 72, 48
-  size: 44, 70
-  orig: 44, 70
-  offset: 0, 0
-  index: -1
-torso
-  rotate: false
-  xy: 2, 26
-  size: 68, 92
-  orig: 68, 92
-  offset: 0, 0
-  index: -1

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-diffuse.png


BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old-normal.png


+ 0 - 990
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-old.json

@@ -1,990 +0,0 @@
-{
-"bones": [
-	{ "name": "root" },
-	{ "name": "hip", "parent": "root", "x": 0.64, "y": 114.41 },
-	{ "name": "left upper leg", "parent": "hip", "length": 50.39, "x": 14.45, "y": 2.81, "rotation": -89.09 },
-	{ "name": "pelvis", "parent": "hip", "x": 1.41, "y": -6.57 },
-	{ "name": "right upper leg", "parent": "hip", "length": 45.76, "x": -18.27, "rotation": -101.13 },
-	{ "name": "torso", "parent": "hip", "length": 85.82, "x": -6.42, "y": 1.97, "rotation": 99.4 },
-	{ "name": "left lower leg", "parent": "left upper leg", "length": 56.45, "x": 51.78, "y": 3.46, "rotation": -16.65 },
-	{ "name": "left shoulder", "parent": "torso", "length": 44.19, "x": 78.96, "y": -15.75, "rotation": -156.96 },
-	{ "name": "neck", "parent": "torso", "length": 18.38, "x": 83.64, "y": -1.78, "rotation": 0.9 },
-	{ "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "x": 50.21, "y": 0.6, "rotation": -10.7 },
-	{ "name": "right shoulder", "parent": "torso", "length": 49.95, "x": 81.9, "y": 6.79, "rotation": 130.6 },
-	{ "name": "head", "parent": "neck", "length": 68.28, "x": 19.09, "y": 6.97, "rotation": -8.94 },
-	{ "name": "left arm", "parent": "left shoulder", "length": 35.62, "x": 44.19, "y": -0.01, "rotation": 28.16 },
-	{ "name": "left foot", "parent": "left lower leg", "length": 46.5, "x": 64.02, "y": -8.67, "rotation": 102.43 },
-	{ "name": "right arm", "parent": "right shoulder", "length": 36.74, "x": 49.95, "y": -0.12, "rotation": 40.12 },
-	{ "name": "right foot", "parent": "right lower leg", "length": 45.45, "x": 64.88, "y": 0.04, "rotation": 110.3 },
-	{ "name": "left hand", "parent": "left arm", "length": 11.52, "x": 35.62, "y": 0.07, "rotation": 2.7 },
-	{ "name": "right hand", "parent": "right arm", "length": 15.32, "x": 36.9, "y": 0.34, "rotation": 2.35 }
-],
-"slots": [
-	{ "name": "left shoulder", "bone": "left shoulder", "attachment": "left-shoulder" },
-	{ "name": "left arm", "bone": "left arm", "attachment": "left-arm" },
-	{ "name": "left hand", "bone": "left hand", "attachment": "left-hand" },
-	{ "name": "left foot", "bone": "left foot", "attachment": "left-foot" },
-	{ "name": "left lower leg", "bone": "left lower leg", "attachment": "left-lower-leg" },
-	{ "name": "left upper leg", "bone": "left upper leg", "attachment": "left-upper-leg" },
-	{ "name": "pelvis", "bone": "pelvis", "attachment": "pelvis" },
-	{ "name": "right foot", "bone": "right foot", "attachment": "right-foot" },
-	{ "name": "right lower leg", "bone": "right lower leg", "attachment": "right-lower-leg" },
-	{ "name": "right upper leg", "bone": "right upper leg", "attachment": "right-upper-leg" },
-	{ "name": "torso", "bone": "torso", "attachment": "torso" },
-	{ "name": "neck", "bone": "neck", "attachment": "neck" },
-	{ "name": "head", "bone": "head", "attachment": "head" },
-	{ "name": "eyes", "bone": "head", "attachment": "eyes" },
-	{ "name": "right shoulder", "bone": "right shoulder", "attachment": "right-shoulder" },
-	{ "name": "right arm", "bone": "right arm", "attachment": "right-arm" },
-	{ "name": "right hand", "bone": "right hand", "attachment": "right-hand" },
-	{ "name": "bb-head", "bone": "head", "attachment": "bb-head" }
-],
-"skins": {
-	"default": {
-		"bb-head": {
-			"bb-head": {
-				"type": "boundingbox",
-				"vertices": [ 77.2608, -53.82651, 105.80151, -32.42244, 58.433777, 40.348133, 5.8296814, 37.007954, -7.0167694, -42.236595 ]
-			}
-		},
-		"eyes": {
-			"eyes": { "x": 28.94, "y": -32.92, "rotation": -86.9, "width": 34, "height": 27 },
-			"eyes-closed": { "x": 28.77, "y": -32.86, "rotation": -86.9, "width": 34, "height": 27 }
-		},
-		"head": {
-			"head": { "x": 53.94, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 }
-		},
-		"left arm": {
-			"left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.84, "width": 35, "height": 29 }
-		},
-		"left foot": {
-			"left-foot": { "x": 24.35, "y": 8.88, "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.55, "y": -1.92, "rotation": 105.75, "width": 49, "height": 64 }
-		},
-		"left shoulder": {
-			"left-shoulder": { "x": 23.74, "y": 0.11, "rotation": 62.01, "width": 34, "height": 53 }
-		},
-		"left upper leg": {
-			"left-upper-leg": { "x": 26.12, "y": -1.85, "rotation": 89.09, "width": 33, "height": 67 }
-		},
-		"neck": {
-			"neck": { "x": 9.42, "y": -3.66, "rotation": -100.15, "width": 34, "height": 28 }
-		},
-		"pelvis": {
-			"pelvis": { "x": -4.83, "y": 10.62, "width": 63, "height": 47 }
-		},
-		"right arm": {
-			"right-arm": { "x": 18.34, "y": -2.64, "rotation": 94.32, "width": 21, "height": 45 }
-		},
-		"right foot": {
-			"right-foot": { "x": 19.02, "y": 8.47, "rotation": 1.52, "width": 67, "height": 30 }
-		},
-		"right hand": {
-			"right-hand": { "x": 6.82, "y": 1.25, "rotation": 91.96, "width": 32, "height": 32 }
-		},
-		"right lower leg": {
-			"right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.83, "width": 51, "height": 64 }
-		},
-		"right shoulder": {
-			"right-shoulder": { "x": 25.86, "y": 0.03, "rotation": 134.44, "width": 52, "height": 51 }
-		},
-		"right upper leg": {
-			"right-upper-leg": { "x": 23.03, "y": 0.25, "rotation": 101.13, "width": 44, "height": 70 }
-		},
-		"torso": {
-			"torso": { "x": 44.57, "y": -7.08, "rotation": -94.95, "width": 68, "height": 92 }
-		}
-	}
-},
-"events": {
-	"behind": {},
-	"headAttach": {},
-	"headPop": {}
-},
-"animations": {
-	"headPop": {
-		"bones": {
-			"head": {
-				"rotate": [
-					{ "time": 0, "angle": 0 },
-					{ "time": 0.9614, "angle": -23.11 },
-					{ "time": 1.7856, "angle": -56.45 },
-					{ "time": 2.6097, "angle": 1.38 },
-					{ "time": 3.5712, "angle": 36.12 },
-					{ "time": 4.258, "angle": 1.24 },
-					{ "time": 5.2195, "angle": -37.12 },
-					{ "time": 5.9086, "angle": 2.07 },
-					{ "time": 6.9044, "angle": 34.72 },
-					{ "time": 7.7675, "angle": 359.99 }
-				],
-				"translate": [
-					{
-						"time": 0,
-						"x": 0,
-						"y": 0,
-						"curve": [ 0.19, 0.4, 0.586, 0.75 ]
-					},
-					{
-						"time": 0.5494,
-						"x": 57.88,
-						"y": -35.72,
-						"curve": [ 0.39, 0.54, 0.632, 0.72 ]
-					},
-					{
-						"time": 0.9614,
-						"x": 87.26,
-						"y": -87.89,
-						"curve": [ 0.325, 0.23, 0.587, 0.36 ]
-					},
-					{
-						"time": 1.3735,
-						"x": 28.89,
-						"y": -114.62,
-						"curve": [ 0.383, 0.23, 0.736, 0.55 ]
-					},
-					{
-						"time": 1.7856,
-						"x": -76.58,
-						"y": -124.98,
-						"curve": [ 0.129, 0.21, 0.547, 0.64 ]
-					},
-					{
-						"time": 2.1977,
-						"x": -154.37,
-						"y": -77.13,
-						"curve": [ 0.354, 0.48, 0.729, 0.9 ]
-					},
-					{
-						"time": 2.6097,
-						"x": -181.02,
-						"y": 18.56,
-						"curve": [ 0.063, 0.15, 0.52, 0.62 ]
-					},
-					{
-						"time": 3.1591,
-						"x": -150.38,
-						"y": 128.67,
-						"curve": [ 0.381, 0.54, 0.778, 1 ]
-					},
-					{
-						"time": 3.5712,
-						"x": -112.08,
-						"y": 146.28,
-						"curve": [ 0.242, 0, 0.626, 0.45 ]
-					},
-					{
-						"time": 3.8459,
-						"x": -63.7,
-						"y": 111.22,
-						"curve": [ 0.398, 0.35, 0.786, 0.76 ]
-					},
-					{
-						"time": 4.258,
-						"x": -48.94,
-						"y": -1.55,
-						"curve": [ 0.188, 0.21, 0.575, 0.61 ]
-					},
-					{
-						"time": 4.6701,
-						"x": -91.69,
-						"y": -91.93,
-						"curve": [ 0.362, 0.51, 0.766, 1 ]
-					},
-					{
-						"time": 5.2195,
-						"x": -142.79,
-						"y": -126.83,
-						"curve": [ 0.227, 0.34, 0.593, 0.75 ]
-					},
-					{
-						"time": 5.4942,
-						"x": -176.7,
-						"y": -98.32,
-						"curve": [ 0.26, 0.4, 0.612, 0.71 ]
-					},
-					{
-						"time": 5.7689,
-						"x": -163.95,
-						"y": -24.04,
-						"curve": [ 0.338, 0.37, 0.676, 0.71 ]
-					},
-					{
-						"time": 5.9063,
-						"x": -150.17,
-						"y": 10.71,
-						"curve": [ 0.387, 0.61, 0.741, 1 ]
-					},
-					{
-						"time": 6.181,
-						"x": -102.44,
-						"y": 45.92,
-						"curve": [ 0.31, 0.24, 0.648, 0.58 ]
-					},
-					{
-						"time": 6.4557,
-						"x": -53.99,
-						"y": 70.39,
-						"curve": [ 0.325, 0.29, 0.663, 0.63 ]
-					},
-					{
-						"time": 6.7304,
-						"x": 1.88,
-						"y": 55.54,
-						"curve": [ 0.387, 0.33, 0.769, 0.73 ]
-					},
-					{
-						"time": 7.1425,
-						"x": 34.26,
-						"y": 36.13,
-						"curve": [ 0.206, 0.28, 0.596, 0.67 ]
-					},
-					{
-						"time": 7.5545,
-						"x": 23.94,
-						"y": 1.01,
-						"curve": [ 0.373, 0.56, 0.759, 1 ]
-					},
-					{ "time": 7.9666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 1.6482, "x": 1, "y": 1 },
-					{ "time": 2.6097, "x": 0.742, "y": 0.742 },
-					{ "time": 3.5712, "x": 1, "y": 1 },
-					{ "time": 4.258, "x": 1.502, "y": 1.502 },
-					{ "time": 5.2195, "x": 1, "y": 1 },
-					{ "time": 5.9063, "x": 0.707, "y": 0.707 },
-					{ "time": 6.7304, "x": 1, "y": 1 }
-				]
-			}
-		},
-		"draworder": [
-			{
-				"time": 1.2362,
-				"offsets": [
-					{ "slot": "head", "offset": -12 },
-					{ "slot": "eyes", "offset": -12 }
-				]
-			},
-			{
-				"time": 3.5712,
-				"offsets": [
-					{ "slot": "head", "offset": 3 },
-					{ "slot": "eyes", "offset": 3 }
-				]
-			},
-			{
-				"time": 5.2195,
-				"offsets": [
-					{ "slot": "head", "offset": -12 },
-					{ "slot": "eyes", "offset": -12 }
-				]
-			},
-			{ "time": 7.1425 }
-		],
-		"events": [
-			{ "time": 0, "name": "headPop", "string": "pop.wav" },
-			{ "time": 2.6097, "name": "behind" },
-			{ "time": 5.9063, "name": "behind" },
-			{ "time": 7.9666, "name": "headAttach", "string": "attach.wav" }
-		]
-	},
-	"jump": {
-		"bones": {
-			"hip": {
-				"rotate": [
-					{ "time": 0, "angle": 0, "curve": "stepped" },
-					{ "time": 0.9333, "angle": 0, "curve": "stepped" },
-					{ "time": 1.3666, "angle": 0 }
-				],
-				"translate": [
-					{ "time": 0, "x": -11.57, "y": -3 },
-					{ "time": 0.2333, "x": -16.2, "y": -19.43 },
-					{
-						"time": 0.3333,
-						"x": 7.66,
-						"y": -8.48,
-						"curve": [ 0.057, 0.06, 0.712, 1 ]
-					},
-					{ "time": 0.3666, "x": 15.38, "y": 5.01 },
-					{ "time": 0.4666, "x": -7.84, "y": 57.22 },
-					{
-						"time": 0.6,
-						"x": -10.81,
-						"y": 96.34,
-						"curve": [ 0.241, 0, 1, 1 ]
-					},
-					{ "time": 0.7333, "x": -7.01, "y": 54.7 },
-					{ "time": 0.8, "x": -10.58, "y": 32.2 },
-					{ "time": 0.9333, "x": -31.99, "y": 0.45 },
-					{ "time": 1.0666, "x": -12.48, "y": -29.47 },
-					{ "time": 1.3666, "x": -11.57, "y": -3 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left upper leg": {
-				"rotate": [
-					{ "time": 0, "angle": 17.13 },
-					{ "time": 0.2333, "angle": 44.35 },
-					{ "time": 0.3333, "angle": 16.46 },
-					{ "time": 0.4, "angle": -9.88 },
-					{ "time": 0.4666, "angle": -11.42 },
-					{ "time": 0.5666, "angle": 23.46 },
-					{ "time": 0.7666, "angle": 71.82 },
-					{ "time": 0.9333, "angle": 65.53 },
-					{ "time": 1.0666, "angle": 51.01 },
-					{ "time": 1.3666, "angle": 17.13 }
-				],
-				"translate": [
-					{ "time": 0, "x": -3, "y": -2.25, "curve": "stepped" },
-					{ "time": 0.9333, "x": -3, "y": -2.25, "curve": "stepped" },
-					{ "time": 1.3666, "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.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left lower leg": {
-				"rotate": [
-					{ "time": 0, "angle": -16.25 },
-					{ "time": 0.2333, "angle": -52.21 },
-					{ "time": 0.4, "angle": 15.04 },
-					{ "time": 0.4666, "angle": -8.95 },
-					{ "time": 0.5666, "angle": -39.53 },
-					{ "time": 0.7666, "angle": -27.27 },
-					{ "time": 0.9333, "angle": -3.52 },
-					{ "time": 1.0666, "angle": -61.92 },
-					{ "time": 1.3666, "angle": -16.25 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left foot": {
-				"rotate": [
-					{ "time": 0, "angle": 0.33 },
-					{ "time": 0.2333, "angle": 6.2 },
-					{ "time": 0.3333, "angle": 14.73 },
-					{ "time": 0.4, "angle": -15.54 },
-					{ "time": 0.4333, "angle": -21.2 },
-					{ "time": 0.5666, "angle": -7.55 },
-					{ "time": 0.7666, "angle": -0.67 },
-					{ "time": 0.9333, "angle": -0.58 },
-					{ "time": 1.0666, "angle": 14.64 },
-					{ "time": 1.3666, "angle": 0.33 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right upper leg": {
-				"rotate": [
-					{ "time": 0, "angle": 25.97 },
-					{ "time": 0.2333, "angle": 46.43 },
-					{ "time": 0.3333, "angle": 22.61 },
-					{ "time": 0.4, "angle": 2.13 },
-					{
-						"time": 0.4666,
-						"angle": 0.04,
-						"curve": [ 0, 0, 0.637, 0.98 ]
-					},
-					{ "time": 0.6, "angle": 65.55 },
-					{ "time": 0.7666, "angle": 64.93 },
-					{ "time": 0.9333, "angle": 41.08 },
-					{ "time": 1.0666, "angle": 66.25 },
-					{ "time": 1.3666, "angle": 25.97 }
-				],
-				"translate": [
-					{ "time": 0, "x": 5.74, "y": 0.61 },
-					{ "time": 0.2333, "x": 4.79, "y": 1.79 },
-					{ "time": 0.3333, "x": 6.05, "y": -4.55 },
-					{ "time": 0.9333, "x": 4.79, "y": 1.79, "curve": "stepped" },
-					{ "time": 1.0666, "x": 4.79, "y": 1.79 },
-					{ "time": 1.3666, "x": 5.74, "y": 0.61 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right lower leg": {
-				"rotate": [
-					{ "time": 0, "angle": -27.46 },
-					{ "time": 0.2333, "angle": -64.03 },
-					{ "time": 0.4, "angle": -48.36 },
-					{ "time": 0.5666, "angle": -76.86 },
-					{ "time": 0.7666, "angle": -26.89 },
-					{ "time": 0.9, "angle": -18.97 },
-					{ "time": 0.9333, "angle": -14.18 },
-					{ "time": 1.0666, "angle": -80.45 },
-					{ "time": 1.3666, "angle": -27.46 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right foot": {
-				"rotate": [
-					{ "time": 0, "angle": 1.08 },
-					{ "time": 0.2333, "angle": 16.02 },
-					{ "time": 0.3, "angle": 12.94 },
-					{ "time": 0.3333, "angle": 15.16 },
-					{ "time": 0.4, "angle": -14.7 },
-					{ "time": 0.4333, "angle": -12.85 },
-					{ "time": 0.4666, "angle": -19.18 },
-					{ "time": 0.5666, "angle": -15.82 },
-					{ "time": 0.6, "angle": -3.59 },
-					{ "time": 0.7666, "angle": -3.56 },
-					{ "time": 0.9333, "angle": 1.86 },
-					{ "time": 1.0666, "angle": 16.02 },
-					{ "time": 1.3666, "angle": 1.08 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"torso": {
-				"rotate": [
-					{ "time": 0, "angle": -13.35 },
-					{ "time": 0.2333, "angle": -48.95 },
-					{ "time": 0.4333, "angle": -35.77 },
-					{ "time": 0.6, "angle": -4.59 },
-					{ "time": 0.7666, "angle": 14.61 },
-					{ "time": 0.9333, "angle": 15.74 },
-					{ "time": 1.0666, "angle": -32.44 },
-					{ "time": 1.3666, "angle": -13.35 }
-				],
-				"translate": [
-					{ "time": 0, "x": -3.67, "y": 1.68, "curve": "stepped" },
-					{ "time": 0.9333, "x": -3.67, "y": 1.68, "curve": "stepped" },
-					{ "time": 1.3666, "x": -3.67, "y": 1.68 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"neck": {
-				"rotate": [
-					{ "time": 0, "angle": 12.78 },
-					{ "time": 0.2333, "angle": 16.46 },
-					{ "time": 0.4, "angle": 26.49 },
-					{ "time": 0.6, "angle": 15.51 },
-					{ "time": 0.7666, "angle": 1.34 },
-					{ "time": 0.9333, "angle": 2.35 },
-					{ "time": 1.0666, "angle": 6.08 },
-					{ "time": 1.3, "angle": 21.23 },
-					{ "time": 1.3666, "angle": 12.78 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"head": {
-				"rotate": [
-					{ "time": 0, "angle": 5.19 },
-					{ "time": 0.2333, "angle": 20.27 },
-					{ "time": 0.4, "angle": 15.27 },
-					{ "time": 0.6, "angle": -24.69 },
-					{ "time": 0.7666, "angle": -11.02 },
-					{ "time": 0.9333, "angle": -24.38 },
-					{ "time": 1.0666, "angle": 11.99 },
-					{ "time": 1.3, "angle": 4.86 },
-					{ "time": 1.3666, "angle": 5.19 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left shoulder": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": 0.05,
-						"curve": [ 0, 0, 0.62, 1 ]
-					},
-					{
-						"time": 0.2333,
-						"angle": 279.66,
-						"curve": [ 0.218, 0.67, 0.66, 0.99 ]
-					},
-					{
-						"time": 0.5,
-						"angle": 62.27,
-						"curve": [ 0.462, 0, 0.764, 0.58 ]
-					},
-					{ "time": 0.9333, "angle": 28.91 },
-					{ "time": 1.0666, "angle": -8.62 },
-					{ "time": 1.1666, "angle": -18.43 },
-					{ "time": 1.3666, "angle": 0.05 }
-				],
-				"translate": [
-					{ "time": 0, "x": -1.76, "y": 0.56, "curve": "stepped" },
-					{ "time": 0.9333, "x": -1.76, "y": 0.56, "curve": "stepped" },
-					{ "time": 1.3666, "x": -1.76, "y": 0.56 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left hand": {
-				"rotate": [
-					{ "time": 0, "angle": 11.58, "curve": "stepped" },
-					{ "time": 0.9333, "angle": 11.58, "curve": "stepped" },
-					{ "time": 1.3666, "angle": 11.58 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"left arm": {
-				"rotate": [
-					{ "time": 0, "angle": 0.51 },
-					{ "time": 0.4333, "angle": 12.82 },
-					{ "time": 0.6, "angle": 47.55 },
-					{ "time": 0.9333, "angle": 12.82 },
-					{ "time": 1.1666, "angle": -6.5 },
-					{ "time": 1.3666, "angle": 0.51 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right shoulder": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": 43.82,
-						"curve": [ 0, 0, 0.62, 1 ]
-					},
-					{
-						"time": 0.2333,
-						"angle": -8.74,
-						"curve": [ 0.304, 0.58, 0.709, 0.97 ]
-					},
-					{
-						"time": 0.5333,
-						"angle": -208.02,
-						"curve": [ 0.462, 0, 0.764, 0.58 ]
-					},
-					{ "time": 0.9333, "angle": -246.72 },
-					{ "time": 1.0666, "angle": -307.13 },
-					{ "time": 1.1666, "angle": 37.15 },
-					{ "time": 1.3666, "angle": 43.82 }
-				],
-				"translate": [
-					{ "time": 0, "x": -7.84, "y": 7.19, "curve": "stepped" },
-					{ "time": 0.9333, "x": -7.84, "y": 7.19, "curve": "stepped" },
-					{ "time": 1.3666, "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.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right arm": {
-				"rotate": [
-					{ "time": 0, "angle": -4.02 },
-					{ "time": 0.6, "angle": 17.5 },
-					{ "time": 0.9333, "angle": -4.02 },
-					{ "time": 1.1666, "angle": -16.72 },
-					{ "time": 1.3666, "angle": -4.02 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"right hand": {
-				"rotate": [
-					{ "time": 0, "angle": 22.92, "curve": "stepped" },
-					{ "time": 0.9333, "angle": 22.92, "curve": "stepped" },
-					{ "time": 1.3666, "angle": 22.92 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.9333, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 1.3666, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 0.9333, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			},
-			"root": {
-				"rotate": [
-					{ "time": 0, "angle": 0 },
-					{ "time": 0.4333, "angle": -14.52 },
-					{ "time": 0.8, "angle": 9.86 },
-					{ "time": 1.3666, "angle": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1, "curve": "stepped" },
-					{ "time": 1.3666, "x": 1, "y": 1 }
-				]
-			}
-		}
-	},
-	"walk": {
-		"bones": {
-			"left upper leg": {
-				"rotate": [
-					{ "time": 0, "angle": -26.55 },
-					{ "time": 0.1333, "angle": -8.78 },
-					{ "time": 0.2666, "angle": 9.51 },
-					{ "time": 0.4, "angle": 30.74 },
-					{ "time": 0.5333, "angle": 25.33 },
-					{ "time": 0.6666, "angle": 26.11 },
-					{ "time": 0.8, "angle": -7.7 },
-					{ "time": 0.9333, "angle": -21.19 },
-					{ "time": 1.0666, "angle": -26.55 }
-				],
-				"translate": [
-					{ "time": 0, "x": -3, "y": -2.25 },
-					{ "time": 0.4, "x": -2.18, "y": -2.25 },
-					{ "time": 1.0666, "x": -3, "y": -2.25 }
-				]
-			},
-			"right upper leg": {
-				"rotate": [
-					{ "time": 0, "angle": 42.45 },
-					{ "time": 0.1333, "angle": 52.1 },
-					{ "time": 0.2666, "angle": 5.96 },
-					{ "time": 0.5333, "angle": -16.93 },
-					{ "time": 0.6666, "angle": 1.89 },
-					{
-						"time": 0.8,
-						"angle": 28.06,
-						"curve": [ 0.462, 0.11, 1, 1 ]
-					},
-					{
-						"time": 0.9333,
-						"angle": 58.68,
-						"curve": [ 0.5, 0.02, 1, 1 ]
-					},
-					{ "time": 1.0666, "angle": 42.45 }
-				],
-				"translate": [
-					{ "time": 0, "x": 8.11, "y": -2.36 },
-					{ "time": 0.1333, "x": 10.03, "y": -2.56 },
-					{ "time": 0.4, "x": 2.76, "y": -2.97 },
-					{ "time": 0.5333, "x": 2.76, "y": -2.81 },
-					{ "time": 0.9333, "x": 8.67, "y": -2.54 },
-					{ "time": 1.0666, "x": 8.11, "y": -2.36 }
-				]
-			},
-			"left lower leg": {
-				"rotate": [
-					{ "time": 0, "angle": -10.21 },
-					{ "time": 0.1333, "angle": -55.64 },
-					{ "time": 0.2666, "angle": -68.12 },
-					{ "time": 0.5333, "angle": 5.11 },
-					{ "time": 0.6666, "angle": -28.29 },
-					{ "time": 0.8, "angle": 4.08 },
-					{ "time": 0.9333, "angle": 3.53 },
-					{ "time": 1.0666, "angle": -10.21 }
-				]
-			},
-			"left foot": {
-				"rotate": [
-					{ "time": 0, "angle": -3.69 },
-					{ "time": 0.1333, "angle": -10.42 },
-					{ "time": 0.2666, "angle": -17.14 },
-					{ "time": 0.4, "angle": -2.83 },
-					{ "time": 0.5333, "angle": -3.87 },
-					{ "time": 0.6666, "angle": 2.78 },
-					{ "time": 0.8, "angle": 1.68 },
-					{ "time": 0.9333, "angle": -8.54 },
-					{ "time": 1.0666, "angle": -3.69 }
-				]
-			},
-			"right shoulder": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": 20.89,
-						"curve": [ 0.264, 0, 0.75, 1 ]
-					},
-					{
-						"time": 0.1333,
-						"angle": 3.72,
-						"curve": [ 0.272, 0, 0.841, 1 ]
-					},
-					{ "time": 0.6666, "angle": -278.28 },
-					{ "time": 1.0666, "angle": 20.89 }
-				],
-				"translate": [
-					{ "time": 0, "x": -7.84, "y": 7.19 },
-					{ "time": 0.1333, "x": -6.36, "y": 6.42 },
-					{ "time": 0.6666, "x": -11.07, "y": 5.25 },
-					{ "time": 1.0666, "x": -7.84, "y": 7.19 }
-				]
-			},
-			"right arm": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": -4.02,
-						"curve": [ 0.267, 0, 0.804, 0.99 ]
-					},
-					{
-						"time": 0.1333,
-						"angle": -13.99,
-						"curve": [ 0.341, 0, 1, 1 ]
-					},
-					{
-						"time": 0.6666,
-						"angle": 36.54,
-						"curve": [ 0.307, 0, 0.787, 0.99 ]
-					},
-					{ "time": 1.0666, "angle": -4.02 }
-				]
-			},
-			"right hand": {
-				"rotate": [
-					{ "time": 0, "angle": 22.92 },
-					{ "time": 0.4, "angle": -8.97 },
-					{ "time": 0.6666, "angle": 0.51 },
-					{ "time": 1.0666, "angle": 22.92 }
-				]
-			},
-			"left shoulder": {
-				"rotate": [
-					{ "time": 0, "angle": -1.47 },
-					{ "time": 0.1333, "angle": 13.6 },
-					{ "time": 0.6666, "angle": 280.74 },
-					{ "time": 1.0666, "angle": -1.47 }
-				],
-				"translate": [
-					{ "time": 0, "x": -1.76, "y": 0.56 },
-					{ "time": 0.6666, "x": -2.47, "y": 8.14 },
-					{ "time": 1.0666, "x": -1.76, "y": 0.56 }
-				]
-			},
-			"left hand": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": 11.58,
-						"curve": [ 0.169, 0.37, 0.632, 1.55 ]
-					},
-					{
-						"time": 0.1333,
-						"angle": 28.13,
-						"curve": [ 0.692, 0, 0.692, 0.99 ]
-					},
-					{
-						"time": 0.6666,
-						"angle": -27.42,
-						"curve": [ 0.117, 0.41, 0.738, 1.76 ]
-					},
-					{ "time": 0.8, "angle": -36.32 },
-					{ "time": 1.0666, "angle": 11.58 }
-				]
-			},
-			"left arm": {
-				"rotate": [
-					{ "time": 0, "angle": -8.27 },
-					{ "time": 0.1333, "angle": 18.43 },
-					{ "time": 0.6666, "angle": 0.88 },
-					{ "time": 1.0666, "angle": -8.27 }
-				]
-			},
-			"torso": {
-				"rotate": [
-					{ "time": 0, "angle": -10.28 },
-					{
-						"time": 0.1333,
-						"angle": -15.38,
-						"curve": [ 0.545, 0, 1, 1 ]
-					},
-					{
-						"time": 0.4,
-						"angle": -9.78,
-						"curve": [ 0.58, 0.17, 1, 1 ]
-					},
-					{ "time": 0.6666, "angle": -15.75 },
-					{ "time": 0.9333, "angle": -7.06 },
-					{ "time": 1.0666, "angle": -10.28 }
-				],
-				"translate": [
-					{ "time": 0, "x": -3.67, "y": 1.68 },
-					{ "time": 0.1333, "x": -3.67, "y": 0.68 },
-					{ "time": 0.4, "x": -3.67, "y": 1.97 },
-					{ "time": 0.6666, "x": -3.67, "y": -0.14 },
-					{ "time": 1.0666, "x": -3.67, "y": 1.68 }
-				]
-			},
-			"right foot": {
-				"rotate": [
-					{ "time": 0, "angle": -5.25 },
-					{ "time": 0.2666, "angle": -4.08 },
-					{ "time": 0.4, "angle": -6.45 },
-					{ "time": 0.5333, "angle": -5.39 },
-					{ "time": 0.8, "angle": -11.68 },
-					{ "time": 0.9333, "angle": 0.46 },
-					{ "time": 1.0666, "angle": -5.25 }
-				]
-			},
-			"right lower leg": {
-				"rotate": [
-					{ "time": 0, "angle": -3.39 },
-					{ "time": 0.1333, "angle": -45.53 },
-					{ "time": 0.2666, "angle": -2.59 },
-					{ "time": 0.5333, "angle": -19.53 },
-					{ "time": 0.6666, "angle": -64.8 },
-					{
-						"time": 0.8,
-						"angle": -82.56,
-						"curve": [ 0.557, 0.18, 1, 1 ]
-					},
-					{ "time": 1.0666, "angle": -3.39 }
-				]
-			},
-			"hip": {
-				"rotate": [
-					{ "time": 0, "angle": 0, "curve": "stepped" },
-					{ "time": 1.0666, "angle": 0 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0 },
-					{
-						"time": 0.1333,
-						"x": 0,
-						"y": -7.61,
-						"curve": [ 0.272, 0.86, 1, 1 ]
-					},
-					{ "time": 0.4, "x": 0, "y": 8.7 },
-					{ "time": 0.5333, "x": 0, "y": -0.41 },
-					{
-						"time": 0.6666,
-						"x": 0,
-						"y": -7.05,
-						"curve": [ 0.235, 0.89, 1, 1 ]
-					},
-					{ "time": 0.8, "x": 0, "y": 2.92 },
-					{ "time": 0.9333, "x": 0, "y": 6.78 },
-					{ "time": 1.0666, "x": 0, "y": 0 }
-				]
-			},
-			"neck": {
-				"rotate": [
-					{ "time": 0, "angle": 3.6 },
-					{ "time": 0.1333, "angle": 17.49 },
-					{ "time": 0.2666, "angle": 6.1 },
-					{ "time": 0.4, "angle": 3.45 },
-					{ "time": 0.5333, "angle": 5.17 },
-					{ "time": 0.6666, "angle": 18.36 },
-					{ "time": 0.8, "angle": 6.09 },
-					{ "time": 0.9333, "angle": 2.28 },
-					{ "time": 1.0666, "angle": 3.6 }
-				]
-			},
-			"head": {
-				"rotate": [
-					{
-						"time": 0,
-						"angle": 3.6,
-						"curve": [ 0, 0, 0.704, 1.61 ]
-					},
-					{ "time": 0.1666, "angle": -0.2 },
-					{ "time": 0.2666, "angle": 6.1 },
-					{ "time": 0.4, "angle": 3.45 },
-					{
-						"time": 0.5333,
-						"angle": 5.17,
-						"curve": [ 0, 0, 0.704, 1.61 ]
-					},
-					{ "time": 0.7, "angle": 1.1 },
-					{ "time": 0.8, "angle": 6.09 },
-					{ "time": 0.9333, "angle": 2.28 },
-					{ "time": 1.0666, "angle": 3.6 }
-				]
-			},
-			"root": {
-				"rotate": [
-					{ "time": 0, "angle": 0 }
-				]
-			}
-		}
-	}
-}
-}

+ 0 - 194
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.atlas

@@ -1,194 +0,0 @@
-
-spineboy.png
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-eye_indifferent
-  rotate: true
-  xy: 389, 5
-  size: 56, 53
-  orig: 56, 53
-  offset: 0, 0
-  index: -1
-eye_surprised
-  rotate: false
-  xy: 580, 34
-  size: 56, 53
-  orig: 56, 53
-  offset: 0, 0
-  index: -1
-front_bracer
-  rotate: false
-  xy: 732, 85
-  size: 35, 48
-  orig: 35, 48
-  offset: 0, 0
-  index: -1
-front_fist_closed
-  rotate: false
-  xy: 556, 91
-  size: 45, 49
-  orig: 45, 49
-  offset: 0, 0
-  index: -1
-front_fist_open
-  rotate: false
-  xy: 668, 32
-  size: 52, 52
-  orig: 52, 52
-  offset: 0, 0
-  index: -1
-front_foot
-  rotate: false
-  xy: 924, 201
-  size: 76, 41
-  orig: 76, 41
-  offset: 0, 0
-  index: -1
-front_foot_bend1
-  rotate: false
-  xy: 845, 200
-  size: 77, 42
-  orig: 77, 42
-  offset: 0, 0
-  index: -1
-front_foot_bend2
-  rotate: false
-  xy: 778, 186
-  size: 65, 56
-  orig: 65, 56
-  offset: 0, 0
-  index: -1
-front_shin
-  rotate: true
-  xy: 444, 91
-  size: 49, 110
-  orig: 49, 110
-  offset: 0, 0
-  index: -1
-front_thigh
-  rotate: true
-  xy: 603, 89
-  size: 29, 67
-  orig: 29, 67
-  offset: 0, 0
-  index: -1
-front_upper_arm
-  rotate: true
-  xy: 672, 86
-  size: 32, 58
-  orig: 32, 58
-  offset: 0, 0
-  index: -1
-goggles
-  rotate: false
-  xy: 444, 142
-  size: 157, 100
-  orig: 157, 100
-  offset: 0, 0
-  index: -1
-gun
-  rotate: false
-  xy: 603, 120
-  size: 126, 122
-  orig: 126, 122
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 279, 63
-  size: 163, 179
-  orig: 163, 179
-  offset: 0, 0
-  index: -1
-mouth_grind
-  rotate: false
-  xy: 845, 163
-  size: 56, 35
-  orig: 56, 35
-  offset: 0, 0
-  index: -1
-mouth_oooo
-  rotate: false
-  xy: 842, 126
-  size: 56, 35
-  orig: 56, 35
-  offset: 0, 0
-  index: -1
-mouth_smile
-  rotate: false
-  xy: 769, 97
-  size: 56, 35
-  orig: 56, 35
-  offset: 0, 0
-  index: -1
-muzzle
-  rotate: false
-  xy: 2, 2
-  size: 275, 240
-  orig: 277, 240
-  offset: 0, 0
-  index: -1
-neck
-  rotate: false
-  xy: 903, 173
-  size: 22, 25
-  orig: 22, 25
-  offset: 0, 0
-  index: -1
-rear_bracer
-  rotate: false
-  xy: 722, 40
-  size: 34, 43
-  orig: 34, 43
-  offset: 0, 0
-  index: -1
-rear_foot
-  rotate: false
-  xy: 444, 11
-  size: 68, 36
-  orig: 68, 36
-  offset: 0, 0
-  index: -1
-rear_foot_bend1
-  rotate: false
-  xy: 444, 49
-  size: 70, 40
-  orig: 70, 40
-  offset: 0, 0
-  index: -1
-rear_foot_bend2
-  rotate: false
-  xy: 778, 134
-  size: 62, 50
-  orig: 62, 50
-  offset: 0, 0
-  index: -1
-rear_shin
-  rotate: false
-  xy: 731, 135
-  size: 45, 107
-  orig: 45, 107
-  offset: 0, 0
-  index: -1
-rear_thigh
-  rotate: true
-  xy: 516, 50
-  size: 39, 62
-  orig: 39, 62
-  offset: 0, 0
-  index: -1
-rear_upper_arm
-  rotate: false
-  xy: 638, 35
-  size: 28, 52
-  orig: 28, 52
-  offset: 0, 0
-  index: -1
-torso
-  rotate: true
-  xy: 279, 2
-  size: 59, 108
-  orig: 59, 108
-  offset: 0, 0
-  index: -1

+ 25 - 32
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.json

@@ -1,39 +1,31 @@
 {
+"skeleton": { "hash": "rPoYyBLFG6F0CGZ5wsUEBKDJU9U", "spine": "3.4.00", "width": 0, "height": 0, "images": "./images/" },
 "bones": [
 	{ "name": "hip", "y": 247.47 },
-	{ "name": "front_thigh", "parent": "hip", "length": 74.8, "x": -17.45, "y": -11.64, "rotation": -95.51, "color": "00ff04ff" },
-	{ "name": "rear_thigh", "parent": "hip", "length": 85.71, "x": 8.91, "y": -5.62, "rotation": -72.54, "color": "ff000dff" },
-	{ "name": "torso", "parent": "hip", "length": 127.55, "x": -1.61, "y": 4.9, "rotation": 103.82, "color": "e0da19ff" },
-	{
-		"name": "front_shin",
-		"parent": "front_thigh",
-		"length": 128.76,
-		"x": 78.69,
-		"y": 1.6,
-		"rotation": -2.21,
-		"inheritScale": false,
-		"color": "00ff04ff"
-	},
-	{ "name": "front_upper_arm", "parent": "torso", "length": 69.45, "x": 103.75, "y": 19.32, "rotation": 168.37, "color": "00ff04ff" },
-	{ "name": "neck", "parent": "torso", "length": 25.45, "x": 127.49, "y": -0.3, "rotation": -31.53, "color": "e0da19ff" },
-	{ "name": "rear_shin", "parent": "rear_thigh", "length": 121.87, "x": 86.1, "y": -1.32, "rotation": -19.83, "color": "ff000dff" },
-	{ "name": "rear_upper_arm", "parent": "torso", "length": 51.93, "x": 92.35, "y": -19.22, "rotation": -169.55, "color": "ff000dff" },
+	{ "name": "torso", "parent": "hip", "length": 127.55, "rotation": 103.82, "x": -1.61, "y": 4.9, "color": "e0da19ff" },
+	{ "name": "front_upper_arm", "parent": "torso", "length": 69.45, "rotation": 168.37, "x": 103.75, "y": 19.32, "color": "00ff04ff" },
 	{
 		"name": "front_bracer",
 		"parent": "front_upper_arm",
 		"length": 40.57,
+		"rotation": 18.29,
 		"x": 68.8,
 		"y": -0.68,
-		"rotation": 18.29,
 		"color": "00ff04ff"
 	},
-	{ "name": "front_foot", "parent": "front_shin", "length": 91.34, "x": 128.75, "y": -0.33, "rotation": 77.9, "color": "00ff04ff" },
-	{ "name": "head", "parent": "neck", "length": 263.57, "x": 27.66, "y": -0.25, "rotation": 23.18, "color": "e0da19ff" },
-	{ "name": "rear_bracer", "parent": "rear_upper_arm", "length": 34.55, "x": 51.35, "rotation": 23.15, "color": "ff000dff" },
-	{ "name": "rear_foot", "parent": "rear_shin", "length": 82.57, "x": 121.45, "y": -0.75, "rotation": 69.3, "color": "ff000dff" },
-	{ "name": "front_fist", "parent": "front_bracer", "length": 65.38, "x": 40.56, "y": 0.19, "rotation": 12.43, "color": "00ff04ff" },
-	{ "name": "gun", "parent": "rear_bracer", "length": 43.1, "x": 34.42, "y": -0.45, "rotation": 5.34, "color": "ff000dff" },
-	{ "name": "gunTip", "parent": "gun", "x": 201.04, "y": 52.13, "rotation": 6.83, "color": "ff000dff" }
+	{ "name": "front_fist", "parent": "front_bracer", "length": 65.38, "rotation": 12.43, "x": 40.56, "y": 0.19, "color": "00ff04ff" },
+	{ "name": "front_thigh", "parent": "hip", "length": 74.8, "rotation": -95.51, "x": -17.45, "y": -11.64, "color": "00ff04ff" },
+	{ "name": "front_shin", "parent": "front_thigh", "length": 128.76, "rotation": -2.21, "x": 78.69, "y": 1.6, "color": "00ff04ff" },
+	{ "name": "front_foot", "parent": "front_shin", "length": 91.34, "rotation": 77.9, "x": 128.75, "y": -0.33, "color": "00ff04ff" },
+	{ "name": "rear_upper_arm", "parent": "torso", "length": 51.93, "rotation": -169.55, "x": 92.35, "y": -19.22, "color": "ff000dff" },
+	{ "name": "rear_bracer", "parent": "rear_upper_arm", "length": 34.55, "rotation": 23.15, "x": 51.35, "color": "ff000dff" },
+	{ "name": "gun", "parent": "rear_bracer", "length": 43.1, "rotation": 5.34, "x": 34.42, "y": -0.45, "color": "ff000dff" },
+	{ "name": "gunTip", "parent": "gun", "rotation": 6.83, "x": 201.04, "y": 52.13, "color": "ff000dff" },
+	{ "name": "neck", "parent": "torso", "length": 25.45, "rotation": -31.53, "x": 127.49, "y": -0.3, "color": "e0da19ff" },
+	{ "name": "head", "parent": "neck", "length": 263.57, "rotation": 23.18, "x": 27.66, "y": -0.25, "color": "e0da19ff" },
+	{ "name": "rear_thigh", "parent": "hip", "length": 85.71, "rotation": -72.54, "x": 8.91, "y": -5.62, "color": "ff000dff" },
+	{ "name": "rear_shin", "parent": "rear_thigh", "length": 121.87, "rotation": -19.83, "x": 86.1, "y": -1.32, "color": "ff000dff" },
+	{ "name": "rear_foot", "parent": "rear_shin", "length": 82.57, "rotation": 69.3, "x": 121.45, "y": -0.75, "color": "ff000dff" }
 ],
 "slots": [
 	{ "name": "rear_upper_arm", "bone": "rear_upper_arm", "attachment": "rear_upper_arm" },
@@ -54,7 +46,7 @@
 	{ "name": "goggles", "bone": "head", "attachment": "goggles" },
 	{ "name": "front_bracer", "bone": "front_bracer", "attachment": "front_bracer" },
 	{ "name": "front_fist", "bone": "front_fist", "attachment": "front_fist_closed" },
-	{ "name": "muzzle", "bone": "gunTip", "additive": true },
+	{ "name": "muzzle", "bone": "gunTip", "blend": "additive" },
 	{ "name": "head-bb", "bone": "head" }
 ],
 "skins": {
@@ -96,7 +88,8 @@
 		"head-bb": {
 			"head": {
 				"type": "boundingbox",
-				"vertices": [ -19.143097, -70.30209, 40.80313, -118.074234, 257.77155, -115.61827, 285.16193, 57.18005, 120.77191, 164.95125, -5.067627, 76.94907 ]
+				"vertexCount": 6,
+				"vertices": [ -19.14, -70.3, 40.8, -118.07, 257.77, -115.61, 285.16, 57.18, 120.77, 164.95, -5.06, 76.94 ]
 			}
 		},
 		"mouth": {
@@ -1832,10 +1825,6 @@
 				]
 			},
 			"muzzle": {
-				"attachment": [
-					{ "time": 0.1333, "name": "muzzle" },
-					{ "time": 0.2666, "name": null }
-				],
 				"color": [
 					{
 						"time": 0.1333,
@@ -1848,6 +1837,10 @@
 						"curve": [ 0.821, 0, 0.909, 0.89 ]
 					},
 					{ "time": 0.2666, "color": "ffffff00" }
+				],
+				"attachment": [
+					{ "time": 0.1333, "name": "muzzle" },
+					{ "time": 0.2666, "name": null }
 				]
 			}
 		},
@@ -2015,7 +2008,7 @@
 				]
 			}
 		},
-		"draworder": [
+		"drawOrder": [
 			{
 				"time": 0.6666,
 				"offsets": [

BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.png


BIN
spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.skel


+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/Box2DExample.java

@@ -80,7 +80,7 @@ public class Box2DExample extends ApplicationAdapter {
 		skeletonRenderer = new SkeletonRenderer();
 		skeletonRenderer.setPremultipliedAlpha(true);
 
-		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy.atlas"));
+		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy-pma.atlas"));
 
 		// This loader creates Box2dAttachments instead of RegionAttachments for an easy way to keep
 		// track of the Box2D body for each attachment.

+ 0 - 171
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/IkTest.java

@@ -1,171 +0,0 @@
-/******************************************************************************
- * Spine Runtimes Software License
- * Version 2.3
- * 
- * Copyright (c) 2013-2015, Esoteric Software
- * All rights reserved.
- * 
- * You are granted a perpetual, non-exclusive, non-sublicensable and
- * non-transferable license to use, install, execute and perform the Spine
- * Runtimes Software (the "Software") and derivative works solely for personal
- * or internal use. Without the written permission of Esoteric Software (see
- * Section 2 of the Spine Software License Agreement), you may not (a) modify,
- * translate, adapt or otherwise create derivative works, improvements of the
- * Software or develop new applications using the Software or (b) remove,
- * delete, alter or obscure any trademarks or any copyright, trademark, patent
- * or other intellectual property or proprietary rights notices on or in the
- * Software, including any copy thereof. Redistributions in binary or source
- * form must include this license and terms.
- * 
- * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL ESOTERIC SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-package com.esotericsoftware.spine;
-
-import com.badlogic.gdx.ApplicationAdapter;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.OrthographicCamera;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.math.Vector2;
-
-public class IkTest extends ApplicationAdapter {
-	OrthographicCamera camera;
-	SpriteBatch batch;
-	SkeletonRenderer renderer;
-	SkeletonRendererDebug debugRenderer;
-
-	TextureAtlas atlas;
-	Skeleton skeleton;
-	AnimationState state;
-
-	public void create () {
-		camera = new OrthographicCamera();
-		batch = new SpriteBatch();
-		renderer = new SkeletonRenderer();
-		renderer.setPremultipliedAlpha(true);
-		debugRenderer = new SkeletonRendererDebug();
-		debugRenderer.setBoundingBoxes(false);
-		debugRenderer.setRegionAttachments(false);
-
-		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy.atlas"));
-		SkeletonJson json = new SkeletonJson(atlas); // This loads skeleton JSON data, which is stateless.
-		json.setScale(0.6f); // Load the skeleton at 60% the size it was in Spine.
-		SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("spineboy/spineboy.json"));
-
-		skeleton = new Skeleton(skeletonData); // Skeleton holds skeleton state (bone positions, slot attachments, etc).
-		skeleton.setPosition(250, 20);
-
-		AnimationStateData stateData = new AnimationStateData(skeletonData); // Defines mixing (crossfading) between animations.
-		stateData.setMix("run", "jump", 0.2f);
-		stateData.setMix("jump", "run", 0.2f);
-
-		state = new AnimationState(stateData); // Holds the animation state for a skeleton (current animation, time, etc).
-		state.setTimeScale(0.5f); // Slow all animations down to 50% speed.
-		state.setAnimation(0, "run", true);
-		state.addAnimation(0, "jump", false, 2); // Jump after 2 seconds.
-		state.addAnimation(0, "run", true, 0); // Run after the jump.
-
-		// skeleton.findBone("front_foot").parent = skeleton.findBone("hip");
-
-		IkConstraintData data;
-
-		data = new IkConstraintData("head");
-		data.getBones().add(skeletonData.findBone("torso"));
-		data.getBones().add(skeletonData.findBone("head"));
-		data.target = skeletonData.findBone("front_foot");
-		data.setBendDirection(-1);
-		skeleton.getIkConstraints().add(new IkConstraint(data, skeleton));
-
-// data = new IkConstraintData("arm");
-// data.getBones().add(skeletonData.findBone("front_upper_arm"));
-// data.getBones().add(skeletonData.findBone("front_bracer"));
-// data.setTarget(skeletonData.findBone("front_foot"));
-// skeleton.getIkConstraints().add(new IkConstraint(data, skeleton));
-//
-// data = new IkConstraintData("leg");
-// data.getBones().add(skeletonData.findBone("front_thigh"));
-// data.getBones().add(skeletonData.findBone("front_shin"));
-// data.target = skeletonData.findBone("front_foot");
-// data.setBendDirection(-1);
-// skeleton.getIkConstraints().add(new IkConstraint(data, skeleton));
-// //skeleton.getIkConstraints().peek().setMix(0.5f);
-
-		skeleton.updateCache();
-		skeleton.updateWorldTransform();
-	}
-
-	public void render () {
-		state.update(Gdx.graphics.getDeltaTime()); // Update the animation time.
-
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		// state.apply(skeleton); // Poses skeleton using current animations. This sets the bones' local SRT.
-
-// skeleton.findBone("front_shin").y = 40;
-// skeleton.findBone("front_shin").scaleX = 2;
-// skeleton.findBone("front_thigh").scaleX = 2;
-// skeleton.findBone("front_bracer").y = 40;
-// skeleton.findBone("front_bracer").scaleX = 2;
-// skeleton.findBone("front_upper_arm").scaleX = 2;
-// skeleton.getRootBone().setScale(1.3f, 0.6f);
-
-		// skeleton.findBone("front_upper_arm").parent = skeleton.findBone("front_shin");
-// skeleton.findBone("head").scaleX = 2;
-// skeleton.findBone("head").x = 100;
-// skeleton.findBone("head").y = 100;
-// skeleton.findBone("head").rotation = 0;
-// skeleton.findBone("neck").x = 100;
-// skeleton.findBone("neck").y = 100;
-// skeleton.findBone("neck").rotation = 45;
-
-		skeleton.setPosition(250, 20);
-// skeleton.setFlip(false, false);
-		skeleton.setPosition(250, 20);
-// skeleton.setFlipX(true);
-// skeleton.setFlipY(false);
-
-// skeleton.findBone("torso").setFlipX(true);
-// skeleton.findBone("torso").setFlipY(true);
-
-		Vector2 p = skeleton.findBone("front_foot").parent.worldToLocal(new Vector2(Gdx.input.getX() - skeleton.getX(),
-			Gdx.graphics.getHeight() - Gdx.input.getY() - skeleton.getY()));
-		skeleton.findBone("front_foot").setPosition(p.x, p.y);
-
-		skeleton.updateWorldTransform(); // Uses the bones' local SRT to compute their world SRT.
-
-		// Configure the camera, SpriteBatch, and SkeletonRendererDebug.
-		camera.update();
-		batch.getProjectionMatrix().set(camera.combined);
-		debugRenderer.getShapeRenderer().setProjectionMatrix(camera.combined);
-
-		batch.begin();
-		renderer.draw(batch, skeleton); // Draw the skeleton images.
-		batch.end();
-
-		debugRenderer.draw(skeleton); // Draw debug lines.
-	}
-
-	public void resize (int width, int height) {
-		camera.setToOrtho(false); // Update camera with new size.
-	}
-
-	public void dispose () {
-		atlas.dispose();
-	}
-
-	public static void main (String[] args) throws Exception {
-		new LwjglApplication(new IkTest());
-	}
-}

+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/MixTest.java

@@ -60,7 +60,7 @@ public class MixTest extends ApplicationAdapter {
 
 		final String name = "spineboy/spineboy";
 
-		TextureAtlas atlas = new TextureAtlas(Gdx.files.internal(name + ".atlas"));
+		TextureAtlas atlas = new TextureAtlas(Gdx.files.internal(name + "-pma.atlas"));
 
 		if (true) {
 			SkeletonJson json = new SkeletonJson(atlas);

+ 6 - 3
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java

@@ -37,6 +37,7 @@ import com.badlogic.gdx.InputAdapter;
 import com.badlogic.gdx.InputMultiplexer;
 import com.badlogic.gdx.Preferences;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
+import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -89,10 +90,12 @@ public class NormalMapTest extends ApplicationAdapter {
 		batch.setShader(program);
 		renderer = new SkeletonRenderer();
 
-		TextureAtlas atlas = new TextureAtlas(Gdx.files.internal(skeletonPath + "-diffuse.atlas"));
+		FileHandle file = Gdx.files.internal(skeletonPath + "-diffuse.atlas");
+		TextureAtlas atlas = new TextureAtlas(file);
 		atlasTexture = atlas.getRegions().first().getTexture();
-		normalMapTexture = new Texture(Gdx.files.internal(skeletonPath + "-normal.png"));
 
+		normalMapTexture = new Texture(Gdx.files.internal(skeletonPath + "-normal.png"));
+	
 		SkeletonJson json = new SkeletonJson(atlas);
 		skeletonData = json.readSkeletonData(Gdx.files.internal(skeletonPath + ".json"));
 		if (animationName != null) animation = skeletonData.findAnimation(animationName);
@@ -373,7 +376,7 @@ public class NormalMapTest extends ApplicationAdapter {
 
 	public static void main (String[] args) throws Exception {
 		if (args.length == 0)
-			args = new String[] {"spineboy/spineboy-old", "walk"};
+			args = new String[] {"spineboy-old/spineboy-old", "walk"};
 		else if (args.length == 1) //
 			args = new String[] {args[0], null};
 

+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest1.java

@@ -58,7 +58,7 @@ public class SimpleTest1 extends ApplicationAdapter {
 		debugRenderer.setBoundingBoxes(false);
 		debugRenderer.setRegionAttachments(false);
 
-		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy.atlas"));
+		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy-pma.atlas"));
 		SkeletonJson json = new SkeletonJson(atlas); // This loads skeleton JSON data, which is stateless.
 		json.setScale(0.6f); // Load the skeleton at 60% the size it was in Spine.
 		SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("spineboy/spineboy.json"));

+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest2.java

@@ -63,7 +63,7 @@ public class SimpleTest2 extends ApplicationAdapter {
 		renderer.setPremultipliedAlpha(true);
 		debugRenderer = new SkeletonRendererDebug();
 
-		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy.atlas"));
+		atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy-pma.atlas"));
 		SkeletonJson json = new SkeletonJson(atlas); // This loads skeleton JSON data, which is stateless.
 		json.setScale(0.6f); // Load the skeleton at 60% the size it was in Spine.
 		SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("spineboy/spineboy.json"));

+ 1 - 1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SimpleTest3.java

@@ -59,7 +59,7 @@ public class SimpleTest3 extends ApplicationAdapter {
 		debugRenderer.setRegionAttachments(false);
 		debugRenderer.setMeshHull(false);
 
-		atlas = new TextureAtlas(Gdx.files.internal("raptor/raptor.atlas"));
+		atlas = new TextureAtlas(Gdx.files.internal("raptor/raptor-pma.atlas"));
 		SkeletonJson json = new SkeletonJson(atlas); // This loads skeleton JSON data, which is stateless.
 		json.setScale(0.5f); // Load the skeleton at 50% the size it was in Spine.
 		SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("raptor/raptor.json"));

+ 2 - 2
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/SkeletonAttachmentTest.java

@@ -55,7 +55,7 @@ public class SkeletonAttachmentTest extends ApplicationAdapter {
 		renderer.setPremultipliedAlpha(true);
 
 		{
-			TextureAtlas atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy.atlas"));
+			TextureAtlas atlas = new TextureAtlas(Gdx.files.internal("spineboy/spineboy-pma.atlas"));
 			SkeletonJson json = new SkeletonJson(atlas);
 			json.setScale(0.6f);
 			SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("spineboy/spineboy.json"));
@@ -70,7 +70,7 @@ public class SkeletonAttachmentTest extends ApplicationAdapter {
 		}
 
 		{
-			TextureAtlas atlas = new TextureAtlas(Gdx.files.internal("goblins/goblins-mesh.atlas"));
+			TextureAtlas atlas = new TextureAtlas(Gdx.files.internal("goblins/goblins-pma.atlas"));
 			SkeletonJson json = new SkeletonJson(atlas);
 			SkeletonData skeletonData = json.readSkeletonData(Gdx.files.internal("goblins/goblins-mesh.json"));
 			goblin = new Skeleton(skeletonData);

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff