Browse Source

Ran: examples/export/runtimes.sh

Nathan Sweet 2 months ago
parent
commit
f4f1ea1fd9
100 changed files with 4674 additions and 3986 deletions
  1. BIN
      spine-android/app/src/main/assets/celestial-circus-pro.skel
  2. BIN
      spine-android/app/src/main/assets/dragon-ess.skel
  3. BIN
      spine-android/app/src/main/assets/mix-and-match-pro.skel
  4. 23 23
      spine-android/app/src/main/assets/spineboy-pro.json
  5. BIN
      spine-android/app/src/main/assets/spineboy-pro.skel
  6. BIN
      spine-cocos2dx/example/Resources/common/celestial-circus-pro.skel
  7. 82 98
      spine-cocos2dx/example/Resources/common/celestial-circus.atlas
  8. BIN
      spine-cocos2dx/example/Resources/common/celestial-circus.png
  9. BIN
      spine-cocos2dx/example/Resources/common/coin-pro.skel
  10. 9 8
      spine-cocos2dx/example/Resources/common/coin.atlas
  11. BIN
      spine-cocos2dx/example/Resources/common/coin.png
  12. BIN
      spine-cocos2dx/example/Resources/common/dragon-ess.skel
  13. 55 58
      spine-cocos2dx/example/Resources/common/dragon-pma.atlas
  14. BIN
      spine-cocos2dx/example/Resources/common/dragon-pma.png
  15. BIN
      spine-cocos2dx/example/Resources/common/dragon-pma_2.png
  16. BIN
      spine-cocos2dx/example/Resources/common/dragon-pma_3.png
  17. BIN
      spine-cocos2dx/example/Resources/common/dragon-pma_4.png
  18. BIN
      spine-cocos2dx/example/Resources/common/dragon-pma_5.png
  19. 3 3
      spine-cocos2dx/example/Resources/common/goblins-pro.json
  20. 55 51
      spine-cocos2dx/example/Resources/common/goblins.atlas
  21. BIN
      spine-cocos2dx/example/Resources/common/goblins.png
  22. BIN
      spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel
  23. 184 192
      spine-cocos2dx/example/Resources/common/mix-and-match.atlas
  24. BIN
      spine-cocos2dx/example/Resources/common/mix-and-match.png
  25. 41 40
      spine-cocos2dx/example/Resources/common/raptor-pro.json
  26. 46 51
      spine-cocos2dx/example/Resources/common/raptor.atlas
  27. BIN
      spine-cocos2dx/example/Resources/common/raptor.png
  28. 184 109
      spine-cocos2dx/example/Resources/common/spineboy-pro.json
  29. 48 44
      spine-cocos2dx/example/Resources/common/spineboy.atlas
  30. BIN
      spine-cocos2dx/example/Resources/common/spineboy.png
  31. BIN
      spine-cocos2dx/example/Resources/common/tank-pro.skel
  32. 25 33
      spine-cocos2dx/example/Resources/common/tank.atlas
  33. BIN
      spine-cocos2dx/example/Resources/common/tank.png
  34. BIN
      spine-flutter/example/assets/celestial-circus-pro.skel
  35. 82 98
      spine-flutter/example/assets/celestial-circus.atlas
  36. BIN
      spine-flutter/example/assets/celestial-circus.png
  37. BIN
      spine-flutter/example/assets/dragon-ess.skel
  38. 55 58
      spine-flutter/example/assets/dragon.atlas
  39. BIN
      spine-flutter/example/assets/dragon.png
  40. BIN
      spine-flutter/example/assets/dragon_2.png
  41. BIN
      spine-flutter/example/assets/dragon_3.png
  42. BIN
      spine-flutter/example/assets/dragon_4.png
  43. BIN
      spine-flutter/example/assets/dragon_5.png
  44. BIN
      spine-flutter/example/assets/mix-and-match-pro.skel
  45. 184 192
      spine-flutter/example/assets/mix-and-match.atlas
  46. BIN
      spine-flutter/example/assets/mix-and-match.png
  47. 184 109
      spine-flutter/example/assets/spineboy-pro.json
  48. BIN
      spine-flutter/example/assets/spineboy-pro.skel
  49. 48 44
      spine-flutter/example/assets/spineboy.atlas
  50. BIN
      spine-flutter/example/assets/spineboy.png
  51. 48 44
      spine-glfw/data/spineboy-pma.atlas
  52. BIN
      spine-glfw/data/spineboy-pma.png
  53. 184 109
      spine-glfw/data/spineboy-pro.json
  54. BIN
      spine-glfw/data/spineboy-pro.skel
  55. 82 98
      spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.atlas
  56. BIN
      spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.png
  57. BIN
      spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.skel
  58. 380 202
      spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match-pro.spine-json
  59. 184 192
      spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match.atlas
  60. BIN
      spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match.png
  61. BIN
      spine-godot/example-v4-csharp/assets/raptor/raptor-pro.skel
  62. 47 58
      spine-godot/example-v4-csharp/assets/raptor/raptor.atlas
  63. BIN
      spine-godot/example-v4-csharp/assets/raptor/raptor.png
  64. BIN
      spine-godot/example-v4-csharp/assets/spineboy/spineboy-pro.skel
  65. 184 109
      spine-godot/example-v4-csharp/assets/spineboy/spineboy-pro.spine-json
  66. 48 44
      spine-godot/example-v4-csharp/assets/spineboy/spineboy.atlas
  67. BIN
      spine-godot/example-v4-csharp/assets/spineboy/spineboy.png
  68. 82 98
      spine-godot/example-v4/assets/celestial-circus/celestial-circus.atlas
  69. BIN
      spine-godot/example-v4/assets/celestial-circus/celestial-circus.png
  70. BIN
      spine-godot/example-v4/assets/celestial-circus/celestial-circus.skel
  71. 380 202
      spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json
  72. 184 192
      spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas
  73. BIN
      spine-godot/example-v4/assets/mix-and-match/mix-and-match.png
  74. BIN
      spine-godot/example-v4/assets/raptor/raptor-pro.skel
  75. 47 58
      spine-godot/example-v4/assets/raptor/raptor.atlas
  76. BIN
      spine-godot/example-v4/assets/raptor/raptor.png
  77. BIN
      spine-godot/example-v4/assets/spineboy/spineboy-pro.skel
  78. 184 109
      spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json
  79. 48 44
      spine-godot/example-v4/assets/spineboy/spineboy.atlas
  80. BIN
      spine-godot/example-v4/assets/spineboy/spineboy.png
  81. 82 98
      spine-godot/example/assets/celestial-circus/celestial-circus.atlas
  82. BIN
      spine-godot/example/assets/celestial-circus/celestial-circus.png
  83. BIN
      spine-godot/example/assets/celestial-circus/celestial-circus.skel
  84. 380 202
      spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json
  85. 184 192
      spine-godot/example/assets/mix-and-match/mix-and-match.atlas
  86. BIN
      spine-godot/example/assets/mix-and-match/mix-and-match.png
  87. BIN
      spine-godot/example/assets/raptor/raptor-pro.skel
  88. 47 58
      spine-godot/example/assets/raptor/raptor.atlas
  89. BIN
      spine-godot/example/assets/raptor/raptor.png
  90. BIN
      spine-godot/example/assets/spineboy/spineboy-pro.skel
  91. 184 109
      spine-godot/example/assets/spineboy/spineboy-pro.spine-json
  92. 48 44
      spine-godot/example/assets/spineboy/spineboy.atlas
  93. BIN
      spine-godot/example/assets/spineboy/spineboy.png
  94. 82 98
      spine-haxe/example/assets/celestial-circus-pma.atlas
  95. BIN
      spine-haxe/example/assets/celestial-circus-pma.png
  96. 157 277
      spine-haxe/example/assets/celestial-circus-pro.json
  97. BIN
      spine-haxe/example/assets/celestial-circus-pro.skel
  98. 82 98
      spine-haxe/example/assets/celestial-circus.atlas
  99. BIN
      spine-haxe/example/assets/celestial-circus.png
  100. 38 40
      spine-haxe/example/assets/cloud-pot.atlas

BIN
spine-android/app/src/main/assets/celestial-circus-pro.skel


BIN
spine-android/app/src/main/assets/dragon-ess.skel


BIN
spine-android/app/src/main/assets/mix-and-match-pro.skel


+ 23 - 23
spine-android/app/src/main/assets/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "0JYVQzyBfX0",
-	"spine": "4.3.29-beta",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -322,8 +322,8 @@
 	{
 		"type": "transform",
 		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
 		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
 		"x": 40.17,
 		"y": -1.66,
 		"properties": {
@@ -343,14 +343,14 @@
 	{
 		"type": "ik",
 		"name": "board-ik",
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
 		"type": "transform",
 		"name": "front-foot-board-transform",
-		"bones": [ "front-foot-target" ],
 		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
 		"x": -69.8,
 		"y": 20.7,
 		"properties": {
@@ -393,8 +393,8 @@
 	{
 		"type": "transform",
 		"name": "rear-foot-board-transform",
-		"bones": [ "rear-foot-target" ],
 		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
 		"x": 86.6,
 		"y": 21.3,
 		"properties": {
@@ -437,40 +437,40 @@
 	{
 		"type": "ik",
 		"name": "front-leg-ik",
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
 		"type": "ik",
 		"name": "rear-leg-ik",
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
 	},
 	{
 		"type": "ik",
 		"name": "front-foot-ik",
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
 		"type": "ik",
 		"name": "rear-foot-ik",
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
 		"type": "ik",
 		"name": "aim-torso-ik",
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
 		"type": "transform",
 		"name": "aim-torso-transform",
-		"bones": [ "torso" ],
 		"source": "aim-constraint-target",
+		"bones": [ "torso" ],
 		"rotation": 69.5,
 		"properties": {
 			"rotate": {
@@ -484,8 +484,8 @@
 	{
 		"type": "transform",
 		"name": "aim-head-transform",
-		"bones": [ "head" ],
 		"source": "aim-constraint-target",
+		"bones": [ "head" ],
 		"rotation": 84.3,
 		"properties": {
 			"rotate": {
@@ -499,8 +499,8 @@
 	{
 		"type": "transform",
 		"name": "aim-front-arm-transform",
-		"bones": [ "front-upper-arm" ],
 		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
 		"rotation": -180,
 		"properties": {
 			"rotate": {
@@ -514,15 +514,15 @@
 	{
 		"type": "ik",
 		"name": "aim-ik",
-		"bones": [ "rear-upper-arm" ],
 		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
 		"mix": 0
 	},
 	{
 		"type": "transform",
 		"name": "toes-board",
-		"bones": [ "front-foot-tip", "back-foot-tip" ],
 		"source": "hoverboard-controller",
+		"bones": [ "front-foot-tip", "back-foot-tip" ],
 		"properties": {
 			"rotate": {
 				"to": {
@@ -3561,13 +3561,13 @@
 		},
 		"transform": {
 			"front-foot-board-transform": [
-				{ "mixRotate": 0.997, "mixX": 1, "mixScaleX": 1, "mixShearY": 1 }
+				{ "mixRotate": 0.997 }
 			],
 			"rear-foot-board-transform": [
-				{ "mixRotate": 1, "mixX": 1, "mixScaleX": 1, "mixShearY": 1 }
+				{}
 			],
 			"toes-board": [
-				{ "mixRotate": 1 }
+				{}
 			]
 		},
 		"attachments": {

BIN
spine-android/app/src/main/assets/spineboy-pro.skel


BIN
spine-cocos2dx/example/Resources/common/celestial-circus-pro.skel


+ 82 - 98
spine-cocos2dx/example/Resources/common/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-cocos2dx/example/Resources/common/celestial-circus.png


BIN
spine-cocos2dx/example/Resources/common/coin-pro.skel


+ 9 - 8
spine-cocos2dx/example/Resources/common/coin.atlas

@@ -2,17 +2,18 @@ coin.png
 	size: 1024, 1024
 	filter: Linear, Linear
 coin-front-logo
-	bounds: 2, 609, 305, 302
+	bounds: 328, 266, 305, 302
 coin-front-shine-logo
-	bounds: 309, 629, 282, 282
+	bounds: 635, 2, 282, 282
 coin-front-shine-spineboy
-	bounds: 2, 21, 282, 282
+	bounds: 635, 286, 282, 282
 coin-front-spineboy
-	bounds: 2, 305, 305, 302
+	bounds: 21, 266, 305, 302
 coin-side-round
-	bounds: 309, 345, 144, 282
-coin-side-straight
-	bounds: 2, 2, 17, 282
+	bounds: 2, 120, 144, 282
 	rotate: 90
+coin-side-straight
+	bounds: 2, 286, 17, 282
 shine
-	bounds: 593, 666, 72, 245
+	bounds: 286, 192, 72, 245
+	rotate: 90

BIN
spine-cocos2dx/example/Resources/common/coin.png


BIN
spine-cocos2dx/example/Resources/common/dragon-ess.skel


+ 55 - 58
spine-cocos2dx/example/Resources/common/dragon-pma.atlas

@@ -3,115 +3,112 @@ dragon-pma.png
 	filter: Linear, Linear
 	pma: true
 front-toe-a
-	bounds: 797, 381, 29, 50
+	bounds: 300, 929, 29, 50
 front-toe-b
-	bounds: 942, 118, 56, 57
+	bounds: 258, 660, 56, 57
 head
-	bounds: 647, 81, 296, 260
-	rotate: 90
+	bounds: 2, 719, 296, 260
 left-front-leg
-	bounds: 942, 250, 84, 57
+	bounds: 99, 660, 84, 57
+left-wing09
+	bounds: 2, 15, 264, 589
 	rotate: 90
-left-front-thigh
-	bounds: 852, 7, 84, 72
-left-wing01
-	bounds: 736, 433, 264, 589
-right-rear-toe
-	bounds: 647, 2, 109, 77
-right-wing01
-	bounds: 2, 379, 365, 643
-right-wing02
-	bounds: 369, 379, 365, 643
-right-wing03
-	bounds: 2, 12, 365, 643
+right-wing07
+	bounds: 647, 2, 365, 643
+right-wing08
+	bounds: 2, 281, 365, 643
 	rotate: 90
-tail03
-	bounds: 758, 6, 73, 92
+right-wing09
+	bounds: 354, 647, 365, 643
 	rotate: 90
 tail04
-	bounds: 942, 177, 56, 71
-tail05
-	bounds: 736, 379, 52, 59
+	bounds: 185, 661, 56, 71
 	rotate: 90
 tail06
-	bounds: 942, 336, 95, 68
-	rotate: 90
+	bounds: 2, 649, 95, 68
 thiagobrayner
-	bounds: 909, 81, 350, 31
-	rotate: 90
+	bounds: 2, 981, 350, 31
 
 dragon-pma_2.png
 	size: 1024, 1024
 	filter: Linear, Linear
 	pma: true
 back
-	bounds: 795, 32, 190, 185
+	bounds: 647, 57, 190, 185
 chin
-	bounds: 647, 157, 214, 146
+	bounds: 839, 28, 214, 146
 	rotate: 90
 left-rear-leg
-	bounds: 795, 219, 206, 177
+	bounds: 736, 244, 206, 177
+left-wing08
+	bounds: 736, 423, 264, 589
+right-rear-toe
+	bounds: 944, 312, 109, 77
 	rotate: 90
-left-wing02
-	bounds: 736, 427, 264, 589
 right-wing04
-	bounds: 2, 373, 365, 643
+	bounds: 2, 2, 365, 643
+	rotate: 90
 right-wing05
-	bounds: 369, 373, 365, 643
+	bounds: 369, 369, 365, 643
 right-wing06
-	bounds: 2, 6, 365, 643
-	rotate: 90
-tail01
-	bounds: 647, 2, 120, 153
+	bounds: 2, 369, 365, 643
+tail03
+	bounds: 647, 275, 73, 92
+tail05
+	bounds: 944, 251, 52, 59
 
 dragon-pma_3.png
 	size: 1024, 1024
 	filter: Linear, Linear
 	pma: true
 chest
-	bounds: 740, 299, 136, 122
+	bounds: 858, 299, 136, 122
+left-front-thigh
+	bounds: 647, 295, 84, 72
 left-rear-thigh
-	bounds: 647, 218, 91, 149
-left-wing03
+	bounds: 647, 117, 91, 149
+left-wing07
 	bounds: 736, 423, 264, 589
 right-front-leg
-	bounds: 850, 196, 101, 89
+	bounds: 647, 14, 101, 89
 	rotate: 90
 right-front-thigh
-	bounds: 740, 189, 108, 108
+	bounds: 740, 158, 108, 108
 right-rear-leg
-	bounds: 878, 321, 116, 100
+	bounds: 740, 46, 116, 100
 right-rear-thigh
-	bounds: 647, 67, 91, 149
-right-wing07
-	bounds: 2, 369, 365, 643
-right-wing08
-	bounds: 369, 369, 365, 643
-right-wing09
+	bounds: 858, 148, 91, 149
+right-wing01
 	bounds: 2, 2, 365, 643
 	rotate: 90
+right-wing02
+	bounds: 369, 369, 365, 643
+right-wing03
+	bounds: 2, 369, 365, 643
+tail01
+	bounds: 736, 268, 120, 153
 tail02
-	bounds: 740, 67, 95, 120
+	bounds: 858, 26, 95, 120
 
 dragon-pma_4.png
 	size: 1024, 1024
 	filter: Linear, Linear
 	pma: true
+left-wing03
+	bounds: 2, 2, 264, 589
+	rotate: 90
 left-wing04
-	bounds: 2, 268, 264, 589
+	bounds: 534, 268, 264, 589
 left-wing05
 	bounds: 268, 268, 264, 589
 left-wing06
-	bounds: 534, 268, 264, 589
-left-wing07
-	bounds: 2, 2, 264, 589
-	rotate: 90
+	bounds: 2, 268, 264, 589
 
 dragon-pma_5.png
 	size: 1024, 1024
 	filter: Linear, Linear
 	pma: true
-left-wing08
-	bounds: 2, 2, 264, 589
-left-wing09
+left-wing01
 	bounds: 268, 2, 264, 589
+left-wing02
+	bounds: 2, 2, 264, 589

BIN
spine-cocos2dx/example/Resources/common/dragon-pma.png


BIN
spine-cocos2dx/example/Resources/common/dragon-pma_2.png


BIN
spine-cocos2dx/example/Resources/common/dragon-pma_3.png


BIN
spine-cocos2dx/example/Resources/common/dragon-pma_4.png


BIN
spine-cocos2dx/example/Resources/common/dragon-pma_5.png


+ 3 - 3
spine-cocos2dx/example/Resources/common/goblins-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "r8iwnU9Tvmc",
-	"spine": "4.2.22",
+	"hash": "tXP7zQbe/CY",
+	"spine": "4.3.37-beta",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,
@@ -210,7 +210,7 @@
 				"spear": {
 					"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.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-					"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 ],
+					"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.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 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 ],

+ 55 - 51
spine-cocos2dx/example/Resources/common/goblins.atlas

@@ -2,100 +2,104 @@ goblins.png
 	size: 1024, 128
 	filter: Linear, Linear
 dagger
-	bounds: 372, 100, 26, 108
+	bounds: 372, 99, 26, 108
 	rotate: 90
 goblin/eyes-closed
-	bounds: 2, 7, 34, 12
+	bounds: 291, 13, 34, 12
 goblin/head
-	bounds: 107, 36, 103, 66
+	bounds: 2, 35, 103, 66
 goblin/left-arm
-	bounds: 901, 56, 37, 35
+	bounds: 900, 23, 37, 35
 goblin/left-foot
-	bounds: 929, 95, 65, 31
+	bounds: 957, 60, 65, 31
+	rotate: 90
 goblin/left-hand
-	bounds: 452, 2, 36, 41
-goblin/left-lower-leg
-	bounds: 713, 93, 33, 70
+	bounds: 498, 6, 36, 41
 	rotate: 90
+goblin/left-lower-leg
+	bounds: 747, 55, 33, 70
 goblin/left-shoulder
-	bounds: 610, 44, 29, 44
+	bounds: 54, 4, 29, 44
+	rotate: 90
 goblin/left-upper-leg
-	bounds: 638, 93, 33, 73
+	bounds: 587, 28, 33, 73
 	rotate: 90
 goblin/neck
-	bounds: 490, 2, 36, 41
+	bounds: 455, 6, 36, 41
+	rotate: 90
 goblin/pelvis
-	bounds: 482, 45, 62, 43
-goblin/right-arm
-	bounds: 690, 2, 23, 50
+	bounds: 632, 63, 62, 43
 	rotate: 90
+goblin/right-arm
+	bounds: 455, 47, 23, 50
 goblin/right-foot
-	bounds: 771, 58, 63, 33
+	bounds: 889, 62, 63, 33
+	rotate: 90
 goblin/right-hand
-	bounds: 940, 56, 36, 37
+	bounds: 823, 23, 36, 37
 goblin/right-lower-leg
-	bounds: 482, 90, 36, 76
+	bounds: 377, 23, 36, 76
 	rotate: 90
 goblin/right-shoulder
-	bounds: 602, 3, 39, 45
-	rotate: 90
+	bounds: 662, 8, 39, 45
 goblin/right-upper-leg
-	bounds: 641, 57, 34, 63
-	rotate: 90
+	bounds: 818, 62, 34, 63
 goblin/torso
-	bounds: 212, 34, 68, 96
+	bounds: 205, 33, 68, 96
 	rotate: 90
 goblin/undie-straps
-	bounds: 380, 5, 55, 19
+	bounds: 157, 12, 55, 19
 goblin/undies
-	bounds: 174, 5, 36, 29
+	bounds: 214, 2, 36, 29
 goblingirl/eyes-closed
-	bounds: 269, 11, 37, 21
+	bounds: 252, 10, 37, 21
 goblingirl/head
-	bounds: 2, 21, 103, 81
+	bounds: 482, 44, 103, 81
 goblingirl/left-arm
-	bounds: 978, 56, 37, 35
-	rotate: 90
+	bounds: 861, 25, 37, 35
 goblingirl/left-foot
-	bounds: 107, 3, 65, 31
+	bounds: 924, 60, 65, 31
+	rotate: 90
 goblingirl/left-hand
-	bounds: 565, 2, 35, 40
+	bounds: 703, 13, 35, 40
 goblingirl/left-lower-leg
-	bounds: 785, 93, 33, 70
-	rotate: 90
+	bounds: 712, 55, 33, 70
 goblingirl/left-shoulder
-	bounds: 690, 27, 28, 46
-	rotate: 90
+	bounds: 939, 12, 28, 46
 goblingirl/left-upper-leg
-	bounds: 857, 93, 33, 70
-	rotate: 90
+	bounds: 677, 55, 33, 70
 goblingirl/neck
-	bounds: 528, 2, 35, 41
+	bounds: 541, 7, 35, 41
+	rotate: 90
 goblingirl/pelvis
-	bounds: 546, 45, 62, 43
+	bounds: 587, 63, 62, 43
+	rotate: 90
 goblingirl/right-arm
-	bounds: 452, 48, 28, 50
+	bounds: 2, 5, 28, 50
+	rotate: 90
 goblingirl/right-foot
-	bounds: 836, 58, 63, 33
-goblingirl/right-hand
-	bounds: 771, 20, 36, 37
+	bounds: 854, 62, 63, 33
 	rotate: 90
+goblingirl/right-hand
+	bounds: 740, 16, 36, 37
 goblingirl/right-lower-leg
-	bounds: 560, 90, 36, 76
+	bounds: 377, 61, 36, 76
 	rotate: 90
 goblingirl/right-shoulder
-	bounds: 649, 10, 39, 45
+	bounds: 782, 15, 39, 45
 goblingirl/right-upper-leg
-	bounds: 706, 57, 34, 63
-	rotate: 90
+	bounds: 782, 62, 34, 63
 goblingirl/torso
-	bounds: 310, 2, 68, 96
+	bounds: 107, 33, 68, 96
+	rotate: 90
 goblingirl/undie-straps
-	bounds: 212, 13, 55, 19
+	bounds: 100, 12, 55, 19
 goblingirl/undies
-	bounds: 810, 27, 36, 29
+	bounds: 969, 22, 36, 29
+	rotate: 90
 shield
-	bounds: 380, 26, 70, 72
+	bounds: 303, 27, 70, 72
+	rotate: 90
 spear
-	bounds: 2, 104, 22, 368
+	bounds: 2, 103, 22, 368
 	rotate: 90

BIN
spine-cocos2dx/example/Resources/common/goblins.png


BIN
spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel


+ 184 - 192
spine-cocos2dx/example/Resources/common/mix-and-match.atlas

@@ -3,356 +3,348 @@ mix-and-match.png
 	filter: Linear, Linear
 	scale: 0.5
 base-head
-	bounds: 118, 70, 95, 73
+	bounds: 185, 123, 95, 73
 boy/arm-front
-	bounds: 831, 311, 36, 115
+	bounds: 729, 92, 36, 115
 	rotate: 90
 boy/backpack
-	bounds: 249, 357, 119, 153
+	bounds: 619, 218, 119, 153
 boy/backpack-pocket
-	bounds: 628, 193, 34, 62
+	bounds: 626, 4, 34, 62
 	rotate: 90
 boy/backpack-strap-front
-	bounds: 330, 263, 38, 88
-	rotate: 90
+	bounds: 342, 26, 38, 88
+	rotate: 270
 boy/backpack-up
-	bounds: 482, 171, 21, 70
-boy/body
-	bounds: 845, 413, 97, 132
+	bounds: 750, 12, 21, 70
 	rotate: 90
+boy/body
+	bounds: 716, 125, 97, 132
+	rotate: 270
 boy/boot-ribbon-front
-	bounds: 234, 304, 9, 11
+	bounds: 1012, 360, 9, 11
 boy/collar
-	bounds: 471, 243, 73, 29
-	rotate: 90
+	bounds: 764, 34, 73, 29
 boy/ear
-	bounds: 991, 352, 19, 23
-	rotate: 90
+	bounds: 878, 128, 19, 23
 boy/eye-back-low-eyelid
-	bounds: 66, 72, 17, 6
+	bounds: 467, 245, 17, 6
 boy/eye-back-pupil
-	bounds: 694, 279, 8, 9
-	rotate: 90
+	bounds: 1012, 327, 8, 9
 boy/eye-back-up-eyelid
-	bounds: 460, 101, 23, 5
+	bounds: 180, 348, 23, 5
 	rotate: 90
 boy/eye-back-up-eyelid-back
-	bounds: 979, 414, 19, 10
-	rotate: 90
+	bounds: 282, 255, 19, 10
 boy/eye-front-low-eyelid
-	bounds: 1015, 203, 22, 7
-	rotate: 90
+	bounds: 366, 364, 22, 7
 boy/eye-front-pupil
-	bounds: 309, 50, 9, 9
+	bounds: 1012, 349, 9, 9
 boy/eye-front-up-eyelid
-	bounds: 991, 373, 31, 6
+	bounds: 155, 340, 31, 6
+	rotate: 270
 boy/eye-front-up-eyelid-back
-	bounds: 107, 76, 26, 9
-	rotate: 90
+	bounds: 338, 362, 26, 9
 boy/eye-iris-back
-	bounds: 810, 260, 17, 17
+	bounds: 562, 12, 17, 17
 boy/eye-iris-front
-	bounds: 902, 230, 18, 18
+	bounds: 807, 73, 18, 18
 boy/eye-white-back
-	bounds: 599, 179, 20, 12
+	bounds: 317, 359, 20, 12
 boy/eye-white-front
-	bounds: 544, 183, 27, 13
+	bounds: 499, 358, 27, 13
 boy/eyebrow-back
-	bounds: 1002, 225, 20, 11
-	rotate: 90
+	bounds: 194, 360, 20, 11
 boy/eyebrow-front
-	bounds: 975, 234, 25, 11
+	bounds: 290, 360, 25, 11
 boy/hair-back
-	bounds: 629, 289, 122, 81
+	bounds: 929, 249, 122, 81
 	rotate: 90
 boy/hair-bangs
-	bounds: 505, 180, 70, 37
-	rotate: 90
+	bounds: 2, 2, 70, 37
 boy/hair-side
-	bounds: 979, 435, 25, 43
-	rotate: 90
+	bounds: 997, 237, 25, 43
 boy/hand-backfingers
-	bounds: 858, 183, 19, 21
+	bounds: 376, 15, 19, 21
 boy/hand-front-fingers
-	bounds: 879, 183, 19, 21
+	bounds: 786, 72, 19, 21
 boy/hat
-	bounds: 218, 121, 93, 56
+	bounds: 68, 89, 93, 56
 boy/leg-front
-	bounds: 85, 104, 31, 158
+	bounds: 90, 213, 31, 158
+	rotate: 180
 boy/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-blue-cape/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-spring-dress/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 boy/mouth-smile
-	bounds: 1015, 258, 29, 7
+	bounds: 171, 342, 29, 7
 	rotate: 90
 boy/nose
-	bounds: 323, 79, 17, 10
+	bounds: 1005, 225, 17, 10
 boy/pompom
-	bounds: 979, 462, 48, 43
-	rotate: 90
+	bounds: 157, 40, 48, 43
 boy/zip
-	bounds: 922, 231, 14, 23
-	rotate: 90
+	bounds: 883, 163, 14, 23
 girl-blue-cape/back-eyebrow
-	bounds: 527, 106, 18, 12
-	rotate: 90
+	bounds: 137, 52, 18, 12
 girl-blue-cape/body-dress
-	bounds: 2, 264, 109, 246
+	bounds: 185, 262, 109, 241
+	offsets: 0, 0, 109, 246
+	rotate: 90
 girl-blue-cape/body-ribbon
-	bounds: 576, 193, 50, 38
+	bounds: 881, 28, 50, 38
 girl-blue-cape/cape-back
-	bounds: 113, 317, 134, 193
+	bounds: 427, 237, 134, 193
+	rotate: 90
 girl-blue-cape/cape-back-up
-	bounds: 504, 305, 123, 106
+	bounds: 899, 126, 123, 106
+	rotate: 180
 girl-blue-cape/cape-ribbon
-	bounds: 396, 118, 50, 18
-	rotate: 90
+	bounds: 427, 353, 50, 18
 girl-blue-cape/cape-shoulder-back
-	bounds: 420, 243, 49, 59
+	bounds: 510, 3, 49, 59
+	rotate: 90
 girl-blue-cape/cape-shoulder-front
-	bounds: 2, 2, 62, 76
+	bounds: 310, 51, 62, 76
+	rotate: 270
 girl-blue-cape/cape-up-front
-	bounds: 118, 145, 98, 117
+	bounds: 388, 72, 98, 117
+	rotate: 90
 girl-blue-cape/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-spring-dress/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-blue-cape/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-spring-dress/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-blue-cape/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-spring-dress/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-blue-cape/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-spring-dress/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-blue-cape/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-spring-dress/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-blue-cape/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-spring-dress/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-blue-cape/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-spring-dress/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-blue-cape/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-spring-dress/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-blue-cape/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-spring-dress/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-blue-cape/eye-iris-back
-	bounds: 323, 105, 17, 17
+	bounds: 442, 34, 17, 17
 girl-blue-cape/eye-iris-front
-	bounds: 467, 107, 18, 18
+	bounds: 708, 95, 18, 18
 girl-blue-cape/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-spring-dress/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-blue-cape/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-spring-dress/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-blue-cape/front-eyebrow
-	bounds: 309, 101, 18, 12
-	rotate: 90
+	bounds: 424, 172, 18, 12
 girl-blue-cape/hair-back
-	bounds: 712, 317, 117, 98
+	bounds: 305, 162, 117, 98
 girl-blue-cape/hair-bangs
-	bounds: 313, 170, 91, 40
-	rotate: 90
+	bounds: 694, 57, 91, 40
 girl-blue-cape/hair-head-side-back
-	bounds: 544, 198, 30, 52
+	bounds: 397, 2, 30, 52
+	rotate: 90
 girl-blue-cape/hair-head-side-front
-	bounds: 466, 127, 41, 42
-girl-blue-cape/hair-side
-	bounds: 175, 2, 36, 71
+	bounds: 933, 14, 41, 42
 	rotate: 90
+girl-blue-cape/hair-side
+	bounds: 203, 11, 36, 71
+	rotate: 270
 girl-blue-cape/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-spring-dress/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-blue-cape/leg-front
-	bounds: 519, 413, 30, 158
-	rotate: 90
+	bounds: 60, 213, 30, 158
+	rotate: 180
 girl-blue-cape/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-spring-dress/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-blue-cape/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-spring-dress/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-blue-cape/sleeve-back
-	bounds: 416, 95, 42, 29
+	bounds: 157, 9, 42, 29
 girl-blue-cape/sleeve-front
-	bounds: 249, 303, 52, 119
-	rotate: 90
+	bounds: 839, 103, 52, 119
 girl-spring-dress/arm-front
-	bounds: 829, 292, 17, 111
-	rotate: 90
+	bounds: 122, 260, 17, 111
 girl-spring-dress/back-eyebrow
-	bounds: 309, 81, 18, 12
-	rotate: 90
+	bounds: 2, 199, 18, 12
 girl-spring-dress/body-up
-	bounds: 66, 2, 64, 66
+	bounds: 2, 79, 64, 66
 girl-spring-dress/cloak-down
-	bounds: 758, 227, 50, 50
+	bounds: 459, 18, 50, 50
+	rotate: 180
 girl-spring-dress/cloak-up
-	bounds: 628, 229, 64, 58
+	bounds: 247, 50, 61, 58
+	offsets: 0, 0, 64, 58
+	rotate: 270
 girl-spring-dress/eye-iris-back
-	bounds: 342, 105, 17, 17
+	bounds: 875, 109, 17, 17
 girl-spring-dress/eye-iris-front
-	bounds: 487, 107, 18, 18
+	bounds: 479, 353, 18, 18
 girl-spring-dress/front-eyebrow
-	bounds: 323, 91, 18, 12
+	bounds: 893, 210, 18, 12
 girl-spring-dress/hair-back
-	bounds: 370, 417, 147, 93
+	bounds: 834, 224, 147, 93
+	rotate: 90
 girl-spring-dress/hair-bangs
-	bounds: 829, 250, 91, 40
+	bounds: 914, 57, 91, 40
 girl-spring-dress/hair-head-side-back
-	bounds: 509, 126, 30, 52
+	bounds: 217, 341, 30, 52
+	rotate: 90
 girl-spring-dress/hair-head-side-front
-	bounds: 816, 206, 41, 42
+	bounds: 582, 15, 41, 42
+	rotate: 90
 girl-spring-dress/hair-side
-	bounds: 248, 2, 36, 71
+	bounds: 84, 14, 36, 71
 	rotate: 90
 girl-spring-dress/leg-front
-	bounds: 831, 381, 30, 158
-	rotate: 90
+	bounds: 30, 213, 30, 158
+	rotate: 180
 girl-spring-dress/neck
-	bounds: 85, 70, 20, 32
+	bounds: 283, 176, 20, 32
 girl-spring-dress/shoulder-ribbon
-	bounds: 175, 44, 36, 24
+	bounds: 207, 58, 36, 24
 girl-spring-dress/skirt
-	bounds: 2, 80, 182, 81
-	rotate: 90
+	bounds: 121, 198, 182, 81
+	rotate: 180
 girl-spring-dress/underskirt
-	bounds: 519, 445, 175, 65
+	bounds: 8, 147, 175, 65
 girl/arm-front
-	bounds: 712, 279, 36, 115
+	bounds: 907, 93, 36, 115
 	rotate: 90
 girl/back-eyebrow
-	bounds: 309, 61, 18, 12
-	rotate: 90
+	bounds: 948, 236, 18, 12
 girl/bag-base
-	bounds: 694, 219, 62, 58
+	bounds: 418, 52, 62, 58
 girl/bag-strap-front
-	bounds: 370, 304, 12, 96
-	rotate: 90
+	bounds: 141, 276, 12, 95
+	offsets: 0, 1, 12, 96
 girl/bag-top
-	bounds: 765, 175, 49, 50
+	bounds: 841, 7, 49, 50
 girl/body
-	bounds: 370, 318, 97, 132
-	rotate: 90
+	bounds: 476, 154, 97, 132
+	rotate: 270
 girl/boot-ribbon-front
-	bounds: 323, 64, 13, 13
+	bounds: 968, 235, 13, 13
 girl/eye-iris-back
-	bounds: 361, 105, 17, 17
+	bounds: 929, 231, 17, 17
 girl/eye-iris-front
-	bounds: 507, 106, 18, 18
+	bounds: 270, 353, 18, 18
 girl/eye-white-back
-	bounds: 665, 175, 20, 16
+	bounds: 162, 324, 20, 16
 girl/front-eyebrow
-	bounds: 343, 91, 18, 12
+	bounds: 527, 359, 18, 12
 girl/hair-back
-	bounds: 696, 417, 147, 93
+	bounds: 739, 224, 147, 93
+	rotate: 90
 girl/hair-bangs
-	bounds: 922, 247, 91, 40
+	bounds: 534, 57, 91, 40
 girl/hair-flap-down-front
-	bounds: 415, 171, 70, 65
-	rotate: 90
+	bounds: 506, 31, 70, 65
+	rotate: 180
 girl/hair-head-side-back
-	bounds: 991, 381, 30, 52
+	bounds: 155, 276, 30, 52
 girl/hair-head-side-front
-	bounds: 859, 206, 41, 42
+	bounds: 980, 17, 41, 42
+	rotate: 90
 girl/hair-patch
-	bounds: 132, 2, 66, 41
+	bounds: 424, 186, 66, 41
 	rotate: 90
 girl/hair-side
-	bounds: 692, 181, 36, 71
+	bounds: 265, 17, 36, 71
 	rotate: 90
 girl/hair-strand-back-1
-	bounds: 948, 289, 58, 74
+	bounds: 676, 24, 56, 74
+	offsets: 2, 0, 58, 74
 	rotate: 90
 girl/hair-strand-back-2
-	bounds: 355, 170, 91, 58
-	rotate: 90
+	bounds: 823, 54, 90, 53
+	offsets: 1, 0, 91, 58
 girl/hair-strand-back-3
-	bounds: 215, 40, 92, 79
+	bounds: 610, 138, 92, 79
 girl/hair-strand-front-1
-	bounds: 234, 263, 38, 94
+	bounds: 157, 83, 38, 94
 	rotate: 90
 girl/hair-strand-front-2
-	bounds: 576, 233, 70, 50
-	rotate: 90
+	bounds: 2, 27, 70, 50
 girl/hair-strand-front-3
-	bounds: 313, 124, 44, 81
-	rotate: 90
+	bounds: 74, 50, 44, 81
+	rotate: 270
 girl/hand-front-fingers
-	bounds: 923, 208, 19, 21
+	bounds: 162, 124, 19, 21
 girl/hat
-	bounds: 218, 179, 93, 82
+	bounds: 282, 78, 93, 82
 girl/leg-front
-	bounds: 831, 349, 30, 158
-	rotate: 90
+	bounds: 2, 213, 30, 158
 girl/pompom
-	bounds: 416, 126, 48, 43
+	bounds: 626, 40, 48, 43
 girl/scarf
-	bounds: 113, 264, 119, 51
+	bounds: 499, 98, 119, 51
 girl/scarf-back
-	bounds: 502, 252, 72, 51
+	bounds: 620, 85, 72, 51
 girl/zip
-	bounds: 816, 179, 19, 25
+	bounds: 455, 173, 19, 25

BIN
spine-cocos2dx/example/Resources/common/mix-and-match.png


File diff suppressed because it is too large
+ 41 - 40
spine-cocos2dx/example/Resources/common/raptor-pro.json


+ 46 - 51
spine-cocos2dx/example/Resources/common/raptor.atlas

@@ -3,91 +3,86 @@ raptor.png
 	filter: Linear, Linear
 	scale: 0.5
 back-arm
-	bounds: 895, 295, 46, 25
+	bounds: 130, 32, 46, 25
 back-bracer
-	bounds: 992, 216, 39, 28
-	rotate: 90
+	bounds: 215, 11, 39, 28
 back-hand
-	bounds: 594, 58, 36, 34
+	bounds: 847, 25, 36, 34
 back-knee
-	bounds: 729, 86, 49, 67
-	rotate: 90
+	bounds: 2, 8, 49, 67
 back-thigh
-	bounds: 379, 2, 39, 24
+	bounds: 327, 8, 39, 24
 eyes-open
-	bounds: 902, 194, 47, 45
-	rotate: 90
+	bounds: 232, 309, 47, 45
 front-arm
-	bounds: 945, 306, 48, 26
+	bounds: 421, 99, 48, 26
 front-bracer
-	bounds: 949, 197, 41, 29
+	bounds: 885, 30, 41, 29
 front-hand
-	bounds: 949, 266, 41, 38
+	bounds: 784, 184, 41, 38
 front-open-hand
-	bounds: 875, 148, 43, 44
+	bounds: 771, 310, 43, 44
 front-thigh
-	bounds: 793, 171, 57, 29
-	rotate: 90
+	bounds: 635, 192, 57, 29
 gun
-	bounds: 379, 28, 107, 103
-	rotate: 90
+	bounds: 636, 83, 107, 103
 gun-nohand
-	bounds: 487, 87, 105, 102
+	bounds: 174, 83, 105, 102
 head
-	bounds: 807, 361, 136, 149
+	bounds: 291, 71, 136, 149
+	rotate: 270
 lower-leg
-	bounds: 827, 195, 73, 98
+	bounds: 930, 123, 73, 98
 mouth-grind
-	bounds: 920, 145, 47, 30
-	rotate: 90
+	bounds: 798, 29, 47, 30
 mouth-smile
-	bounds: 992, 257, 47, 30
-	rotate: 90
+	bounds: 749, 29, 47, 30
 neck
-	bounds: 359, 114, 18, 21
+	bounds: 281, 333, 18, 21
 raptor-back-arm
-	bounds: 653, 142, 82, 86
+	bounds: 470, 11, 82, 86
+	rotate: 180
 raptor-body
-	bounds: 2, 277, 632, 233
+	bounds: 2, 121, 632, 233
 raptor-front-arm
-	bounds: 484, 4, 81, 102
-	rotate: 90
+	bounds: 415, 18, 81, 102
 raptor-front-leg
-	bounds: 2, 18, 191, 257
+	bounds: 525, 163, 191, 257
+	rotate: 90
 raptor-hindleg-back
-	bounds: 636, 295, 169, 215
+	bounds: 746, 139, 169, 215
+	rotate: 180
 raptor-horn
-	bounds: 195, 22, 182, 80
+	bounds: 2, 274, 182, 80
 raptor-horn-back
-	bounds: 945, 334, 176, 77
-	rotate: 90
+	bounds: 752, 61, 176, 77
 raptor-jaw
-	bounds: 359, 137, 126, 138
+	bounds: 553, 2, 126, 138
+	rotate: 270
 raptor-jaw-tooth
-	bounds: 895, 322, 37, 48
-	rotate: 90
+	bounds: 687, 223, 37, 48
 raptor-mouth-inside
-	bounds: 949, 228, 36, 41
-	rotate: 90
+	bounds: 178, 12, 36, 41
 raptor-saddle-strap-back
-	bounds: 653, 86, 54, 74
-	rotate: 90
+	bounds: 693, 7, 54, 74
 raptor-saddle-strap-front
-	bounds: 594, 94, 57, 95
+	bounds: 2, 77, 57, 95
 raptor-saddle-w-shadow
-	bounds: 195, 104, 162, 171
+	bounds: 2, 69, 162, 171
+	rotate: 90
 raptor-tail-shadow
-	bounds: 636, 230, 189, 63
+	bounds: 150, 25, 189, 63
 raptor-tongue
-	bounds: 807, 295, 86, 64
+	bounds: 63, 13, 86, 64
 stirrup-back
-	bounds: 952, 151, 44, 35
-	rotate: 90
+	bounds: 341, 34, 44, 35
 stirrup-front
-	bounds: 902, 243, 45, 50
+	bounds: 185, 304, 45, 50
 stirrup-strap
-	bounds: 824, 147, 49, 46
+	bounds: 533, 221, 49, 46
+	rotate: 90
 torso
-	bounds: 737, 137, 54, 91
+	bounds: 930, 30, 54, 91
 visor
-	bounds: 487, 191, 131, 84
+	bounds: 917, 223, 131, 84
+	rotate: 90

BIN
spine-cocos2dx/example/Resources/common/raptor.png


+ 184 - 109
spine-cocos2dx/example/Resources/common/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

+ 48 - 44
spine-cocos2dx/example/Resources/common/spineboy.atlas

@@ -3,92 +3,96 @@ spineboy.png
 	filter: Linear, Linear
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-cocos2dx/example/Resources/common/spineboy.png


BIN
spine-cocos2dx/example/Resources/common/tank-pro.skel


+ 25 - 33
spine-cocos2dx/example/Resources/common/tank.atlas

@@ -3,61 +3,53 @@ tank.png
 	filter: Linear, Linear
 	scale: 0.5
 antenna
-	bounds: 650, 857, 11, 152
-	rotate: 90
+	bounds: 804, 452, 11, 152
 cannon
-	bounds: 434, 376, 466, 29
-	rotate: 90
+	bounds: 2, 322, 466, 29
 cannon-connector
-	bounds: 349, 241, 56, 68
-	rotate: 90
+	bounds: 647, 423, 56, 68
 ground
-	bounds: 255, 330, 512, 177
+	bounds: 817, 92, 512, 177
 	rotate: 90
 guntower
-	bounds: 650, 870, 365, 145
+	bounds: 2, 2, 365, 145
 machinegun
-	bounds: 255, 299, 166, 29
-machinegun-mount
-	bounds: 2, 2, 36, 48
+	bounds: 773, 438, 166, 29
 	rotate: 90
+machinegun-mount
+	bounds: 773, 388, 36, 48
 rock
-	bounds: 465, 552, 290, 64
+	bounds: 707, 314, 290, 64
 	rotate: 90
 smoke-glow
-	bounds: 531, 563, 50, 50
+	bounds: 647, 372, 50, 50
 smoke-puff01-bg
-	bounds: 465, 458, 92, 62
-	rotate: 90
+	bounds: 557, 57, 92, 62
 smoke-puff01-fg
-	bounds: 115, 138, 88, 59
+	bounds: 651, 60, 88, 59
 smoke-puff02-fg
-	bounds: 255, 235, 92, 62
+	bounds: 463, 85, 92, 62
 smoke-puff03-fg
-	bounds: 531, 685, 92, 62
+	bounds: 369, 85, 92, 62
 smoke-puff04-fg
-	bounds: 465, 378, 78, 48
-	rotate: 90
+	bounds: 815, 42, 78, 48
 tank-bottom
-	bounds: 115, 199, 643, 138
-	rotate: 90
+	bounds: 2, 353, 643, 138
 tank-bottom-shadow
-	bounds: 2, 844, 646, 171
+	bounds: 2, 149, 646, 171
 tank-top
-	bounds: 2, 138, 704, 111
-	rotate: 90
+	bounds: 2, 493, 704, 111
 tread
-	bounds: 626, 794, 48, 15
-	rotate: 90
+	bounds: 647, 355, 48, 15
 tread-inside
-	bounds: 434, 360, 13, 14
+	bounds: 996, 590, 13, 14
 wheel-big
-	bounds: 2, 40, 96, 96
+	bounds: 650, 216, 96, 96
 wheel-big-overlay
-	bounds: 531, 749, 93, 93
+	bounds: 650, 121, 93, 93
 wheel-mid
-	bounds: 531, 615, 68, 68
+	bounds: 745, 146, 68, 68
 wheel-mid-overlay
-	bounds: 100, 68, 68, 68
+	bounds: 745, 76, 68, 68
 wheel-small
-	bounds: 205, 161, 36, 36
+	bounds: 773, 350, 36, 36

BIN
spine-cocos2dx/example/Resources/common/tank.png


BIN
spine-flutter/example/assets/celestial-circus-pro.skel


+ 82 - 98
spine-flutter/example/assets/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-flutter/example/assets/celestial-circus.png


BIN
spine-flutter/example/assets/dragon-ess.skel


+ 55 - 58
spine-flutter/example/assets/dragon.atlas

@@ -2,111 +2,108 @@ dragon.png
 	size: 1024, 1024
 	filter: Linear, Linear
 front-toe-a
-	bounds: 797, 381, 29, 50
+	bounds: 300, 929, 29, 50
 front-toe-b
-	bounds: 942, 118, 56, 57
+	bounds: 258, 660, 56, 57
 head
-	bounds: 647, 81, 296, 260
-	rotate: 90
+	bounds: 2, 719, 296, 260
 left-front-leg
-	bounds: 942, 250, 84, 57
+	bounds: 99, 660, 84, 57
+left-wing09
+	bounds: 2, 15, 264, 589
 	rotate: 90
-left-front-thigh
-	bounds: 852, 7, 84, 72
-left-wing01
-	bounds: 736, 433, 264, 589
-right-rear-toe
-	bounds: 647, 2, 109, 77
-right-wing01
-	bounds: 2, 379, 365, 643
-right-wing02
-	bounds: 369, 379, 365, 643
-right-wing03
-	bounds: 2, 12, 365, 643
+right-wing07
+	bounds: 647, 2, 365, 643
+right-wing08
+	bounds: 2, 281, 365, 643
 	rotate: 90
-tail03
-	bounds: 758, 6, 73, 92
+right-wing09
+	bounds: 354, 647, 365, 643
 	rotate: 90
 tail04
-	bounds: 942, 177, 56, 71
-tail05
-	bounds: 736, 379, 52, 59
+	bounds: 185, 661, 56, 71
 	rotate: 90
 tail06
-	bounds: 942, 336, 95, 68
-	rotate: 90
+	bounds: 2, 649, 95, 68
 thiagobrayner
-	bounds: 909, 81, 350, 31
-	rotate: 90
+	bounds: 2, 981, 350, 31
 
 dragon_2.png
 	size: 1024, 1024
 	filter: Linear, Linear
 back
-	bounds: 795, 32, 190, 185
+	bounds: 647, 57, 190, 185
 chin
-	bounds: 647, 157, 214, 146
+	bounds: 839, 28, 214, 146
 	rotate: 90
 left-rear-leg
-	bounds: 795, 219, 206, 177
+	bounds: 736, 244, 206, 177
+left-wing08
+	bounds: 736, 423, 264, 589
+right-rear-toe
+	bounds: 944, 312, 109, 77
 	rotate: 90
-left-wing02
-	bounds: 736, 427, 264, 589
 right-wing04
-	bounds: 2, 373, 365, 643
+	bounds: 2, 2, 365, 643
+	rotate: 90
 right-wing05
-	bounds: 369, 373, 365, 643
+	bounds: 369, 369, 365, 643
 right-wing06
-	bounds: 2, 6, 365, 643
-	rotate: 90
-tail01
-	bounds: 647, 2, 120, 153
+	bounds: 2, 369, 365, 643
+tail03
+	bounds: 647, 275, 73, 92
+tail05
+	bounds: 944, 251, 52, 59
 
 dragon_3.png
 	size: 1024, 1024
 	filter: Linear, Linear
 chest
-	bounds: 740, 299, 136, 122
+	bounds: 858, 299, 136, 122
+left-front-thigh
+	bounds: 647, 295, 84, 72
 left-rear-thigh
-	bounds: 647, 218, 91, 149
-left-wing03
+	bounds: 647, 117, 91, 149
+left-wing07
 	bounds: 736, 423, 264, 589
 right-front-leg
-	bounds: 850, 196, 101, 89
+	bounds: 647, 14, 101, 89
 	rotate: 90
 right-front-thigh
-	bounds: 740, 189, 108, 108
+	bounds: 740, 158, 108, 108
 right-rear-leg
-	bounds: 878, 321, 116, 100
+	bounds: 740, 46, 116, 100
 right-rear-thigh
-	bounds: 647, 67, 91, 149
-right-wing07
-	bounds: 2, 369, 365, 643
-right-wing08
-	bounds: 369, 369, 365, 643
-right-wing09
+	bounds: 858, 148, 91, 149
+right-wing01
 	bounds: 2, 2, 365, 643
 	rotate: 90
+right-wing02
+	bounds: 369, 369, 365, 643
+right-wing03
+	bounds: 2, 369, 365, 643
+tail01
+	bounds: 736, 268, 120, 153
 tail02
-	bounds: 740, 67, 95, 120
+	bounds: 858, 26, 95, 120
 
 dragon_4.png
 	size: 1024, 1024
 	filter: Linear, Linear
+left-wing03
+	bounds: 2, 2, 264, 589
+	rotate: 90
 left-wing04
-	bounds: 2, 268, 264, 589
+	bounds: 534, 268, 264, 589
 left-wing05
 	bounds: 268, 268, 264, 589
 left-wing06
-	bounds: 534, 268, 264, 589
-left-wing07
-	bounds: 2, 2, 264, 589
-	rotate: 90
+	bounds: 2, 268, 264, 589
 
 dragon_5.png
 	size: 1024, 1024
 	filter: Linear, Linear
-left-wing08
-	bounds: 2, 2, 264, 589
-left-wing09
+left-wing01
 	bounds: 268, 2, 264, 589
+left-wing02
+	bounds: 2, 2, 264, 589

BIN
spine-flutter/example/assets/dragon.png


BIN
spine-flutter/example/assets/dragon_2.png


BIN
spine-flutter/example/assets/dragon_3.png


BIN
spine-flutter/example/assets/dragon_4.png


BIN
spine-flutter/example/assets/dragon_5.png


BIN
spine-flutter/example/assets/mix-and-match-pro.skel


+ 184 - 192
spine-flutter/example/assets/mix-and-match.atlas

@@ -3,356 +3,348 @@ mix-and-match.png
 	filter: Linear, Linear
 	scale: 0.5
 base-head
-	bounds: 118, 70, 95, 73
+	bounds: 185, 123, 95, 73
 boy/arm-front
-	bounds: 831, 311, 36, 115
+	bounds: 729, 92, 36, 115
 	rotate: 90
 boy/backpack
-	bounds: 249, 357, 119, 153
+	bounds: 619, 218, 119, 153
 boy/backpack-pocket
-	bounds: 628, 193, 34, 62
+	bounds: 626, 4, 34, 62
 	rotate: 90
 boy/backpack-strap-front
-	bounds: 330, 263, 38, 88
-	rotate: 90
+	bounds: 342, 26, 38, 88
+	rotate: 270
 boy/backpack-up
-	bounds: 482, 171, 21, 70
-boy/body
-	bounds: 845, 413, 97, 132
+	bounds: 750, 12, 21, 70
 	rotate: 90
+boy/body
+	bounds: 716, 125, 97, 132
+	rotate: 270
 boy/boot-ribbon-front
-	bounds: 234, 304, 9, 11
+	bounds: 1012, 360, 9, 11
 boy/collar
-	bounds: 471, 243, 73, 29
-	rotate: 90
+	bounds: 764, 34, 73, 29
 boy/ear
-	bounds: 991, 352, 19, 23
-	rotate: 90
+	bounds: 878, 128, 19, 23
 boy/eye-back-low-eyelid
-	bounds: 66, 72, 17, 6
+	bounds: 467, 245, 17, 6
 boy/eye-back-pupil
-	bounds: 694, 279, 8, 9
-	rotate: 90
+	bounds: 1012, 327, 8, 9
 boy/eye-back-up-eyelid
-	bounds: 460, 101, 23, 5
+	bounds: 180, 348, 23, 5
 	rotate: 90
 boy/eye-back-up-eyelid-back
-	bounds: 979, 414, 19, 10
-	rotate: 90
+	bounds: 282, 255, 19, 10
 boy/eye-front-low-eyelid
-	bounds: 1015, 203, 22, 7
-	rotate: 90
+	bounds: 366, 364, 22, 7
 boy/eye-front-pupil
-	bounds: 309, 50, 9, 9
+	bounds: 1012, 349, 9, 9
 boy/eye-front-up-eyelid
-	bounds: 991, 373, 31, 6
+	bounds: 155, 340, 31, 6
+	rotate: 270
 boy/eye-front-up-eyelid-back
-	bounds: 107, 76, 26, 9
-	rotate: 90
+	bounds: 338, 362, 26, 9
 boy/eye-iris-back
-	bounds: 810, 260, 17, 17
+	bounds: 562, 12, 17, 17
 boy/eye-iris-front
-	bounds: 902, 230, 18, 18
+	bounds: 807, 73, 18, 18
 boy/eye-white-back
-	bounds: 599, 179, 20, 12
+	bounds: 317, 359, 20, 12
 boy/eye-white-front
-	bounds: 544, 183, 27, 13
+	bounds: 499, 358, 27, 13
 boy/eyebrow-back
-	bounds: 1002, 225, 20, 11
-	rotate: 90
+	bounds: 194, 360, 20, 11
 boy/eyebrow-front
-	bounds: 975, 234, 25, 11
+	bounds: 290, 360, 25, 11
 boy/hair-back
-	bounds: 629, 289, 122, 81
+	bounds: 929, 249, 122, 81
 	rotate: 90
 boy/hair-bangs
-	bounds: 505, 180, 70, 37
-	rotate: 90
+	bounds: 2, 2, 70, 37
 boy/hair-side
-	bounds: 979, 435, 25, 43
-	rotate: 90
+	bounds: 997, 237, 25, 43
 boy/hand-backfingers
-	bounds: 858, 183, 19, 21
+	bounds: 376, 15, 19, 21
 boy/hand-front-fingers
-	bounds: 879, 183, 19, 21
+	bounds: 786, 72, 19, 21
 boy/hat
-	bounds: 218, 121, 93, 56
+	bounds: 68, 89, 93, 56
 boy/leg-front
-	bounds: 85, 104, 31, 158
+	bounds: 90, 213, 31, 158
+	rotate: 180
 boy/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-blue-cape/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-spring-dress/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 boy/mouth-smile
-	bounds: 1015, 258, 29, 7
+	bounds: 171, 342, 29, 7
 	rotate: 90
 boy/nose
-	bounds: 323, 79, 17, 10
+	bounds: 1005, 225, 17, 10
 boy/pompom
-	bounds: 979, 462, 48, 43
-	rotate: 90
+	bounds: 157, 40, 48, 43
 boy/zip
-	bounds: 922, 231, 14, 23
-	rotate: 90
+	bounds: 883, 163, 14, 23
 girl-blue-cape/back-eyebrow
-	bounds: 527, 106, 18, 12
-	rotate: 90
+	bounds: 137, 52, 18, 12
 girl-blue-cape/body-dress
-	bounds: 2, 264, 109, 246
+	bounds: 185, 262, 109, 241
+	offsets: 0, 0, 109, 246
+	rotate: 90
 girl-blue-cape/body-ribbon
-	bounds: 576, 193, 50, 38
+	bounds: 881, 28, 50, 38
 girl-blue-cape/cape-back
-	bounds: 113, 317, 134, 193
+	bounds: 427, 237, 134, 193
+	rotate: 90
 girl-blue-cape/cape-back-up
-	bounds: 504, 305, 123, 106
+	bounds: 899, 126, 123, 106
+	rotate: 180
 girl-blue-cape/cape-ribbon
-	bounds: 396, 118, 50, 18
-	rotate: 90
+	bounds: 427, 353, 50, 18
 girl-blue-cape/cape-shoulder-back
-	bounds: 420, 243, 49, 59
+	bounds: 510, 3, 49, 59
+	rotate: 90
 girl-blue-cape/cape-shoulder-front
-	bounds: 2, 2, 62, 76
+	bounds: 310, 51, 62, 76
+	rotate: 270
 girl-blue-cape/cape-up-front
-	bounds: 118, 145, 98, 117
+	bounds: 388, 72, 98, 117
+	rotate: 90
 girl-blue-cape/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-spring-dress/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-blue-cape/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-spring-dress/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-blue-cape/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-spring-dress/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-blue-cape/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-spring-dress/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-blue-cape/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-spring-dress/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-blue-cape/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-spring-dress/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-blue-cape/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-spring-dress/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-blue-cape/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-spring-dress/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-blue-cape/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-spring-dress/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-blue-cape/eye-iris-back
-	bounds: 323, 105, 17, 17
+	bounds: 442, 34, 17, 17
 girl-blue-cape/eye-iris-front
-	bounds: 467, 107, 18, 18
+	bounds: 708, 95, 18, 18
 girl-blue-cape/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-spring-dress/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-blue-cape/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-spring-dress/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-blue-cape/front-eyebrow
-	bounds: 309, 101, 18, 12
-	rotate: 90
+	bounds: 424, 172, 18, 12
 girl-blue-cape/hair-back
-	bounds: 712, 317, 117, 98
+	bounds: 305, 162, 117, 98
 girl-blue-cape/hair-bangs
-	bounds: 313, 170, 91, 40
-	rotate: 90
+	bounds: 694, 57, 91, 40
 girl-blue-cape/hair-head-side-back
-	bounds: 544, 198, 30, 52
+	bounds: 397, 2, 30, 52
+	rotate: 90
 girl-blue-cape/hair-head-side-front
-	bounds: 466, 127, 41, 42
-girl-blue-cape/hair-side
-	bounds: 175, 2, 36, 71
+	bounds: 933, 14, 41, 42
 	rotate: 90
+girl-blue-cape/hair-side
+	bounds: 203, 11, 36, 71
+	rotate: 270
 girl-blue-cape/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-spring-dress/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-blue-cape/leg-front
-	bounds: 519, 413, 30, 158
-	rotate: 90
+	bounds: 60, 213, 30, 158
+	rotate: 180
 girl-blue-cape/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-spring-dress/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-blue-cape/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-spring-dress/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-blue-cape/sleeve-back
-	bounds: 416, 95, 42, 29
+	bounds: 157, 9, 42, 29
 girl-blue-cape/sleeve-front
-	bounds: 249, 303, 52, 119
-	rotate: 90
+	bounds: 839, 103, 52, 119
 girl-spring-dress/arm-front
-	bounds: 829, 292, 17, 111
-	rotate: 90
+	bounds: 122, 260, 17, 111
 girl-spring-dress/back-eyebrow
-	bounds: 309, 81, 18, 12
-	rotate: 90
+	bounds: 2, 199, 18, 12
 girl-spring-dress/body-up
-	bounds: 66, 2, 64, 66
+	bounds: 2, 79, 64, 66
 girl-spring-dress/cloak-down
-	bounds: 758, 227, 50, 50
+	bounds: 459, 18, 50, 50
+	rotate: 180
 girl-spring-dress/cloak-up
-	bounds: 628, 229, 64, 58
+	bounds: 247, 50, 61, 58
+	offsets: 0, 0, 64, 58
+	rotate: 270
 girl-spring-dress/eye-iris-back
-	bounds: 342, 105, 17, 17
+	bounds: 875, 109, 17, 17
 girl-spring-dress/eye-iris-front
-	bounds: 487, 107, 18, 18
+	bounds: 479, 353, 18, 18
 girl-spring-dress/front-eyebrow
-	bounds: 323, 91, 18, 12
+	bounds: 893, 210, 18, 12
 girl-spring-dress/hair-back
-	bounds: 370, 417, 147, 93
+	bounds: 834, 224, 147, 93
+	rotate: 90
 girl-spring-dress/hair-bangs
-	bounds: 829, 250, 91, 40
+	bounds: 914, 57, 91, 40
 girl-spring-dress/hair-head-side-back
-	bounds: 509, 126, 30, 52
+	bounds: 217, 341, 30, 52
+	rotate: 90
 girl-spring-dress/hair-head-side-front
-	bounds: 816, 206, 41, 42
+	bounds: 582, 15, 41, 42
+	rotate: 90
 girl-spring-dress/hair-side
-	bounds: 248, 2, 36, 71
+	bounds: 84, 14, 36, 71
 	rotate: 90
 girl-spring-dress/leg-front
-	bounds: 831, 381, 30, 158
-	rotate: 90
+	bounds: 30, 213, 30, 158
+	rotate: 180
 girl-spring-dress/neck
-	bounds: 85, 70, 20, 32
+	bounds: 283, 176, 20, 32
 girl-spring-dress/shoulder-ribbon
-	bounds: 175, 44, 36, 24
+	bounds: 207, 58, 36, 24
 girl-spring-dress/skirt
-	bounds: 2, 80, 182, 81
-	rotate: 90
+	bounds: 121, 198, 182, 81
+	rotate: 180
 girl-spring-dress/underskirt
-	bounds: 519, 445, 175, 65
+	bounds: 8, 147, 175, 65
 girl/arm-front
-	bounds: 712, 279, 36, 115
+	bounds: 907, 93, 36, 115
 	rotate: 90
 girl/back-eyebrow
-	bounds: 309, 61, 18, 12
-	rotate: 90
+	bounds: 948, 236, 18, 12
 girl/bag-base
-	bounds: 694, 219, 62, 58
+	bounds: 418, 52, 62, 58
 girl/bag-strap-front
-	bounds: 370, 304, 12, 96
-	rotate: 90
+	bounds: 141, 276, 12, 95
+	offsets: 0, 1, 12, 96
 girl/bag-top
-	bounds: 765, 175, 49, 50
+	bounds: 841, 7, 49, 50
 girl/body
-	bounds: 370, 318, 97, 132
-	rotate: 90
+	bounds: 476, 154, 97, 132
+	rotate: 270
 girl/boot-ribbon-front
-	bounds: 323, 64, 13, 13
+	bounds: 968, 235, 13, 13
 girl/eye-iris-back
-	bounds: 361, 105, 17, 17
+	bounds: 929, 231, 17, 17
 girl/eye-iris-front
-	bounds: 507, 106, 18, 18
+	bounds: 270, 353, 18, 18
 girl/eye-white-back
-	bounds: 665, 175, 20, 16
+	bounds: 162, 324, 20, 16
 girl/front-eyebrow
-	bounds: 343, 91, 18, 12
+	bounds: 527, 359, 18, 12
 girl/hair-back
-	bounds: 696, 417, 147, 93
+	bounds: 739, 224, 147, 93
+	rotate: 90
 girl/hair-bangs
-	bounds: 922, 247, 91, 40
+	bounds: 534, 57, 91, 40
 girl/hair-flap-down-front
-	bounds: 415, 171, 70, 65
-	rotate: 90
+	bounds: 506, 31, 70, 65
+	rotate: 180
 girl/hair-head-side-back
-	bounds: 991, 381, 30, 52
+	bounds: 155, 276, 30, 52
 girl/hair-head-side-front
-	bounds: 859, 206, 41, 42
+	bounds: 980, 17, 41, 42
+	rotate: 90
 girl/hair-patch
-	bounds: 132, 2, 66, 41
+	bounds: 424, 186, 66, 41
 	rotate: 90
 girl/hair-side
-	bounds: 692, 181, 36, 71
+	bounds: 265, 17, 36, 71
 	rotate: 90
 girl/hair-strand-back-1
-	bounds: 948, 289, 58, 74
+	bounds: 676, 24, 56, 74
+	offsets: 2, 0, 58, 74
 	rotate: 90
 girl/hair-strand-back-2
-	bounds: 355, 170, 91, 58
-	rotate: 90
+	bounds: 823, 54, 90, 53
+	offsets: 1, 0, 91, 58
 girl/hair-strand-back-3
-	bounds: 215, 40, 92, 79
+	bounds: 610, 138, 92, 79
 girl/hair-strand-front-1
-	bounds: 234, 263, 38, 94
+	bounds: 157, 83, 38, 94
 	rotate: 90
 girl/hair-strand-front-2
-	bounds: 576, 233, 70, 50
-	rotate: 90
+	bounds: 2, 27, 70, 50
 girl/hair-strand-front-3
-	bounds: 313, 124, 44, 81
-	rotate: 90
+	bounds: 74, 50, 44, 81
+	rotate: 270
 girl/hand-front-fingers
-	bounds: 923, 208, 19, 21
+	bounds: 162, 124, 19, 21
 girl/hat
-	bounds: 218, 179, 93, 82
+	bounds: 282, 78, 93, 82
 girl/leg-front
-	bounds: 831, 349, 30, 158
-	rotate: 90
+	bounds: 2, 213, 30, 158
 girl/pompom
-	bounds: 416, 126, 48, 43
+	bounds: 626, 40, 48, 43
 girl/scarf
-	bounds: 113, 264, 119, 51
+	bounds: 499, 98, 119, 51
 girl/scarf-back
-	bounds: 502, 252, 72, 51
+	bounds: 620, 85, 72, 51
 girl/zip
-	bounds: 816, 179, 19, 25
+	bounds: 455, 173, 19, 25

BIN
spine-flutter/example/assets/mix-and-match.png


+ 184 - 109
spine-flutter/example/assets/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

BIN
spine-flutter/example/assets/spineboy-pro.skel


+ 48 - 44
spine-flutter/example/assets/spineboy.atlas

@@ -3,92 +3,96 @@ spineboy.png
 	filter: Linear, Linear
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-flutter/example/assets/spineboy.png


+ 48 - 44
spine-glfw/data/spineboy-pma.atlas

@@ -4,92 +4,96 @@ spineboy-pma.png
 	pma: true
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-glfw/data/spineboy-pma.png


+ 184 - 109
spine-glfw/data/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

BIN
spine-glfw/data/spineboy-pro.skel


+ 82 - 98
spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.png


BIN
spine-godot/example-v4-csharp/assets/celestial-circus/celestial-circus.skel


File diff suppressed because it is too large
+ 380 - 202
spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match-pro.spine-json


+ 184 - 192
spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match.atlas

@@ -3,356 +3,348 @@ mix-and-match.png
 	filter: Linear, Linear
 	scale: 0.5
 base-head
-	bounds: 118, 70, 95, 73
+	bounds: 185, 123, 95, 73
 boy/arm-front
-	bounds: 831, 311, 36, 115
+	bounds: 729, 92, 36, 115
 	rotate: 90
 boy/backpack
-	bounds: 249, 357, 119, 153
+	bounds: 619, 218, 119, 153
 boy/backpack-pocket
-	bounds: 628, 193, 34, 62
+	bounds: 626, 4, 34, 62
 	rotate: 90
 boy/backpack-strap-front
-	bounds: 330, 263, 38, 88
-	rotate: 90
+	bounds: 342, 26, 38, 88
+	rotate: 270
 boy/backpack-up
-	bounds: 482, 171, 21, 70
-boy/body
-	bounds: 845, 413, 97, 132
+	bounds: 750, 12, 21, 70
 	rotate: 90
+boy/body
+	bounds: 716, 125, 97, 132
+	rotate: 270
 boy/boot-ribbon-front
-	bounds: 234, 304, 9, 11
+	bounds: 1012, 360, 9, 11
 boy/collar
-	bounds: 471, 243, 73, 29
-	rotate: 90
+	bounds: 764, 34, 73, 29
 boy/ear
-	bounds: 991, 352, 19, 23
-	rotate: 90
+	bounds: 878, 128, 19, 23
 boy/eye-back-low-eyelid
-	bounds: 66, 72, 17, 6
+	bounds: 467, 245, 17, 6
 boy/eye-back-pupil
-	bounds: 694, 279, 8, 9
-	rotate: 90
+	bounds: 1012, 327, 8, 9
 boy/eye-back-up-eyelid
-	bounds: 460, 101, 23, 5
+	bounds: 180, 348, 23, 5
 	rotate: 90
 boy/eye-back-up-eyelid-back
-	bounds: 979, 414, 19, 10
-	rotate: 90
+	bounds: 282, 255, 19, 10
 boy/eye-front-low-eyelid
-	bounds: 1015, 203, 22, 7
-	rotate: 90
+	bounds: 366, 364, 22, 7
 boy/eye-front-pupil
-	bounds: 309, 50, 9, 9
+	bounds: 1012, 349, 9, 9
 boy/eye-front-up-eyelid
-	bounds: 991, 373, 31, 6
+	bounds: 155, 340, 31, 6
+	rotate: 270
 boy/eye-front-up-eyelid-back
-	bounds: 107, 76, 26, 9
-	rotate: 90
+	bounds: 338, 362, 26, 9
 boy/eye-iris-back
-	bounds: 810, 260, 17, 17
+	bounds: 562, 12, 17, 17
 boy/eye-iris-front
-	bounds: 902, 230, 18, 18
+	bounds: 807, 73, 18, 18
 boy/eye-white-back
-	bounds: 599, 179, 20, 12
+	bounds: 317, 359, 20, 12
 boy/eye-white-front
-	bounds: 544, 183, 27, 13
+	bounds: 499, 358, 27, 13
 boy/eyebrow-back
-	bounds: 1002, 225, 20, 11
-	rotate: 90
+	bounds: 194, 360, 20, 11
 boy/eyebrow-front
-	bounds: 975, 234, 25, 11
+	bounds: 290, 360, 25, 11
 boy/hair-back
-	bounds: 629, 289, 122, 81
+	bounds: 929, 249, 122, 81
 	rotate: 90
 boy/hair-bangs
-	bounds: 505, 180, 70, 37
-	rotate: 90
+	bounds: 2, 2, 70, 37
 boy/hair-side
-	bounds: 979, 435, 25, 43
-	rotate: 90
+	bounds: 997, 237, 25, 43
 boy/hand-backfingers
-	bounds: 858, 183, 19, 21
+	bounds: 376, 15, 19, 21
 boy/hand-front-fingers
-	bounds: 879, 183, 19, 21
+	bounds: 786, 72, 19, 21
 boy/hat
-	bounds: 218, 121, 93, 56
+	bounds: 68, 89, 93, 56
 boy/leg-front
-	bounds: 85, 104, 31, 158
+	bounds: 90, 213, 31, 158
+	rotate: 180
 boy/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-blue-cape/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-spring-dress/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 boy/mouth-smile
-	bounds: 1015, 258, 29, 7
+	bounds: 171, 342, 29, 7
 	rotate: 90
 boy/nose
-	bounds: 323, 79, 17, 10
+	bounds: 1005, 225, 17, 10
 boy/pompom
-	bounds: 979, 462, 48, 43
-	rotate: 90
+	bounds: 157, 40, 48, 43
 boy/zip
-	bounds: 922, 231, 14, 23
-	rotate: 90
+	bounds: 883, 163, 14, 23
 girl-blue-cape/back-eyebrow
-	bounds: 527, 106, 18, 12
-	rotate: 90
+	bounds: 137, 52, 18, 12
 girl-blue-cape/body-dress
-	bounds: 2, 264, 109, 246
+	bounds: 185, 262, 109, 241
+	offsets: 0, 0, 109, 246
+	rotate: 90
 girl-blue-cape/body-ribbon
-	bounds: 576, 193, 50, 38
+	bounds: 881, 28, 50, 38
 girl-blue-cape/cape-back
-	bounds: 113, 317, 134, 193
+	bounds: 427, 237, 134, 193
+	rotate: 90
 girl-blue-cape/cape-back-up
-	bounds: 504, 305, 123, 106
+	bounds: 899, 126, 123, 106
+	rotate: 180
 girl-blue-cape/cape-ribbon
-	bounds: 396, 118, 50, 18
-	rotate: 90
+	bounds: 427, 353, 50, 18
 girl-blue-cape/cape-shoulder-back
-	bounds: 420, 243, 49, 59
+	bounds: 510, 3, 49, 59
+	rotate: 90
 girl-blue-cape/cape-shoulder-front
-	bounds: 2, 2, 62, 76
+	bounds: 310, 51, 62, 76
+	rotate: 270
 girl-blue-cape/cape-up-front
-	bounds: 118, 145, 98, 117
+	bounds: 388, 72, 98, 117
+	rotate: 90
 girl-blue-cape/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-spring-dress/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-blue-cape/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-spring-dress/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-blue-cape/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-spring-dress/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-blue-cape/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-spring-dress/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-blue-cape/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-spring-dress/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-blue-cape/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-spring-dress/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-blue-cape/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-spring-dress/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-blue-cape/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-spring-dress/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-blue-cape/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-spring-dress/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-blue-cape/eye-iris-back
-	bounds: 323, 105, 17, 17
+	bounds: 442, 34, 17, 17
 girl-blue-cape/eye-iris-front
-	bounds: 467, 107, 18, 18
+	bounds: 708, 95, 18, 18
 girl-blue-cape/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-spring-dress/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-blue-cape/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-spring-dress/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-blue-cape/front-eyebrow
-	bounds: 309, 101, 18, 12
-	rotate: 90
+	bounds: 424, 172, 18, 12
 girl-blue-cape/hair-back
-	bounds: 712, 317, 117, 98
+	bounds: 305, 162, 117, 98
 girl-blue-cape/hair-bangs
-	bounds: 313, 170, 91, 40
-	rotate: 90
+	bounds: 694, 57, 91, 40
 girl-blue-cape/hair-head-side-back
-	bounds: 544, 198, 30, 52
+	bounds: 397, 2, 30, 52
+	rotate: 90
 girl-blue-cape/hair-head-side-front
-	bounds: 466, 127, 41, 42
-girl-blue-cape/hair-side
-	bounds: 175, 2, 36, 71
+	bounds: 933, 14, 41, 42
 	rotate: 90
+girl-blue-cape/hair-side
+	bounds: 203, 11, 36, 71
+	rotate: 270
 girl-blue-cape/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-spring-dress/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-blue-cape/leg-front
-	bounds: 519, 413, 30, 158
-	rotate: 90
+	bounds: 60, 213, 30, 158
+	rotate: 180
 girl-blue-cape/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-spring-dress/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-blue-cape/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-spring-dress/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-blue-cape/sleeve-back
-	bounds: 416, 95, 42, 29
+	bounds: 157, 9, 42, 29
 girl-blue-cape/sleeve-front
-	bounds: 249, 303, 52, 119
-	rotate: 90
+	bounds: 839, 103, 52, 119
 girl-spring-dress/arm-front
-	bounds: 829, 292, 17, 111
-	rotate: 90
+	bounds: 122, 260, 17, 111
 girl-spring-dress/back-eyebrow
-	bounds: 309, 81, 18, 12
-	rotate: 90
+	bounds: 2, 199, 18, 12
 girl-spring-dress/body-up
-	bounds: 66, 2, 64, 66
+	bounds: 2, 79, 64, 66
 girl-spring-dress/cloak-down
-	bounds: 758, 227, 50, 50
+	bounds: 459, 18, 50, 50
+	rotate: 180
 girl-spring-dress/cloak-up
-	bounds: 628, 229, 64, 58
+	bounds: 247, 50, 61, 58
+	offsets: 0, 0, 64, 58
+	rotate: 270
 girl-spring-dress/eye-iris-back
-	bounds: 342, 105, 17, 17
+	bounds: 875, 109, 17, 17
 girl-spring-dress/eye-iris-front
-	bounds: 487, 107, 18, 18
+	bounds: 479, 353, 18, 18
 girl-spring-dress/front-eyebrow
-	bounds: 323, 91, 18, 12
+	bounds: 893, 210, 18, 12
 girl-spring-dress/hair-back
-	bounds: 370, 417, 147, 93
+	bounds: 834, 224, 147, 93
+	rotate: 90
 girl-spring-dress/hair-bangs
-	bounds: 829, 250, 91, 40
+	bounds: 914, 57, 91, 40
 girl-spring-dress/hair-head-side-back
-	bounds: 509, 126, 30, 52
+	bounds: 217, 341, 30, 52
+	rotate: 90
 girl-spring-dress/hair-head-side-front
-	bounds: 816, 206, 41, 42
+	bounds: 582, 15, 41, 42
+	rotate: 90
 girl-spring-dress/hair-side
-	bounds: 248, 2, 36, 71
+	bounds: 84, 14, 36, 71
 	rotate: 90
 girl-spring-dress/leg-front
-	bounds: 831, 381, 30, 158
-	rotate: 90
+	bounds: 30, 213, 30, 158
+	rotate: 180
 girl-spring-dress/neck
-	bounds: 85, 70, 20, 32
+	bounds: 283, 176, 20, 32
 girl-spring-dress/shoulder-ribbon
-	bounds: 175, 44, 36, 24
+	bounds: 207, 58, 36, 24
 girl-spring-dress/skirt
-	bounds: 2, 80, 182, 81
-	rotate: 90
+	bounds: 121, 198, 182, 81
+	rotate: 180
 girl-spring-dress/underskirt
-	bounds: 519, 445, 175, 65
+	bounds: 8, 147, 175, 65
 girl/arm-front
-	bounds: 712, 279, 36, 115
+	bounds: 907, 93, 36, 115
 	rotate: 90
 girl/back-eyebrow
-	bounds: 309, 61, 18, 12
-	rotate: 90
+	bounds: 948, 236, 18, 12
 girl/bag-base
-	bounds: 694, 219, 62, 58
+	bounds: 418, 52, 62, 58
 girl/bag-strap-front
-	bounds: 370, 304, 12, 96
-	rotate: 90
+	bounds: 141, 276, 12, 95
+	offsets: 0, 1, 12, 96
 girl/bag-top
-	bounds: 765, 175, 49, 50
+	bounds: 841, 7, 49, 50
 girl/body
-	bounds: 370, 318, 97, 132
-	rotate: 90
+	bounds: 476, 154, 97, 132
+	rotate: 270
 girl/boot-ribbon-front
-	bounds: 323, 64, 13, 13
+	bounds: 968, 235, 13, 13
 girl/eye-iris-back
-	bounds: 361, 105, 17, 17
+	bounds: 929, 231, 17, 17
 girl/eye-iris-front
-	bounds: 507, 106, 18, 18
+	bounds: 270, 353, 18, 18
 girl/eye-white-back
-	bounds: 665, 175, 20, 16
+	bounds: 162, 324, 20, 16
 girl/front-eyebrow
-	bounds: 343, 91, 18, 12
+	bounds: 527, 359, 18, 12
 girl/hair-back
-	bounds: 696, 417, 147, 93
+	bounds: 739, 224, 147, 93
+	rotate: 90
 girl/hair-bangs
-	bounds: 922, 247, 91, 40
+	bounds: 534, 57, 91, 40
 girl/hair-flap-down-front
-	bounds: 415, 171, 70, 65
-	rotate: 90
+	bounds: 506, 31, 70, 65
+	rotate: 180
 girl/hair-head-side-back
-	bounds: 991, 381, 30, 52
+	bounds: 155, 276, 30, 52
 girl/hair-head-side-front
-	bounds: 859, 206, 41, 42
+	bounds: 980, 17, 41, 42
+	rotate: 90
 girl/hair-patch
-	bounds: 132, 2, 66, 41
+	bounds: 424, 186, 66, 41
 	rotate: 90
 girl/hair-side
-	bounds: 692, 181, 36, 71
+	bounds: 265, 17, 36, 71
 	rotate: 90
 girl/hair-strand-back-1
-	bounds: 948, 289, 58, 74
+	bounds: 676, 24, 56, 74
+	offsets: 2, 0, 58, 74
 	rotate: 90
 girl/hair-strand-back-2
-	bounds: 355, 170, 91, 58
-	rotate: 90
+	bounds: 823, 54, 90, 53
+	offsets: 1, 0, 91, 58
 girl/hair-strand-back-3
-	bounds: 215, 40, 92, 79
+	bounds: 610, 138, 92, 79
 girl/hair-strand-front-1
-	bounds: 234, 263, 38, 94
+	bounds: 157, 83, 38, 94
 	rotate: 90
 girl/hair-strand-front-2
-	bounds: 576, 233, 70, 50
-	rotate: 90
+	bounds: 2, 27, 70, 50
 girl/hair-strand-front-3
-	bounds: 313, 124, 44, 81
-	rotate: 90
+	bounds: 74, 50, 44, 81
+	rotate: 270
 girl/hand-front-fingers
-	bounds: 923, 208, 19, 21
+	bounds: 162, 124, 19, 21
 girl/hat
-	bounds: 218, 179, 93, 82
+	bounds: 282, 78, 93, 82
 girl/leg-front
-	bounds: 831, 349, 30, 158
-	rotate: 90
+	bounds: 2, 213, 30, 158
 girl/pompom
-	bounds: 416, 126, 48, 43
+	bounds: 626, 40, 48, 43
 girl/scarf
-	bounds: 113, 264, 119, 51
+	bounds: 499, 98, 119, 51
 girl/scarf-back
-	bounds: 502, 252, 72, 51
+	bounds: 620, 85, 72, 51
 girl/zip
-	bounds: 816, 179, 19, 25
+	bounds: 455, 173, 19, 25

BIN
spine-godot/example-v4-csharp/assets/mix-and-match/mix-and-match.png


BIN
spine-godot/example-v4-csharp/assets/raptor/raptor-pro.skel


+ 47 - 58
spine-godot/example-v4-csharp/assets/raptor/raptor.atlas

@@ -1,99 +1,88 @@
 raptor.png
 	size: 1024, 512
 	filter: Linear, Linear
+	scale: 0.5
 back-arm
-	bounds: 829, 88, 46, 25
-	rotate: 90
+	bounds: 130, 32, 46, 25
 back-bracer
-	bounds: 195, 238, 39, 28
-	rotate: 90
+	bounds: 215, 11, 39, 28
 back-hand
-	bounds: 724, 140, 36, 34
-	rotate: 90
+	bounds: 847, 25, 36, 34
 back-knee
-	bounds: 760, 131, 49, 67
-	rotate: 90
+	bounds: 2, 8, 49, 67
 back-thigh
-	bounds: 225, 238, 39, 24
-	rotate: 90
+	bounds: 327, 8, 39, 24
 eyes-open
-	bounds: 975, 204, 47, 45
+	bounds: 232, 309, 47, 45
 front-arm
-	bounds: 969, 112, 48, 26
+	bounds: 421, 99, 48, 26
 front-bracer
-	bounds: 724, 97, 41, 29
-	rotate: 90
+	bounds: 885, 30, 41, 29
 front-hand
-	bounds: 251, 239, 41, 38
+	bounds: 784, 184, 41, 38
 front-open-hand
-	bounds: 856, 76, 43, 44
-	rotate: 90
+	bounds: 771, 310, 43, 44
 front-thigh
-	bounds: 729, 178, 57, 29
-	rotate: 90
+	bounds: 635, 192, 57, 29
 gun
-	bounds: 894, 251, 107, 103
+	bounds: 636, 83, 107, 103
 gun-nohand
-	bounds: 764, 241, 105, 102
+	bounds: 174, 83, 105, 102
 head
-	bounds: 756, 345, 136, 149
+	bounds: 291, 71, 136, 149
+	rotate: 270
 lower-leg
-	bounds: 475, 237, 73, 98
-	rotate: 90
+	bounds: 930, 123, 73, 98
 mouth-grind
-	bounds: 975, 172, 47, 30
+	bounds: 798, 29, 47, 30
 mouth-smile
-	bounds: 975, 140, 47, 30
+	bounds: 749, 29, 47, 30
 neck
-	bounds: 366, 282, 18, 21
+	bounds: 281, 333, 18, 21
 raptor-back-arm
-	bounds: 636, 97, 82, 86
-	rotate: 90
+	bounds: 470, 11, 82, 86
+	rotate: 180
 raptor-body
-	bounds: 2, 2, 632, 233
+	bounds: 2, 121, 632, 233
 raptor-front-arm
-	bounds: 871, 168, 81, 102
-	rotate: 90
+	bounds: 415, 18, 81, 102
 raptor-front-leg
-	bounds: 2, 237, 191, 257
+	bounds: 525, 163, 191, 257
+	rotate: 90
 raptor-hindleg-back
-	bounds: 195, 279, 169, 215
+	bounds: 746, 139, 169, 215
+	rotate: 180
 raptor-horn
-	bounds: 431, 312, 182, 80
-	rotate: 90
+	bounds: 2, 274, 182, 80
 raptor-horn-back
-	bounds: 513, 318, 176, 77
-	rotate: 90
+	bounds: 752, 61, 176, 77
 raptor-jaw
-	bounds: 894, 356, 126, 138
+	bounds: 553, 2, 126, 138
+	rotate: 270
 raptor-jaw-tooth
-	bounds: 294, 240, 37, 48
-	rotate: 90
+	bounds: 687, 223, 37, 48
 raptor-mouth-inside
-	bounds: 344, 241, 36, 41
-	rotate: 90
+	bounds: 178, 12, 36, 41
 raptor-saddle-strap-back
-	bounds: 575, 242, 54, 74
+	bounds: 693, 7, 54, 74
 raptor-saddle-strap-front
-	bounds: 764, 182, 57, 95
-	rotate: 90
+	bounds: 2, 77, 57, 95
 raptor-saddle-w-shadow
-	bounds: 592, 323, 162, 171
-raptor-tail-shadow
-	bounds: 366, 305, 189, 63
+	bounds: 2, 69, 162, 171
 	rotate: 90
+raptor-tail-shadow
+	bounds: 150, 25, 189, 63
 raptor-tongue
-	bounds: 387, 239, 86, 64
+	bounds: 63, 13, 86, 64
 stirrup-back
-	bounds: 829, 136, 44, 35
-	rotate: 90
+	bounds: 341, 34, 44, 35
 stirrup-front
-	bounds: 866, 121, 45, 50
-	rotate: 90
+	bounds: 185, 304, 45, 50
 stirrup-strap
-	bounds: 918, 120, 49, 46
-torso
-	bounds: 636, 181, 54, 91
+	bounds: 533, 221, 49, 46
 	rotate: 90
+torso
+	bounds: 930, 30, 54, 91
 visor
-	bounds: 631, 237, 131, 84
+	bounds: 917, 223, 131, 84
+	rotate: 90

BIN
spine-godot/example-v4-csharp/assets/raptor/raptor.png


BIN
spine-godot/example-v4-csharp/assets/spineboy/spineboy-pro.skel


+ 184 - 109
spine-godot/example-v4-csharp/assets/spineboy/spineboy-pro.spine-json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

+ 48 - 44
spine-godot/example-v4-csharp/assets/spineboy/spineboy.atlas

@@ -3,92 +3,96 @@ spineboy.png
 	filter: Linear, Linear
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-godot/example-v4-csharp/assets/spineboy/spineboy.png


+ 82 - 98
spine-godot/example-v4/assets/celestial-circus/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-godot/example-v4/assets/celestial-circus/celestial-circus.png


BIN
spine-godot/example-v4/assets/celestial-circus/celestial-circus.skel


File diff suppressed because it is too large
+ 380 - 202
spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json


+ 184 - 192
spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas

@@ -3,356 +3,348 @@ mix-and-match.png
 	filter: Linear, Linear
 	scale: 0.5
 base-head
-	bounds: 118, 70, 95, 73
+	bounds: 185, 123, 95, 73
 boy/arm-front
-	bounds: 831, 311, 36, 115
+	bounds: 729, 92, 36, 115
 	rotate: 90
 boy/backpack
-	bounds: 249, 357, 119, 153
+	bounds: 619, 218, 119, 153
 boy/backpack-pocket
-	bounds: 628, 193, 34, 62
+	bounds: 626, 4, 34, 62
 	rotate: 90
 boy/backpack-strap-front
-	bounds: 330, 263, 38, 88
-	rotate: 90
+	bounds: 342, 26, 38, 88
+	rotate: 270
 boy/backpack-up
-	bounds: 482, 171, 21, 70
-boy/body
-	bounds: 845, 413, 97, 132
+	bounds: 750, 12, 21, 70
 	rotate: 90
+boy/body
+	bounds: 716, 125, 97, 132
+	rotate: 270
 boy/boot-ribbon-front
-	bounds: 234, 304, 9, 11
+	bounds: 1012, 360, 9, 11
 boy/collar
-	bounds: 471, 243, 73, 29
-	rotate: 90
+	bounds: 764, 34, 73, 29
 boy/ear
-	bounds: 991, 352, 19, 23
-	rotate: 90
+	bounds: 878, 128, 19, 23
 boy/eye-back-low-eyelid
-	bounds: 66, 72, 17, 6
+	bounds: 467, 245, 17, 6
 boy/eye-back-pupil
-	bounds: 694, 279, 8, 9
-	rotate: 90
+	bounds: 1012, 327, 8, 9
 boy/eye-back-up-eyelid
-	bounds: 460, 101, 23, 5
+	bounds: 180, 348, 23, 5
 	rotate: 90
 boy/eye-back-up-eyelid-back
-	bounds: 979, 414, 19, 10
-	rotate: 90
+	bounds: 282, 255, 19, 10
 boy/eye-front-low-eyelid
-	bounds: 1015, 203, 22, 7
-	rotate: 90
+	bounds: 366, 364, 22, 7
 boy/eye-front-pupil
-	bounds: 309, 50, 9, 9
+	bounds: 1012, 349, 9, 9
 boy/eye-front-up-eyelid
-	bounds: 991, 373, 31, 6
+	bounds: 155, 340, 31, 6
+	rotate: 270
 boy/eye-front-up-eyelid-back
-	bounds: 107, 76, 26, 9
-	rotate: 90
+	bounds: 338, 362, 26, 9
 boy/eye-iris-back
-	bounds: 810, 260, 17, 17
+	bounds: 562, 12, 17, 17
 boy/eye-iris-front
-	bounds: 902, 230, 18, 18
+	bounds: 807, 73, 18, 18
 boy/eye-white-back
-	bounds: 599, 179, 20, 12
+	bounds: 317, 359, 20, 12
 boy/eye-white-front
-	bounds: 544, 183, 27, 13
+	bounds: 499, 358, 27, 13
 boy/eyebrow-back
-	bounds: 1002, 225, 20, 11
-	rotate: 90
+	bounds: 194, 360, 20, 11
 boy/eyebrow-front
-	bounds: 975, 234, 25, 11
+	bounds: 290, 360, 25, 11
 boy/hair-back
-	bounds: 629, 289, 122, 81
+	bounds: 929, 249, 122, 81
 	rotate: 90
 boy/hair-bangs
-	bounds: 505, 180, 70, 37
-	rotate: 90
+	bounds: 2, 2, 70, 37
 boy/hair-side
-	bounds: 979, 435, 25, 43
-	rotate: 90
+	bounds: 997, 237, 25, 43
 boy/hand-backfingers
-	bounds: 858, 183, 19, 21
+	bounds: 376, 15, 19, 21
 boy/hand-front-fingers
-	bounds: 879, 183, 19, 21
+	bounds: 786, 72, 19, 21
 boy/hat
-	bounds: 218, 121, 93, 56
+	bounds: 68, 89, 93, 56
 boy/leg-front
-	bounds: 85, 104, 31, 158
+	bounds: 90, 213, 31, 158
+	rotate: 180
 boy/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-blue-cape/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-spring-dress/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 boy/mouth-smile
-	bounds: 1015, 258, 29, 7
+	bounds: 171, 342, 29, 7
 	rotate: 90
 boy/nose
-	bounds: 323, 79, 17, 10
+	bounds: 1005, 225, 17, 10
 boy/pompom
-	bounds: 979, 462, 48, 43
-	rotate: 90
+	bounds: 157, 40, 48, 43
 boy/zip
-	bounds: 922, 231, 14, 23
-	rotate: 90
+	bounds: 883, 163, 14, 23
 girl-blue-cape/back-eyebrow
-	bounds: 527, 106, 18, 12
-	rotate: 90
+	bounds: 137, 52, 18, 12
 girl-blue-cape/body-dress
-	bounds: 2, 264, 109, 246
+	bounds: 185, 262, 109, 241
+	offsets: 0, 0, 109, 246
+	rotate: 90
 girl-blue-cape/body-ribbon
-	bounds: 576, 193, 50, 38
+	bounds: 881, 28, 50, 38
 girl-blue-cape/cape-back
-	bounds: 113, 317, 134, 193
+	bounds: 427, 237, 134, 193
+	rotate: 90
 girl-blue-cape/cape-back-up
-	bounds: 504, 305, 123, 106
+	bounds: 899, 126, 123, 106
+	rotate: 180
 girl-blue-cape/cape-ribbon
-	bounds: 396, 118, 50, 18
-	rotate: 90
+	bounds: 427, 353, 50, 18
 girl-blue-cape/cape-shoulder-back
-	bounds: 420, 243, 49, 59
+	bounds: 510, 3, 49, 59
+	rotate: 90
 girl-blue-cape/cape-shoulder-front
-	bounds: 2, 2, 62, 76
+	bounds: 310, 51, 62, 76
+	rotate: 270
 girl-blue-cape/cape-up-front
-	bounds: 118, 145, 98, 117
+	bounds: 388, 72, 98, 117
+	rotate: 90
 girl-blue-cape/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-spring-dress/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-blue-cape/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-spring-dress/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-blue-cape/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-spring-dress/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-blue-cape/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-spring-dress/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-blue-cape/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-spring-dress/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-blue-cape/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-spring-dress/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-blue-cape/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-spring-dress/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-blue-cape/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-spring-dress/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-blue-cape/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-spring-dress/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-blue-cape/eye-iris-back
-	bounds: 323, 105, 17, 17
+	bounds: 442, 34, 17, 17
 girl-blue-cape/eye-iris-front
-	bounds: 467, 107, 18, 18
+	bounds: 708, 95, 18, 18
 girl-blue-cape/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-spring-dress/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-blue-cape/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-spring-dress/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-blue-cape/front-eyebrow
-	bounds: 309, 101, 18, 12
-	rotate: 90
+	bounds: 424, 172, 18, 12
 girl-blue-cape/hair-back
-	bounds: 712, 317, 117, 98
+	bounds: 305, 162, 117, 98
 girl-blue-cape/hair-bangs
-	bounds: 313, 170, 91, 40
-	rotate: 90
+	bounds: 694, 57, 91, 40
 girl-blue-cape/hair-head-side-back
-	bounds: 544, 198, 30, 52
+	bounds: 397, 2, 30, 52
+	rotate: 90
 girl-blue-cape/hair-head-side-front
-	bounds: 466, 127, 41, 42
-girl-blue-cape/hair-side
-	bounds: 175, 2, 36, 71
+	bounds: 933, 14, 41, 42
 	rotate: 90
+girl-blue-cape/hair-side
+	bounds: 203, 11, 36, 71
+	rotate: 270
 girl-blue-cape/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-spring-dress/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-blue-cape/leg-front
-	bounds: 519, 413, 30, 158
-	rotate: 90
+	bounds: 60, 213, 30, 158
+	rotate: 180
 girl-blue-cape/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-spring-dress/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-blue-cape/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-spring-dress/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-blue-cape/sleeve-back
-	bounds: 416, 95, 42, 29
+	bounds: 157, 9, 42, 29
 girl-blue-cape/sleeve-front
-	bounds: 249, 303, 52, 119
-	rotate: 90
+	bounds: 839, 103, 52, 119
 girl-spring-dress/arm-front
-	bounds: 829, 292, 17, 111
-	rotate: 90
+	bounds: 122, 260, 17, 111
 girl-spring-dress/back-eyebrow
-	bounds: 309, 81, 18, 12
-	rotate: 90
+	bounds: 2, 199, 18, 12
 girl-spring-dress/body-up
-	bounds: 66, 2, 64, 66
+	bounds: 2, 79, 64, 66
 girl-spring-dress/cloak-down
-	bounds: 758, 227, 50, 50
+	bounds: 459, 18, 50, 50
+	rotate: 180
 girl-spring-dress/cloak-up
-	bounds: 628, 229, 64, 58
+	bounds: 247, 50, 61, 58
+	offsets: 0, 0, 64, 58
+	rotate: 270
 girl-spring-dress/eye-iris-back
-	bounds: 342, 105, 17, 17
+	bounds: 875, 109, 17, 17
 girl-spring-dress/eye-iris-front
-	bounds: 487, 107, 18, 18
+	bounds: 479, 353, 18, 18
 girl-spring-dress/front-eyebrow
-	bounds: 323, 91, 18, 12
+	bounds: 893, 210, 18, 12
 girl-spring-dress/hair-back
-	bounds: 370, 417, 147, 93
+	bounds: 834, 224, 147, 93
+	rotate: 90
 girl-spring-dress/hair-bangs
-	bounds: 829, 250, 91, 40
+	bounds: 914, 57, 91, 40
 girl-spring-dress/hair-head-side-back
-	bounds: 509, 126, 30, 52
+	bounds: 217, 341, 30, 52
+	rotate: 90
 girl-spring-dress/hair-head-side-front
-	bounds: 816, 206, 41, 42
+	bounds: 582, 15, 41, 42
+	rotate: 90
 girl-spring-dress/hair-side
-	bounds: 248, 2, 36, 71
+	bounds: 84, 14, 36, 71
 	rotate: 90
 girl-spring-dress/leg-front
-	bounds: 831, 381, 30, 158
-	rotate: 90
+	bounds: 30, 213, 30, 158
+	rotate: 180
 girl-spring-dress/neck
-	bounds: 85, 70, 20, 32
+	bounds: 283, 176, 20, 32
 girl-spring-dress/shoulder-ribbon
-	bounds: 175, 44, 36, 24
+	bounds: 207, 58, 36, 24
 girl-spring-dress/skirt
-	bounds: 2, 80, 182, 81
-	rotate: 90
+	bounds: 121, 198, 182, 81
+	rotate: 180
 girl-spring-dress/underskirt
-	bounds: 519, 445, 175, 65
+	bounds: 8, 147, 175, 65
 girl/arm-front
-	bounds: 712, 279, 36, 115
+	bounds: 907, 93, 36, 115
 	rotate: 90
 girl/back-eyebrow
-	bounds: 309, 61, 18, 12
-	rotate: 90
+	bounds: 948, 236, 18, 12
 girl/bag-base
-	bounds: 694, 219, 62, 58
+	bounds: 418, 52, 62, 58
 girl/bag-strap-front
-	bounds: 370, 304, 12, 96
-	rotate: 90
+	bounds: 141, 276, 12, 95
+	offsets: 0, 1, 12, 96
 girl/bag-top
-	bounds: 765, 175, 49, 50
+	bounds: 841, 7, 49, 50
 girl/body
-	bounds: 370, 318, 97, 132
-	rotate: 90
+	bounds: 476, 154, 97, 132
+	rotate: 270
 girl/boot-ribbon-front
-	bounds: 323, 64, 13, 13
+	bounds: 968, 235, 13, 13
 girl/eye-iris-back
-	bounds: 361, 105, 17, 17
+	bounds: 929, 231, 17, 17
 girl/eye-iris-front
-	bounds: 507, 106, 18, 18
+	bounds: 270, 353, 18, 18
 girl/eye-white-back
-	bounds: 665, 175, 20, 16
+	bounds: 162, 324, 20, 16
 girl/front-eyebrow
-	bounds: 343, 91, 18, 12
+	bounds: 527, 359, 18, 12
 girl/hair-back
-	bounds: 696, 417, 147, 93
+	bounds: 739, 224, 147, 93
+	rotate: 90
 girl/hair-bangs
-	bounds: 922, 247, 91, 40
+	bounds: 534, 57, 91, 40
 girl/hair-flap-down-front
-	bounds: 415, 171, 70, 65
-	rotate: 90
+	bounds: 506, 31, 70, 65
+	rotate: 180
 girl/hair-head-side-back
-	bounds: 991, 381, 30, 52
+	bounds: 155, 276, 30, 52
 girl/hair-head-side-front
-	bounds: 859, 206, 41, 42
+	bounds: 980, 17, 41, 42
+	rotate: 90
 girl/hair-patch
-	bounds: 132, 2, 66, 41
+	bounds: 424, 186, 66, 41
 	rotate: 90
 girl/hair-side
-	bounds: 692, 181, 36, 71
+	bounds: 265, 17, 36, 71
 	rotate: 90
 girl/hair-strand-back-1
-	bounds: 948, 289, 58, 74
+	bounds: 676, 24, 56, 74
+	offsets: 2, 0, 58, 74
 	rotate: 90
 girl/hair-strand-back-2
-	bounds: 355, 170, 91, 58
-	rotate: 90
+	bounds: 823, 54, 90, 53
+	offsets: 1, 0, 91, 58
 girl/hair-strand-back-3
-	bounds: 215, 40, 92, 79
+	bounds: 610, 138, 92, 79
 girl/hair-strand-front-1
-	bounds: 234, 263, 38, 94
+	bounds: 157, 83, 38, 94
 	rotate: 90
 girl/hair-strand-front-2
-	bounds: 576, 233, 70, 50
-	rotate: 90
+	bounds: 2, 27, 70, 50
 girl/hair-strand-front-3
-	bounds: 313, 124, 44, 81
-	rotate: 90
+	bounds: 74, 50, 44, 81
+	rotate: 270
 girl/hand-front-fingers
-	bounds: 923, 208, 19, 21
+	bounds: 162, 124, 19, 21
 girl/hat
-	bounds: 218, 179, 93, 82
+	bounds: 282, 78, 93, 82
 girl/leg-front
-	bounds: 831, 349, 30, 158
-	rotate: 90
+	bounds: 2, 213, 30, 158
 girl/pompom
-	bounds: 416, 126, 48, 43
+	bounds: 626, 40, 48, 43
 girl/scarf
-	bounds: 113, 264, 119, 51
+	bounds: 499, 98, 119, 51
 girl/scarf-back
-	bounds: 502, 252, 72, 51
+	bounds: 620, 85, 72, 51
 girl/zip
-	bounds: 816, 179, 19, 25
+	bounds: 455, 173, 19, 25

BIN
spine-godot/example-v4/assets/mix-and-match/mix-and-match.png


BIN
spine-godot/example-v4/assets/raptor/raptor-pro.skel


+ 47 - 58
spine-godot/example-v4/assets/raptor/raptor.atlas

@@ -1,99 +1,88 @@
 raptor.png
 	size: 1024, 512
 	filter: Linear, Linear
+	scale: 0.5
 back-arm
-	bounds: 829, 88, 46, 25
-	rotate: 90
+	bounds: 130, 32, 46, 25
 back-bracer
-	bounds: 195, 238, 39, 28
-	rotate: 90
+	bounds: 215, 11, 39, 28
 back-hand
-	bounds: 724, 140, 36, 34
-	rotate: 90
+	bounds: 847, 25, 36, 34
 back-knee
-	bounds: 760, 131, 49, 67
-	rotate: 90
+	bounds: 2, 8, 49, 67
 back-thigh
-	bounds: 225, 238, 39, 24
-	rotate: 90
+	bounds: 327, 8, 39, 24
 eyes-open
-	bounds: 975, 204, 47, 45
+	bounds: 232, 309, 47, 45
 front-arm
-	bounds: 969, 112, 48, 26
+	bounds: 421, 99, 48, 26
 front-bracer
-	bounds: 724, 97, 41, 29
-	rotate: 90
+	bounds: 885, 30, 41, 29
 front-hand
-	bounds: 251, 239, 41, 38
+	bounds: 784, 184, 41, 38
 front-open-hand
-	bounds: 856, 76, 43, 44
-	rotate: 90
+	bounds: 771, 310, 43, 44
 front-thigh
-	bounds: 729, 178, 57, 29
-	rotate: 90
+	bounds: 635, 192, 57, 29
 gun
-	bounds: 894, 251, 107, 103
+	bounds: 636, 83, 107, 103
 gun-nohand
-	bounds: 764, 241, 105, 102
+	bounds: 174, 83, 105, 102
 head
-	bounds: 756, 345, 136, 149
+	bounds: 291, 71, 136, 149
+	rotate: 270
 lower-leg
-	bounds: 475, 237, 73, 98
-	rotate: 90
+	bounds: 930, 123, 73, 98
 mouth-grind
-	bounds: 975, 172, 47, 30
+	bounds: 798, 29, 47, 30
 mouth-smile
-	bounds: 975, 140, 47, 30
+	bounds: 749, 29, 47, 30
 neck
-	bounds: 366, 282, 18, 21
+	bounds: 281, 333, 18, 21
 raptor-back-arm
-	bounds: 636, 97, 82, 86
-	rotate: 90
+	bounds: 470, 11, 82, 86
+	rotate: 180
 raptor-body
-	bounds: 2, 2, 632, 233
+	bounds: 2, 121, 632, 233
 raptor-front-arm
-	bounds: 871, 168, 81, 102
-	rotate: 90
+	bounds: 415, 18, 81, 102
 raptor-front-leg
-	bounds: 2, 237, 191, 257
+	bounds: 525, 163, 191, 257
+	rotate: 90
 raptor-hindleg-back
-	bounds: 195, 279, 169, 215
+	bounds: 746, 139, 169, 215
+	rotate: 180
 raptor-horn
-	bounds: 431, 312, 182, 80
-	rotate: 90
+	bounds: 2, 274, 182, 80
 raptor-horn-back
-	bounds: 513, 318, 176, 77
-	rotate: 90
+	bounds: 752, 61, 176, 77
 raptor-jaw
-	bounds: 894, 356, 126, 138
+	bounds: 553, 2, 126, 138
+	rotate: 270
 raptor-jaw-tooth
-	bounds: 294, 240, 37, 48
-	rotate: 90
+	bounds: 687, 223, 37, 48
 raptor-mouth-inside
-	bounds: 344, 241, 36, 41
-	rotate: 90
+	bounds: 178, 12, 36, 41
 raptor-saddle-strap-back
-	bounds: 575, 242, 54, 74
+	bounds: 693, 7, 54, 74
 raptor-saddle-strap-front
-	bounds: 764, 182, 57, 95
-	rotate: 90
+	bounds: 2, 77, 57, 95
 raptor-saddle-w-shadow
-	bounds: 592, 323, 162, 171
-raptor-tail-shadow
-	bounds: 366, 305, 189, 63
+	bounds: 2, 69, 162, 171
 	rotate: 90
+raptor-tail-shadow
+	bounds: 150, 25, 189, 63
 raptor-tongue
-	bounds: 387, 239, 86, 64
+	bounds: 63, 13, 86, 64
 stirrup-back
-	bounds: 829, 136, 44, 35
-	rotate: 90
+	bounds: 341, 34, 44, 35
 stirrup-front
-	bounds: 866, 121, 45, 50
-	rotate: 90
+	bounds: 185, 304, 45, 50
 stirrup-strap
-	bounds: 918, 120, 49, 46
-torso
-	bounds: 636, 181, 54, 91
+	bounds: 533, 221, 49, 46
 	rotate: 90
+torso
+	bounds: 930, 30, 54, 91
 visor
-	bounds: 631, 237, 131, 84
+	bounds: 917, 223, 131, 84
+	rotate: 90

BIN
spine-godot/example-v4/assets/raptor/raptor.png


BIN
spine-godot/example-v4/assets/spineboy/spineboy-pro.skel


+ 184 - 109
spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

+ 48 - 44
spine-godot/example-v4/assets/spineboy/spineboy.atlas

@@ -3,92 +3,96 @@ spineboy.png
 	filter: Linear, Linear
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-godot/example-v4/assets/spineboy/spineboy.png


+ 82 - 98
spine-godot/example/assets/celestial-circus/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-godot/example/assets/celestial-circus/celestial-circus.png


BIN
spine-godot/example/assets/celestial-circus/celestial-circus.skel


File diff suppressed because it is too large
+ 380 - 202
spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json


+ 184 - 192
spine-godot/example/assets/mix-and-match/mix-and-match.atlas

@@ -3,356 +3,348 @@ mix-and-match.png
 	filter: Linear, Linear
 	scale: 0.5
 base-head
-	bounds: 118, 70, 95, 73
+	bounds: 185, 123, 95, 73
 boy/arm-front
-	bounds: 831, 311, 36, 115
+	bounds: 729, 92, 36, 115
 	rotate: 90
 boy/backpack
-	bounds: 249, 357, 119, 153
+	bounds: 619, 218, 119, 153
 boy/backpack-pocket
-	bounds: 628, 193, 34, 62
+	bounds: 626, 4, 34, 62
 	rotate: 90
 boy/backpack-strap-front
-	bounds: 330, 263, 38, 88
-	rotate: 90
+	bounds: 342, 26, 38, 88
+	rotate: 270
 boy/backpack-up
-	bounds: 482, 171, 21, 70
-boy/body
-	bounds: 845, 413, 97, 132
+	bounds: 750, 12, 21, 70
 	rotate: 90
+boy/body
+	bounds: 716, 125, 97, 132
+	rotate: 270
 boy/boot-ribbon-front
-	bounds: 234, 304, 9, 11
+	bounds: 1012, 360, 9, 11
 boy/collar
-	bounds: 471, 243, 73, 29
-	rotate: 90
+	bounds: 764, 34, 73, 29
 boy/ear
-	bounds: 991, 352, 19, 23
-	rotate: 90
+	bounds: 878, 128, 19, 23
 boy/eye-back-low-eyelid
-	bounds: 66, 72, 17, 6
+	bounds: 467, 245, 17, 6
 boy/eye-back-pupil
-	bounds: 694, 279, 8, 9
-	rotate: 90
+	bounds: 1012, 327, 8, 9
 boy/eye-back-up-eyelid
-	bounds: 460, 101, 23, 5
+	bounds: 180, 348, 23, 5
 	rotate: 90
 boy/eye-back-up-eyelid-back
-	bounds: 979, 414, 19, 10
-	rotate: 90
+	bounds: 282, 255, 19, 10
 boy/eye-front-low-eyelid
-	bounds: 1015, 203, 22, 7
-	rotate: 90
+	bounds: 366, 364, 22, 7
 boy/eye-front-pupil
-	bounds: 309, 50, 9, 9
+	bounds: 1012, 349, 9, 9
 boy/eye-front-up-eyelid
-	bounds: 991, 373, 31, 6
+	bounds: 155, 340, 31, 6
+	rotate: 270
 boy/eye-front-up-eyelid-back
-	bounds: 107, 76, 26, 9
-	rotate: 90
+	bounds: 338, 362, 26, 9
 boy/eye-iris-back
-	bounds: 810, 260, 17, 17
+	bounds: 562, 12, 17, 17
 boy/eye-iris-front
-	bounds: 902, 230, 18, 18
+	bounds: 807, 73, 18, 18
 boy/eye-white-back
-	bounds: 599, 179, 20, 12
+	bounds: 317, 359, 20, 12
 boy/eye-white-front
-	bounds: 544, 183, 27, 13
+	bounds: 499, 358, 27, 13
 boy/eyebrow-back
-	bounds: 1002, 225, 20, 11
-	rotate: 90
+	bounds: 194, 360, 20, 11
 boy/eyebrow-front
-	bounds: 975, 234, 25, 11
+	bounds: 290, 360, 25, 11
 boy/hair-back
-	bounds: 629, 289, 122, 81
+	bounds: 929, 249, 122, 81
 	rotate: 90
 boy/hair-bangs
-	bounds: 505, 180, 70, 37
-	rotate: 90
+	bounds: 2, 2, 70, 37
 boy/hair-side
-	bounds: 979, 435, 25, 43
-	rotate: 90
+	bounds: 997, 237, 25, 43
 boy/hand-backfingers
-	bounds: 858, 183, 19, 21
+	bounds: 376, 15, 19, 21
 boy/hand-front-fingers
-	bounds: 879, 183, 19, 21
+	bounds: 786, 72, 19, 21
 boy/hat
-	bounds: 218, 121, 93, 56
+	bounds: 68, 89, 93, 56
 boy/leg-front
-	bounds: 85, 104, 31, 158
+	bounds: 90, 213, 31, 158
+	rotate: 180
 boy/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-blue-cape/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl-spring-dress/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 girl/mouth-close
-	bounds: 467, 100, 21, 5
+	bounds: 187, 350, 21, 5
+	rotate: 90
 boy/mouth-smile
-	bounds: 1015, 258, 29, 7
+	bounds: 171, 342, 29, 7
 	rotate: 90
 boy/nose
-	bounds: 323, 79, 17, 10
+	bounds: 1005, 225, 17, 10
 boy/pompom
-	bounds: 979, 462, 48, 43
-	rotate: 90
+	bounds: 157, 40, 48, 43
 boy/zip
-	bounds: 922, 231, 14, 23
-	rotate: 90
+	bounds: 883, 163, 14, 23
 girl-blue-cape/back-eyebrow
-	bounds: 527, 106, 18, 12
-	rotate: 90
+	bounds: 137, 52, 18, 12
 girl-blue-cape/body-dress
-	bounds: 2, 264, 109, 246
+	bounds: 185, 262, 109, 241
+	offsets: 0, 0, 109, 246
+	rotate: 90
 girl-blue-cape/body-ribbon
-	bounds: 576, 193, 50, 38
+	bounds: 881, 28, 50, 38
 girl-blue-cape/cape-back
-	bounds: 113, 317, 134, 193
+	bounds: 427, 237, 134, 193
+	rotate: 90
 girl-blue-cape/cape-back-up
-	bounds: 504, 305, 123, 106
+	bounds: 899, 126, 123, 106
+	rotate: 180
 girl-blue-cape/cape-ribbon
-	bounds: 396, 118, 50, 18
-	rotate: 90
+	bounds: 427, 353, 50, 18
 girl-blue-cape/cape-shoulder-back
-	bounds: 420, 243, 49, 59
+	bounds: 510, 3, 49, 59
+	rotate: 90
 girl-blue-cape/cape-shoulder-front
-	bounds: 2, 2, 62, 76
+	bounds: 310, 51, 62, 76
+	rotate: 270
 girl-blue-cape/cape-up-front
-	bounds: 118, 145, 98, 117
+	bounds: 388, 72, 98, 117
+	rotate: 90
 girl-blue-cape/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-spring-dress/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl/ear
-	bounds: 837, 181, 19, 23
+	bounds: 376, 137, 19, 23
 girl-blue-cape/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-spring-dress/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl/eye-back-low-eyelid
-	bounds: 810, 252, 17, 6
+	bounds: 427, 345, 17, 6
 girl-blue-cape/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-spring-dress/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl/eye-back-pupil
-	bounds: 309, 40, 8, 9
-	rotate: 90
+	bounds: 1012, 338, 8, 9
 girl-blue-cape/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-spring-dress/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl/eye-back-up-eyelid
-	bounds: 573, 179, 24, 12
+	bounds: 812, 210, 24, 12
 girl-blue-cape/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-spring-dress/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl/eye-back-up-eyelid-back
-	bounds: 380, 105, 17, 11
-	rotate: 90
+	bounds: 427, 254, 17, 11
 girl-blue-cape/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-spring-dress/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl/eye-front-low-eyelid
-	bounds: 1016, 353, 18, 6
-	rotate: 90
+	bounds: 716, 365, 18, 6
 girl-blue-cape/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-spring-dress/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl/eye-front-pupil
-	bounds: 363, 94, 9, 9
+	bounds: 547, 362, 9, 9
 girl-blue-cape/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-spring-dress/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl/eye-front-up-eyelid
-	bounds: 679, 413, 30, 14
-	rotate: 90
+	bounds: 74, 15, 30, 14
 girl-blue-cape/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-spring-dress/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl/eye-front-up-eyelid-back
-	bounds: 947, 234, 26, 11
+	bounds: 582, 149, 26, 11
 girl-blue-cape/eye-iris-back
-	bounds: 323, 105, 17, 17
+	bounds: 442, 34, 17, 17
 girl-blue-cape/eye-iris-front
-	bounds: 467, 107, 18, 18
+	bounds: 708, 95, 18, 18
 girl-blue-cape/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-spring-dress/eye-white-back
-	bounds: 621, 175, 20, 16
+	bounds: 984, 232, 20, 16
 girl-blue-cape/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-spring-dress/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl/eye-white-front
-	bounds: 643, 175, 20, 16
+	bounds: 608, 224, 20, 16
 girl-blue-cape/front-eyebrow
-	bounds: 309, 101, 18, 12
-	rotate: 90
+	bounds: 424, 172, 18, 12
 girl-blue-cape/hair-back
-	bounds: 712, 317, 117, 98
+	bounds: 305, 162, 117, 98
 girl-blue-cape/hair-bangs
-	bounds: 313, 170, 91, 40
-	rotate: 90
+	bounds: 694, 57, 91, 40
 girl-blue-cape/hair-head-side-back
-	bounds: 544, 198, 30, 52
+	bounds: 397, 2, 30, 52
+	rotate: 90
 girl-blue-cape/hair-head-side-front
-	bounds: 466, 127, 41, 42
-girl-blue-cape/hair-side
-	bounds: 175, 2, 36, 71
+	bounds: 933, 14, 41, 42
 	rotate: 90
+girl-blue-cape/hair-side
+	bounds: 203, 11, 36, 71
+	rotate: 270
 girl-blue-cape/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-spring-dress/hand-front-fingers
-	bounds: 902, 207, 19, 21
+	bounds: 694, 115, 19, 21
 girl-blue-cape/leg-front
-	bounds: 519, 413, 30, 158
-	rotate: 90
+	bounds: 60, 213, 30, 158
+	rotate: 180
 girl-blue-cape/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-spring-dress/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl/mouth-smile
-	bounds: 1015, 227, 29, 7
+	bounds: 162, 342, 29, 7
 	rotate: 90
 girl-blue-cape/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-spring-dress/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl/nose
-	bounds: 342, 82, 11, 7
+	bounds: 558, 364, 11, 7
 girl-blue-cape/sleeve-back
-	bounds: 416, 95, 42, 29
+	bounds: 157, 9, 42, 29
 girl-blue-cape/sleeve-front
-	bounds: 249, 303, 52, 119
-	rotate: 90
+	bounds: 839, 103, 52, 119
 girl-spring-dress/arm-front
-	bounds: 829, 292, 17, 111
-	rotate: 90
+	bounds: 122, 260, 17, 111
 girl-spring-dress/back-eyebrow
-	bounds: 309, 81, 18, 12
-	rotate: 90
+	bounds: 2, 199, 18, 12
 girl-spring-dress/body-up
-	bounds: 66, 2, 64, 66
+	bounds: 2, 79, 64, 66
 girl-spring-dress/cloak-down
-	bounds: 758, 227, 50, 50
+	bounds: 459, 18, 50, 50
+	rotate: 180
 girl-spring-dress/cloak-up
-	bounds: 628, 229, 64, 58
+	bounds: 247, 50, 61, 58
+	offsets: 0, 0, 64, 58
+	rotate: 270
 girl-spring-dress/eye-iris-back
-	bounds: 342, 105, 17, 17
+	bounds: 875, 109, 17, 17
 girl-spring-dress/eye-iris-front
-	bounds: 487, 107, 18, 18
+	bounds: 479, 353, 18, 18
 girl-spring-dress/front-eyebrow
-	bounds: 323, 91, 18, 12
+	bounds: 893, 210, 18, 12
 girl-spring-dress/hair-back
-	bounds: 370, 417, 147, 93
+	bounds: 834, 224, 147, 93
+	rotate: 90
 girl-spring-dress/hair-bangs
-	bounds: 829, 250, 91, 40
+	bounds: 914, 57, 91, 40
 girl-spring-dress/hair-head-side-back
-	bounds: 509, 126, 30, 52
+	bounds: 217, 341, 30, 52
+	rotate: 90
 girl-spring-dress/hair-head-side-front
-	bounds: 816, 206, 41, 42
+	bounds: 582, 15, 41, 42
+	rotate: 90
 girl-spring-dress/hair-side
-	bounds: 248, 2, 36, 71
+	bounds: 84, 14, 36, 71
 	rotate: 90
 girl-spring-dress/leg-front
-	bounds: 831, 381, 30, 158
-	rotate: 90
+	bounds: 30, 213, 30, 158
+	rotate: 180
 girl-spring-dress/neck
-	bounds: 85, 70, 20, 32
+	bounds: 283, 176, 20, 32
 girl-spring-dress/shoulder-ribbon
-	bounds: 175, 44, 36, 24
+	bounds: 207, 58, 36, 24
 girl-spring-dress/skirt
-	bounds: 2, 80, 182, 81
-	rotate: 90
+	bounds: 121, 198, 182, 81
+	rotate: 180
 girl-spring-dress/underskirt
-	bounds: 519, 445, 175, 65
+	bounds: 8, 147, 175, 65
 girl/arm-front
-	bounds: 712, 279, 36, 115
+	bounds: 907, 93, 36, 115
 	rotate: 90
 girl/back-eyebrow
-	bounds: 309, 61, 18, 12
-	rotate: 90
+	bounds: 948, 236, 18, 12
 girl/bag-base
-	bounds: 694, 219, 62, 58
+	bounds: 418, 52, 62, 58
 girl/bag-strap-front
-	bounds: 370, 304, 12, 96
-	rotate: 90
+	bounds: 141, 276, 12, 95
+	offsets: 0, 1, 12, 96
 girl/bag-top
-	bounds: 765, 175, 49, 50
+	bounds: 841, 7, 49, 50
 girl/body
-	bounds: 370, 318, 97, 132
-	rotate: 90
+	bounds: 476, 154, 97, 132
+	rotate: 270
 girl/boot-ribbon-front
-	bounds: 323, 64, 13, 13
+	bounds: 968, 235, 13, 13
 girl/eye-iris-back
-	bounds: 361, 105, 17, 17
+	bounds: 929, 231, 17, 17
 girl/eye-iris-front
-	bounds: 507, 106, 18, 18
+	bounds: 270, 353, 18, 18
 girl/eye-white-back
-	bounds: 665, 175, 20, 16
+	bounds: 162, 324, 20, 16
 girl/front-eyebrow
-	bounds: 343, 91, 18, 12
+	bounds: 527, 359, 18, 12
 girl/hair-back
-	bounds: 696, 417, 147, 93
+	bounds: 739, 224, 147, 93
+	rotate: 90
 girl/hair-bangs
-	bounds: 922, 247, 91, 40
+	bounds: 534, 57, 91, 40
 girl/hair-flap-down-front
-	bounds: 415, 171, 70, 65
-	rotate: 90
+	bounds: 506, 31, 70, 65
+	rotate: 180
 girl/hair-head-side-back
-	bounds: 991, 381, 30, 52
+	bounds: 155, 276, 30, 52
 girl/hair-head-side-front
-	bounds: 859, 206, 41, 42
+	bounds: 980, 17, 41, 42
+	rotate: 90
 girl/hair-patch
-	bounds: 132, 2, 66, 41
+	bounds: 424, 186, 66, 41
 	rotate: 90
 girl/hair-side
-	bounds: 692, 181, 36, 71
+	bounds: 265, 17, 36, 71
 	rotate: 90
 girl/hair-strand-back-1
-	bounds: 948, 289, 58, 74
+	bounds: 676, 24, 56, 74
+	offsets: 2, 0, 58, 74
 	rotate: 90
 girl/hair-strand-back-2
-	bounds: 355, 170, 91, 58
-	rotate: 90
+	bounds: 823, 54, 90, 53
+	offsets: 1, 0, 91, 58
 girl/hair-strand-back-3
-	bounds: 215, 40, 92, 79
+	bounds: 610, 138, 92, 79
 girl/hair-strand-front-1
-	bounds: 234, 263, 38, 94
+	bounds: 157, 83, 38, 94
 	rotate: 90
 girl/hair-strand-front-2
-	bounds: 576, 233, 70, 50
-	rotate: 90
+	bounds: 2, 27, 70, 50
 girl/hair-strand-front-3
-	bounds: 313, 124, 44, 81
-	rotate: 90
+	bounds: 74, 50, 44, 81
+	rotate: 270
 girl/hand-front-fingers
-	bounds: 923, 208, 19, 21
+	bounds: 162, 124, 19, 21
 girl/hat
-	bounds: 218, 179, 93, 82
+	bounds: 282, 78, 93, 82
 girl/leg-front
-	bounds: 831, 349, 30, 158
-	rotate: 90
+	bounds: 2, 213, 30, 158
 girl/pompom
-	bounds: 416, 126, 48, 43
+	bounds: 626, 40, 48, 43
 girl/scarf
-	bounds: 113, 264, 119, 51
+	bounds: 499, 98, 119, 51
 girl/scarf-back
-	bounds: 502, 252, 72, 51
+	bounds: 620, 85, 72, 51
 girl/zip
-	bounds: 816, 179, 19, 25
+	bounds: 455, 173, 19, 25

BIN
spine-godot/example/assets/mix-and-match/mix-and-match.png


BIN
spine-godot/example/assets/raptor/raptor-pro.skel


+ 47 - 58
spine-godot/example/assets/raptor/raptor.atlas

@@ -1,99 +1,88 @@
 raptor.png
 	size: 1024, 512
 	filter: Linear, Linear
+	scale: 0.5
 back-arm
-	bounds: 829, 88, 46, 25
-	rotate: 90
+	bounds: 130, 32, 46, 25
 back-bracer
-	bounds: 195, 238, 39, 28
-	rotate: 90
+	bounds: 215, 11, 39, 28
 back-hand
-	bounds: 724, 140, 36, 34
-	rotate: 90
+	bounds: 847, 25, 36, 34
 back-knee
-	bounds: 760, 131, 49, 67
-	rotate: 90
+	bounds: 2, 8, 49, 67
 back-thigh
-	bounds: 225, 238, 39, 24
-	rotate: 90
+	bounds: 327, 8, 39, 24
 eyes-open
-	bounds: 975, 204, 47, 45
+	bounds: 232, 309, 47, 45
 front-arm
-	bounds: 969, 112, 48, 26
+	bounds: 421, 99, 48, 26
 front-bracer
-	bounds: 724, 97, 41, 29
-	rotate: 90
+	bounds: 885, 30, 41, 29
 front-hand
-	bounds: 251, 239, 41, 38
+	bounds: 784, 184, 41, 38
 front-open-hand
-	bounds: 856, 76, 43, 44
-	rotate: 90
+	bounds: 771, 310, 43, 44
 front-thigh
-	bounds: 729, 178, 57, 29
-	rotate: 90
+	bounds: 635, 192, 57, 29
 gun
-	bounds: 894, 251, 107, 103
+	bounds: 636, 83, 107, 103
 gun-nohand
-	bounds: 764, 241, 105, 102
+	bounds: 174, 83, 105, 102
 head
-	bounds: 756, 345, 136, 149
+	bounds: 291, 71, 136, 149
+	rotate: 270
 lower-leg
-	bounds: 475, 237, 73, 98
-	rotate: 90
+	bounds: 930, 123, 73, 98
 mouth-grind
-	bounds: 975, 172, 47, 30
+	bounds: 798, 29, 47, 30
 mouth-smile
-	bounds: 975, 140, 47, 30
+	bounds: 749, 29, 47, 30
 neck
-	bounds: 366, 282, 18, 21
+	bounds: 281, 333, 18, 21
 raptor-back-arm
-	bounds: 636, 97, 82, 86
-	rotate: 90
+	bounds: 470, 11, 82, 86
+	rotate: 180
 raptor-body
-	bounds: 2, 2, 632, 233
+	bounds: 2, 121, 632, 233
 raptor-front-arm
-	bounds: 871, 168, 81, 102
-	rotate: 90
+	bounds: 415, 18, 81, 102
 raptor-front-leg
-	bounds: 2, 237, 191, 257
+	bounds: 525, 163, 191, 257
+	rotate: 90
 raptor-hindleg-back
-	bounds: 195, 279, 169, 215
+	bounds: 746, 139, 169, 215
+	rotate: 180
 raptor-horn
-	bounds: 431, 312, 182, 80
-	rotate: 90
+	bounds: 2, 274, 182, 80
 raptor-horn-back
-	bounds: 513, 318, 176, 77
-	rotate: 90
+	bounds: 752, 61, 176, 77
 raptor-jaw
-	bounds: 894, 356, 126, 138
+	bounds: 553, 2, 126, 138
+	rotate: 270
 raptor-jaw-tooth
-	bounds: 294, 240, 37, 48
-	rotate: 90
+	bounds: 687, 223, 37, 48
 raptor-mouth-inside
-	bounds: 344, 241, 36, 41
-	rotate: 90
+	bounds: 178, 12, 36, 41
 raptor-saddle-strap-back
-	bounds: 575, 242, 54, 74
+	bounds: 693, 7, 54, 74
 raptor-saddle-strap-front
-	bounds: 764, 182, 57, 95
-	rotate: 90
+	bounds: 2, 77, 57, 95
 raptor-saddle-w-shadow
-	bounds: 592, 323, 162, 171
-raptor-tail-shadow
-	bounds: 366, 305, 189, 63
+	bounds: 2, 69, 162, 171
 	rotate: 90
+raptor-tail-shadow
+	bounds: 150, 25, 189, 63
 raptor-tongue
-	bounds: 387, 239, 86, 64
+	bounds: 63, 13, 86, 64
 stirrup-back
-	bounds: 829, 136, 44, 35
-	rotate: 90
+	bounds: 341, 34, 44, 35
 stirrup-front
-	bounds: 866, 121, 45, 50
-	rotate: 90
+	bounds: 185, 304, 45, 50
 stirrup-strap
-	bounds: 918, 120, 49, 46
-torso
-	bounds: 636, 181, 54, 91
+	bounds: 533, 221, 49, 46
 	rotate: 90
+torso
+	bounds: 930, 30, 54, 91
 visor
-	bounds: 631, 237, 131, 84
+	bounds: 917, 223, 131, 84
+	rotate: 90

BIN
spine-godot/example/assets/raptor/raptor.png


BIN
spine-godot/example/assets/spineboy/spineboy-pro.skel


+ 184 - 109
spine-godot/example/assets/spineboy/spineboy-pro.spine-json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "dr3Kr/vMgPA",
-	"spine": "4.2.22",
+	"hash": "/v2SWUlocF0",
+	"spine": "4.3.37-beta",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,
@@ -318,144 +318,219 @@
 	{ "name": "muzzle-ring3", "bone": "muzzle-ring3", "color": "d8baffff", "blend": "additive" },
 	{ "name": "muzzle-ring4", "bone": "muzzle-ring4", "color": "d8baffff", "blend": "additive" }
 ],
-"ik": [
+"constraints": [
 	{
-		"name": "aim-ik",
-		"order": 13,
-		"bones": [ "rear-upper-arm" ],
-		"target": "crosshair",
-		"mix": 0
+		"type": "transform",
+		"name": "shoulder",
+		"source": "front-shoulder",
+		"bones": [ "back-shoulder" ],
+		"x": 40.17,
+		"y": -1.66,
+		"properties": {
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixX": -1
 	},
 	{
-		"name": "aim-torso-ik",
-		"order": 8,
-		"bones": [ "aim-constraint-target" ],
-		"target": "crosshair"
+		"type": "ik",
+		"name": "board-ik",
+		"target": "board-ik",
+		"bones": [ "hoverboard-controller" ]
 	},
 	{
-		"name": "board-ik",
-		"order": 1,
-		"bones": [ "hoverboard-controller" ],
-		"target": "board-ik"
+		"type": "transform",
+		"name": "front-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "front-foot-target" ],
+		"x": -69.8,
+		"y": 20.7,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
-		"name": "front-foot-ik",
-		"order": 6,
-		"bones": [ "front-foot" ],
-		"target": "front-foot-target"
+		"type": "transform",
+		"name": "rear-foot-board-transform",
+		"source": "hoverboard-controller",
+		"bones": [ "rear-foot-target" ],
+		"x": 86.6,
+		"y": 21.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			},
+			"x": {
+				"to": {
+					"x": { "max": 100, "scale": 1 }
+				}
+			},
+			"y": {
+				"to": {
+					"y": { "max": 100, "scale": 1 }
+				}
+			},
+			"scaleX": {
+				"to": {
+					"scaleX": { "scale": 1 }
+				}
+			},
+			"scaleY": {
+				"to": {
+					"scaleY": { "scale": 1 }
+				}
+			},
+			"shearY": {
+				"to": {
+					"shearY": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0,
+		"mixX": 0,
+		"mixScaleX": 0,
+		"mixShearY": 0
 	},
 	{
+		"type": "ik",
 		"name": "front-leg-ik",
-		"order": 4,
-		"bones": [ "front-thigh", "front-shin" ],
 		"target": "front-leg-target",
+		"bones": [ "front-thigh", "front-shin" ],
 		"bendPositive": false
 	},
 	{
-		"name": "rear-foot-ik",
-		"order": 7,
-		"bones": [ "rear-foot" ],
-		"target": "rear-foot-target"
-	},
-	{
+		"type": "ik",
 		"name": "rear-leg-ik",
-		"order": 5,
-		"bones": [ "rear-thigh", "rear-shin" ],
 		"target": "rear-leg-target",
+		"bones": [ "rear-thigh", "rear-shin" ],
 		"bendPositive": false
-	}
-],
-"transform": [
+	},
 	{
-		"name": "aim-front-arm-transform",
-		"order": 11,
-		"bones": [ "front-upper-arm" ],
-		"target": "aim-constraint-target",
-		"rotation": -180,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "front-foot-ik",
+		"target": "front-foot-target",
+		"bones": [ "front-foot" ]
 	},
 	{
-		"name": "aim-head-transform",
-		"order": 10,
-		"bones": [ "head" ],
-		"target": "aim-constraint-target",
-		"rotation": 84.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "rear-foot-ik",
+		"target": "rear-foot-target",
+		"bones": [ "rear-foot" ]
 	},
 	{
-		"name": "aim-rear-arm-transform",
-		"order": 12,
-		"bones": [ "rear-upper-arm" ],
-		"target": "aim-constraint-target",
-		"x": 57.7,
-		"y": 56.4,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-torso-ik",
+		"target": "crosshair",
+		"bones": [ "aim-constraint-target" ]
 	},
 	{
+		"type": "transform",
 		"name": "aim-torso-transform",
-		"order": 9,
+		"source": "aim-constraint-target",
 		"bones": [ "torso" ],
-		"target": "aim-constraint-target",
 		"rotation": 69.5,
-		"shearY": -36,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "front-foot-board-transform",
-		"order": 2,
-		"bones": [ "front-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": -69.8,
-		"y": 20.7,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-head-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "head" ],
+		"rotation": 84.3,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "rear-foot-board-transform",
-		"order": 3,
-		"bones": [ "rear-foot-target" ],
-		"target": "hoverboard-controller",
-		"x": 86.6,
-		"y": 21.3,
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "transform",
+		"name": "aim-front-arm-transform",
+		"source": "aim-constraint-target",
+		"bones": [ "front-upper-arm" ],
+		"rotation": -180,
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	},
 	{
-		"name": "shoulder",
-		"bones": [ "back-shoulder" ],
-		"target": "front-shoulder",
-		"x": 40.17,
-		"y": -1.66,
-		"mixRotate": 0,
-		"mixX": -1,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"type": "ik",
+		"name": "aim-ik",
+		"target": "crosshair",
+		"bones": [ "rear-upper-arm" ],
+		"mix": 0
 	},
 	{
+		"type": "transform",
 		"name": "toes-board",
-		"order": 14,
+		"source": "hoverboard-controller",
 		"bones": [ "front-foot-tip", "back-foot-tip" ],
-		"target": "hoverboard-controller",
-		"mixRotate": 0,
-		"mixX": 0,
-		"mixScaleX": 0,
-		"mixShearY": 0
+		"properties": {
+			"rotate": {
+				"to": {
+					"rotate": { "max": 100, "scale": 1 }
+				}
+			}
+		},
+		"mixRotate": 0
 	}
 ],
 "skins": [
@@ -466,8 +541,8 @@
 				"clipping": {
 					"type": "clipping",
 					"end": "head-bb",
-					"vertexCount": 9,
-					"vertices": [ 66.76, 509.48, 19.98, 434.54, 5.34, 336.28, 22.19, 247.93, 77.98, 159.54, 182.21, -97.56, 1452.26, -99.8, 1454.33, 843.61, 166.57, 841.02 ],
+					"vertexCount": 3,
+					"vertices": [ 18.89, -228.46, 1471.52, 140.96, 34.01, 930.06 ],
 					"color": "ce3a3aff"
 				}
 			},
@@ -877,13 +952,13 @@
 		},
 		"transform": {
 			"aim-front-arm-transform": [
-				{ "mixRotate": 0.784, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.784 }
 			],
 			"aim-head-transform": [
-				{ "mixRotate": 0.659, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.659 }
 			],
 			"aim-torso-transform": [
-				{ "mixRotate": 0.423, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{ "mixRotate": 0.423 }
 			]
 		}
 	},
@@ -3492,7 +3567,7 @@
 				{}
 			],
 			"toes-board": [
-				{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
+				{}
 			]
 		},
 		"attachments": {

+ 48 - 44
spine-godot/example/assets/spineboy/spineboy.atlas

@@ -3,92 +3,96 @@ spineboy.png
 	filter: Linear, Linear
 	scale: 0.5
 crosshair
-	bounds: 352, 7, 45, 45
+	bounds: 263, 11, 45, 45
 eye-indifferent
-	bounds: 862, 105, 47, 45
+	bounds: 214, 11, 47, 45
 eye-surprised
-	bounds: 505, 79, 47, 45
+	bounds: 965, 33, 47, 45
+	rotate: 90
 front-bracer
-	bounds: 826, 66, 29, 40
+	bounds: 2, 5, 29, 40
+	rotate: 90
 front-fist-closed
-	bounds: 786, 65, 38, 41
+	bounds: 505, 3, 38, 41
+	rotate: 90
 front-fist-open
-	bounds: 710, 51, 43, 44
+	bounds: 790, 9, 43, 44
 	rotate: 90
 front-foot
-	bounds: 210, 6, 63, 35
+	bounds: 149, 21, 63, 35
 front-shin
-	bounds: 665, 128, 41, 92
+	bounds: 505, 43, 41, 92
 	rotate: 90
 front-thigh
-	bounds: 2, 2, 23, 56
+	bounds: 359, 14, 23, 56
 	rotate: 90
 front-upper-arm
-	bounds: 250, 205, 23, 49
+	bounds: 955, 8, 23, 49
+	rotate: 90
 goggles
-	bounds: 665, 171, 131, 83
+	bounds: 180, 58, 131, 83
 gun
-	bounds: 798, 152, 105, 102
+	bounds: 313, 39, 105, 102
 head
-	bounds: 2, 27, 136, 149
+	bounds: 29, 83, 136, 149
+	rotate: 90
 hoverboard-board
-	bounds: 2, 178, 246, 76
+	bounds: 180, 143, 246, 76
 hoverboard-thruster
-	bounds: 722, 96, 30, 32
-	rotate: 90
+	bounds: 790, 57, 30, 32
 hoverglow-small
-	bounds: 275, 81, 137, 38
+	bounds: 826, 54, 137, 38
 mouth-grind
-	bounds: 614, 97, 47, 30
+	bounds: 707, 8, 47, 30
 mouth-oooo
-	bounds: 612, 65, 47, 30
+	bounds: 658, 8, 47, 30
 mouth-smile
-	bounds: 661, 64, 47, 30
+	bounds: 548, 11, 47, 30
 muzzle-glow
-	bounds: 382, 54, 25, 25
+	bounds: 997, 194, 25, 25
 muzzle-ring
-	bounds: 275, 54, 25, 105
-	rotate: 90
+	bounds: 2, 114, 25, 105
 muzzle01
-	bounds: 911, 95, 67, 40
+	bounds: 965, 82, 67, 40
 	rotate: 90
 muzzle02
-	bounds: 792, 108, 68, 42
-muzzle03
-	bounds: 956, 171, 83, 53
+	bounds: 953, 151, 68, 42
 	rotate: 90
+muzzle03
+	bounds: 420, 31, 83, 53
 muzzle04
-	bounds: 275, 7, 75, 45
+	bounds: 2, 36, 75, 45
 muzzle05
-	bounds: 140, 3, 68, 38
+	bounds: 79, 43, 68, 38
 neck
-	bounds: 250, 182, 18, 21
+	bounds: 997, 171, 18, 21
 portal-bg
-	bounds: 140, 43, 133, 133
+	bounds: 563, 86, 133, 133
 portal-flare1
-	bounds: 554, 65, 56, 30
+	bounds: 79, 11, 56, 30
 portal-flare2
-	bounds: 759, 112, 57, 31
-	rotate: 90
+	bounds: 836, 21, 57, 31
 portal-flare3
-	bounds: 554, 97, 58, 30
+	bounds: 895, 22, 58, 30
 portal-shade
-	bounds: 275, 121, 133, 133
+	bounds: 428, 86, 133, 133
 portal-streaks1
-	bounds: 410, 126, 126, 128
+	bounds: 698, 91, 126, 128
 portal-streaks2
-	bounds: 538, 129, 125, 125
+	bounds: 826, 94, 125, 125
 rear-bracer
-	bounds: 857, 67, 28, 36
+	bounds: 756, 2, 28, 36
 rear-foot
-	bounds: 663, 96, 57, 30
+	bounds: 599, 14, 57, 30
 rear-shin
-	bounds: 414, 86, 38, 89
+	bounds: 599, 46, 38, 89
 	rotate: 90
 rear-thigh
-	bounds: 756, 63, 28, 47
+	bounds: 310, 9, 28, 47
+	rotate: 90
 rear-upper-arm
-	bounds: 60, 5, 20, 44
+	bounds: 417, 9, 20, 44
 	rotate: 90
 torso
-	bounds: 905, 164, 49, 90
+	bounds: 698, 40, 49, 90
+	rotate: 90

BIN
spine-godot/example/assets/spineboy/spineboy.png


+ 82 - 98
spine-haxe/example/assets/celestial-circus-pma.atlas

@@ -4,171 +4,155 @@ celestial-circus-pma.png
 	pma: true
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-haxe/example/assets/celestial-circus-pma.png


File diff suppressed because it is too large
+ 157 - 277
spine-haxe/example/assets/celestial-circus-pro.json


BIN
spine-haxe/example/assets/celestial-circus-pro.skel


+ 82 - 98
spine-haxe/example/assets/celestial-circus.atlas

@@ -3,171 +3,155 @@ celestial-circus.png
 	filter: Linear, Linear
 	scale: 0.4
 arm-back-down
-	bounds: 324, 401, 38, 82
-	rotate: 90
+	bounds: 971, 683, 38, 82
 arm-back-up
-	bounds: 290, 44, 83, 116
-	rotate: 90
+	bounds: 939, 44, 83, 116
 arm-front-down
-	bounds: 706, 2, 36, 78
-	rotate: 90
+	bounds: 971, 603, 36, 78
 arm-front-up
-	bounds: 860, 138, 77, 116
+	bounds: 289, 22, 77, 116
+	rotate: 90
 bench
-	bounds: 725, 256, 189, 48
+	bounds: 586, 47, 189, 48
 body-bottom
-	bounds: 879, 868, 154, 124
-	rotate: 90
+	bounds: 868, 270, 154, 124
 body-top
-	bounds: 725, 128, 126, 133
+	bounds: 2, 156, 126, 132
+	offsets: 0, 0, 126, 133
 	rotate: 90
 chest
-	bounds: 408, 26, 104, 93
+	bounds: 490, 267, 104, 93
+	rotate: 180
 cloud-back
-	bounds: 752, 378, 202, 165
-cloud-front
-	bounds: 2, 2, 325, 196
+	bounds: 804, 563, 202, 165
 	rotate: 90
+cloud-front
+	bounds: 606, 440, 325, 196
+	rotate: 270
 collar
-	bounds: 786, 13, 47, 26
+	bounds: 373, 739, 47, 26
 ear
-	bounds: 1002, 643, 20, 28
+	bounds: 106, 737, 20, 28
 eye-back-shadow
-	bounds: 428, 395, 14, 10
+	bounds: 233, 755, 14, 10
 eye-front-shadow
-	bounds: 704, 529, 24, 14
+	bounds: 128, 751, 24, 14
 eye-reflex-back
-	bounds: 860, 128, 8, 7
-	rotate: 90
+	bounds: 787, 758, 8, 7
 eye-reflex-front
-	bounds: 726, 386, 10, 7
+	bounds: 154, 758, 10, 7
 eye-white-back
-	bounds: 835, 23, 13, 16
+	bounds: 616, 749, 13, 16
 eye-white-front
-	bounds: 1005, 1000, 22, 17
-	rotate: 90
+	bounds: 477, 748, 22, 17
 eyelashes-down-back
-	bounds: 232, 329, 11, 6
-	rotate: 90
+	bounds: 655, 759, 11, 6
 eyelashes-down-front
-	bounds: 913, 851, 15, 6
-	rotate: 90
+	bounds: 549, 759, 15, 6
 eyelashes-top-back
-	bounds: 408, 395, 18, 10
+	bounds: 353, 755, 18, 10
 eyelashes-top-front
-	bounds: 702, 179, 30, 16
-	rotate: 90
+	bounds: 749, 749, 30, 16
 face
-	bounds: 514, 26, 93, 102
-	rotate: 90
+	bounds: 775, 277, 91, 102
+	offsets: 2, 0, 93, 102
 feathers-back
-	bounds: 954, 625, 46, 46
+	bounds: 192, 611, 46, 46
 feathers-front
-	bounds: 706, 40, 72, 86
+	bounds: 415, 679, 72, 86
 fringe-middle-back
-	bounds: 200, 6, 33, 52
-	rotate: 90
+	bounds: 794, 509, 33, 52
 fringe-middle-front
-	bounds: 878, 76, 60, 50
-	rotate: 90
+	bounds: 679, 202, 60, 50
 fringe-side-back
-	bounds: 780, 41, 27, 94
-	rotate: 90
+	bounds: 407, 5, 27, 94
 fringe-side-front
-	bounds: 939, 161, 26, 93
+	bounds: 14, 331, 26, 93
 glove-bottom-back
-	bounds: 954, 572, 51, 41
-	rotate: 90
+	bounds: 14, 681, 51, 41
 glove-bottom-front
-	bounds: 916, 256, 47, 48
+	bounds: 313, 288, 47, 48
 hair-back-1
-	bounds: 444, 395, 132, 306
-	rotate: 90
+	bounds: 716, 91, 132, 306
+	rotate: 270
 hair-back-2
-	bounds: 438, 211, 80, 285
+	bounds: 124, 100, 80, 285
 	rotate: 90
 hair-back-3
-	bounds: 719, 306, 70, 268
-	rotate: 90
+	bounds: 410, 78, 70, 268
+	rotate: 270
 hair-back-4
-	bounds: 438, 121, 88, 262
+	bounds: 42, 250, 88, 262
 	rotate: 90
 hair-back-5
-	bounds: 438, 293, 88, 279
+	bounds: 320, 141, 88, 279
 	rotate: 90
 hair-back-6
-	bounds: 200, 41, 88, 286
+	bounds: 2, 36, 88, 286
+	rotate: 90
 hair-hat-shadow
-	bounds: 232, 398, 90, 41
+	bounds: 14, 724, 90, 41
 hand-back
-	bounds: 954, 673, 60, 47
-	rotate: 90
+	bounds: 2, 42, 60, 47
 hand-front
-	bounds: 967, 172, 53, 60
+	bounds: 909, 208, 53, 60
 hat-back
-	bounds: 954, 802, 64, 45
-	rotate: 90
+	bounds: 741, 189, 64, 45
 hat-front
-	bounds: 780, 70, 96, 56
+	bounds: 926, 396, 96, 56
 head-back
-	bounds: 618, 17, 102, 86
-	rotate: 90
+	bounds: 777, 2, 102, 86
 jabot
-	bounds: 967, 234, 70, 55
-	rotate: 90
+	bounds: 692, 384, 70, 55
 leg-back
-	bounds: 232, 441, 210, 333
+	bounds: 362, 164, 210, 333
+	rotate: 90
 leg-front
-	bounds: 444, 529, 258, 320
+	bounds: 590, 181, 258, 320
+	rotate: 90
 logo-brooch
-	bounds: 954, 545, 16, 25
+	bounds: 584, 740, 16, 25
 mouth
-	bounds: 408, 121, 22, 6
+	bounds: 631, 759, 22, 6
 neck
-	bounds: 232, 342, 39, 56
-	rotate: 90
+	bounds: 597, 441, 39, 56
 nose
-	bounds: 742, 529, 6, 7
-	rotate: 90
+	bounds: 556, 750, 6, 7
 nose-highlight
-	bounds: 719, 300, 4, 4
+	bounds: 166, 761, 4, 4
 nose-shadow
-	bounds: 869, 128, 7, 8
+	bounds: 778, 757, 7, 8
 pupil-back
-	bounds: 730, 529, 10, 14
+	bounds: 442, 751, 10, 14
 pupil-front
-	bounds: 254, 21, 12, 18
+	bounds: 602, 747, 12, 18
 rope-back
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front
-	bounds: 232, 383, 10, 492
-	rotate: 90
+	bounds: 2, 273, 10, 492
 rope-front-bottom
-	bounds: 954, 735, 42, 65
+	bounds: 895, 69, 42, 65
 skirt
-	bounds: 2, 776, 440, 246
+	bounds: 14, 325, 440, 246
+	rotate: 90
 sock-bow
-	bounds: 408, 407, 33, 32
+	bounds: 253, 733, 33, 32
 spine-logo-body
-	bounds: 879, 853, 13, 32
-	rotate: 90
+	bounds: 569, 733, 13, 32
 star-big
-	bounds: 939, 141, 18, 24
-	rotate: 90
+	bounds: 422, 741, 18, 24
 star-medium
-	bounds: 742, 537, 6, 8
-	rotate: 90
+	bounds: 1011, 757, 6, 8
 star-small
-	bounds: 719, 378, 3, 4
-	rotate: 90
+	bounds: 218, 761, 3, 4
 underskirt
-	bounds: 2, 329, 445, 228
-	rotate: 90
+	bounds: 212, 320, 445, 228
+	rotate: 270
 underskirt-back
-	bounds: 444, 851, 433, 171
+	bounds: 434, 332, 433, 171
+	rotate: 270
 wing-back
-	bounds: 290, 129, 146, 252
+	bounds: 137, 137, 146, 252
+	rotate: 270
 wing-front
-	bounds: 704, 545, 304, 248
-	rotate: 90
+	bounds: 718, 314, 304, 248

BIN
spine-haxe/example/assets/celestial-circus.png


+ 38 - 40
spine-haxe/example/assets/cloud-pot.atlas

@@ -3,83 +3,81 @@ cloud-pot.png
 	filter: Linear, Linear
 	scale: 0.5
 cloud-base-1
-	bounds: 2, 300, 233, 210
+	bounds: 548, 129, 233, 210
 cloud-base-10
-	bounds: 214, 113, 97, 101
+	bounds: 448, 227, 97, 101
 cloud-base-2
-	bounds: 2, 90, 210, 208
+	bounds: 783, 129, 210, 208
+	rotate: 90
 cloud-base-3
-	bounds: 237, 346, 175, 164
+	bounds: 271, 156, 175, 164
 cloud-base-4
-	bounds: 414, 347, 176, 163
+	bounds: 2, 148, 176, 163
 cloud-base-5
-	bounds: 313, 89, 145, 125
+	bounds: 495, 2, 145, 125
 cloud-base-6
-	bounds: 744, 374, 161, 136
+	bounds: 332, 18, 161, 136
 cloud-base-7
-	bounds: 592, 361, 150, 149
+	bounds: 180, 5, 150, 149
 cloud-base-8
-	bounds: 237, 216, 154, 128
+	bounds: 2, 18, 154, 128
 cloud-base-9
-	bounds: 907, 402, 107, 108
+	bounds: 862, 19, 107, 108
 cloud-cheeks
-	bounds: 2, 9, 218, 79
+	bounds: 642, 48, 218, 79
 cloud-eyes-closed
-	bounds: 744, 350, 132, 22
+	bounds: 137, 317, 132, 22
 cloud-eyes-open
-	bounds: 592, 333, 133, 26
+	bounds: 2, 313, 133, 26
 cloud-eyes-reflex
-	bounds: 393, 224, 120, 17
-	rotate: 90
+	bounds: 271, 322, 120, 17
 cloud-mouth-closed
-	bounds: 907, 374, 49, 16
+	bounds: 180, 201, 49, 16
 cloud-mouth-open
-	bounds: 222, 15, 59, 35
+	bounds: 180, 219, 59, 35
 leaf-big
-	bounds: 214, 218, 20, 49
-leaf-small
-	bounds: 958, 373, 17, 30
+	bounds: 448, 205, 20, 49
 	rotate: 90
+leaf-small
+	bounds: 993, 278, 17, 30
 petal-1
-	bounds: 283, 2, 26, 18
+	bounds: 241, 236, 26, 18
 petal-2
-	bounds: 283, 22, 28, 17
+	bounds: 993, 248, 28, 17
 	rotate: 90
 petal-3
-	bounds: 214, 269, 29, 21
+	bounds: 993, 310, 29, 21
 	rotate: 90
 pot-base
-	bounds: 222, 52, 76, 59
+	bounds: 180, 256, 76, 59
 pot-eyes-closed
-	bounds: 878, 363, 46, 9
+	bounds: 500, 330, 46, 9
 pot-eyes-open
-	bounds: 222, 2, 40, 11
+	bounds: 499, 214, 40, 11
 pot-mouth-open
-	bounds: 990, 374, 14, 16
-pot-mouth-pouty
-	bounds: 300, 93, 18, 10
+	bounds: 241, 220, 14, 16
 	rotate: 90
+pot-mouth-pouty
+	bounds: 521, 202, 18, 10
 pot-mouth-smile
-	bounds: 300, 77, 14, 10
-	rotate: 90
+	bounds: 993, 198, 14, 10
 pot-mouth-smile-big
-	bounds: 878, 352, 20, 9
+	bounds: 499, 203, 20, 9
 rain-blue
-	bounds: 926, 360, 12, 18
+	bounds: 241, 206, 12, 18
 	rotate: 90
 rain-color
-	bounds: 264, 4, 9, 17
-	rotate: 90
+	bounds: 258, 298, 9, 17
 rain-green
-	bounds: 900, 349, 12, 18
+	bounds: 993, 210, 12, 18
 	rotate: 90
 rain-white
-	bounds: 727, 337, 12, 22
+	bounds: 993, 224, 12, 22
 rain-white-reflex
-	bounds: 2, 2, 5, 10
+	bounds: 393, 324, 5, 10
 	rotate: 90
 stem
-	bounds: 907, 392, 8, 105
+	bounds: 393, 331, 8, 105
 	rotate: 90
 stem-end
-	bounds: 300, 62, 13, 13
+	bounds: 1007, 233, 13, 13

Some files were not shown because too many files changed in this diff