diff --git a/examples/alien/export/alien-ess.json b/examples/alien/export/alien-ess.json index 908c9387f..383cbd900 100644 --- a/examples/alien/export/alien-ess.json +++ b/examples/alien/export/alien-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "F735snjE3r4", - "spine": "4.1.17", + "hash": "HRoer7fuEfI", + "spine": "4.2.09-beta", "x": -191.3, "y": -4.51, "width": 365.79, diff --git a/examples/alien/export/alien-ess.skel b/examples/alien/export/alien-ess.skel index 58e0c493b..5cc21580f 100644 Binary files a/examples/alien/export/alien-ess.skel and b/examples/alien/export/alien-ess.skel differ diff --git a/examples/alien/export/alien-pma.atlas b/examples/alien/export/alien-pma.atlas index 7ad0e4fd9..ae29a1033 100644 --- a/examples/alien/export/alien-pma.atlas +++ b/examples/alien/export/alien-pma.atlas @@ -4,65 +4,62 @@ alien-pma.png pma: true scale: 0.5 back-foot - bounds: 1013, 577, 8, 6 + bounds: 2, 2, 8, 6 back-shin - bounds: 712, 387, 21, 24 + bounds: 231, 203, 21, 24 back-thigh - bounds: 971, 135, 24, 24 + bounds: 971, 877, 24, 24 backarmor - bounds: 159, 61, 81, 91 - rotate: 90 + bounds: 261, 325, 81, 91 blown-up-neck - bounds: 252, 90, 77, 52 + bounds: 571, 652, 77, 52 body - bounds: 516, 2, 98, 118 - rotate: 90 + bounds: 918, 903, 98, 118 burst01 - bounds: 2, 48, 143, 155 + bounds: 576, 706, 143, 155 rotate: 90 burst02 - bounds: 207, 144, 156, 181 + bounds: 735, 865, 156, 181 + rotate: 90 burst03-bg - bounds: 735, 356, 276, 227 + bounds: 2, 10, 276, 227 + rotate: 90 burst03-fg - bounds: 371, 190, 339, 221 + bounds: 2, 542, 339, 221 eye - bounds: 252, 13, 75, 75 + bounds: 494, 640, 75, 75 eye-highlight - bounds: 1000, 166, 22, 22 + bounds: 261, 256, 22, 22 eye-pupil - bounds: 712, 367, 18, 18 + bounds: 293, 305, 18, 18 eye-stalk - bounds: 640, 114, 74, 66 - rotate: 90 + bounds: 494, 572, 74, 66 front-foot - bounds: 1013, 565, 10, 6 - rotate: 90 + bounds: 343, 542, 10, 6 front-lower-arm - bounds: 640, 57, 55, 63 + bounds: 650, 649, 55, 63 rotate: 90 front-shin - bounds: 971, 190, 25, 28 - rotate: 90 + bounds: 343, 735, 25, 28 front-thigh - bounds: 971, 161, 27, 27 + bounds: 343, 550, 27, 27 front-upper-arm - bounds: 971, 217, 57, 28 + bounds: 231, 229, 57, 28 rotate: 90 head - bounds: 365, 52, 149, 136 + bounds: 343, 579, 149, 136 lower-back-arm - bounds: 971, 308, 51, 46 + bounds: 918, 855, 51, 46 metaljaw - bounds: 516, 102, 122, 86 -splat01 - bounds: 712, 102, 257, 252 -splat01-fg - bounds: 2, 193, 203, 132 -splat02 - bounds: 2, 327, 367, 256 -splat03 - bounds: 371, 413, 362, 170 -upper-back-arm - bounds: 971, 276, 30, 43 + bounds: 261, 418, 122, 86 rotate: 90 +splat01 + bounds: 2, 288, 257, 252 +splat01-fg + bounds: 371, 717, 203, 132 +splat02 + bounds: 2, 765, 367, 256 +splat03 + bounds: 371, 851, 362, 170 +upper-back-arm + bounds: 261, 280, 30, 43 diff --git a/examples/alien/export/alien-pma.png b/examples/alien/export/alien-pma.png index 1081f35f1..ab24d3f88 100644 Binary files a/examples/alien/export/alien-pma.png and b/examples/alien/export/alien-pma.png differ diff --git a/examples/alien/export/alien-pro.json b/examples/alien/export/alien-pro.json index c3cfd3849..974246ce4 100644 --- a/examples/alien/export/alien-pro.json +++ b/examples/alien/export/alien-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "UmVPCRBPHcg", - "spine": "4.1.17", + "hash": "BYkZ6umaSNE", + "spine": "4.2.09-beta", "x": -191.3, "y": -4.51, "width": 368.26, diff --git a/examples/alien/export/alien-pro.skel b/examples/alien/export/alien-pro.skel index 8ab72e497..c1a66069d 100644 Binary files a/examples/alien/export/alien-pro.skel and b/examples/alien/export/alien-pro.skel differ diff --git a/examples/alien/export/alien.atlas b/examples/alien/export/alien.atlas index 337ddfa2d..e66076d7f 100644 --- a/examples/alien/export/alien.atlas +++ b/examples/alien/export/alien.atlas @@ -3,65 +3,62 @@ alien.png filter: Linear, Linear scale: 0.5 back-foot - bounds: 1013, 577, 8, 6 + bounds: 2, 2, 8, 6 back-shin - bounds: 712, 387, 21, 24 + bounds: 231, 203, 21, 24 back-thigh - bounds: 971, 135, 24, 24 + bounds: 971, 877, 24, 24 backarmor - bounds: 159, 61, 81, 91 - rotate: 90 + bounds: 261, 325, 81, 91 blown-up-neck - bounds: 252, 90, 77, 52 + bounds: 571, 652, 77, 52 body - bounds: 516, 2, 98, 118 - rotate: 90 + bounds: 918, 903, 98, 118 burst01 - bounds: 2, 48, 143, 155 + bounds: 576, 706, 143, 155 rotate: 90 burst02 - bounds: 207, 144, 156, 181 + bounds: 735, 865, 156, 181 + rotate: 90 burst03-bg - bounds: 735, 356, 276, 227 + bounds: 2, 10, 276, 227 + rotate: 90 burst03-fg - bounds: 371, 190, 339, 221 + bounds: 2, 542, 339, 221 eye - bounds: 252, 13, 75, 75 + bounds: 494, 640, 75, 75 eye-highlight - bounds: 1000, 166, 22, 22 + bounds: 261, 256, 22, 22 eye-pupil - bounds: 712, 367, 18, 18 + bounds: 293, 305, 18, 18 eye-stalk - bounds: 640, 114, 74, 66 - rotate: 90 + bounds: 494, 572, 74, 66 front-foot - bounds: 1013, 565, 10, 6 - rotate: 90 + bounds: 343, 542, 10, 6 front-lower-arm - bounds: 640, 57, 55, 63 + bounds: 650, 649, 55, 63 rotate: 90 front-shin - bounds: 971, 190, 25, 28 - rotate: 90 + bounds: 343, 735, 25, 28 front-thigh - bounds: 971, 161, 27, 27 + bounds: 343, 550, 27, 27 front-upper-arm - bounds: 971, 217, 57, 28 + bounds: 231, 229, 57, 28 rotate: 90 head - bounds: 365, 52, 149, 136 + bounds: 343, 579, 149, 136 lower-back-arm - bounds: 971, 308, 51, 46 + bounds: 918, 855, 51, 46 metaljaw - bounds: 516, 102, 122, 86 -splat01 - bounds: 712, 102, 257, 252 -splat01-fg - bounds: 2, 193, 203, 132 -splat02 - bounds: 2, 327, 367, 256 -splat03 - bounds: 371, 413, 362, 170 -upper-back-arm - bounds: 971, 276, 30, 43 + bounds: 261, 418, 122, 86 rotate: 90 +splat01 + bounds: 2, 288, 257, 252 +splat01-fg + bounds: 371, 717, 203, 132 +splat02 + bounds: 2, 765, 367, 256 +splat03 + bounds: 371, 851, 362, 170 +upper-back-arm + bounds: 261, 280, 30, 43 diff --git a/examples/alien/export/alien.png b/examples/alien/export/alien.png index d9c14cbb5..ace2a53d3 100644 Binary files a/examples/alien/export/alien.png and b/examples/alien/export/alien.png differ diff --git a/examples/celestial-circus/celestial-circus.spine b/examples/celestial-circus/celestial-circus.spine new file mode 100644 index 000000000..5e8891c98 Binary files /dev/null and b/examples/celestial-circus/celestial-circus.spine differ diff --git a/examples/celestial-circus/images/arm-back-down.png b/examples/celestial-circus/images/arm-back-down.png new file mode 100644 index 000000000..cdfe66da3 Binary files /dev/null and b/examples/celestial-circus/images/arm-back-down.png differ diff --git a/examples/celestial-circus/images/arm-back-up.png b/examples/celestial-circus/images/arm-back-up.png new file mode 100644 index 000000000..3be4ea54b Binary files /dev/null and b/examples/celestial-circus/images/arm-back-up.png differ diff --git a/examples/celestial-circus/images/arm-front-down.png b/examples/celestial-circus/images/arm-front-down.png new file mode 100644 index 000000000..c5ae79b11 Binary files /dev/null and b/examples/celestial-circus/images/arm-front-down.png differ diff --git a/examples/celestial-circus/images/arm-front-up.png b/examples/celestial-circus/images/arm-front-up.png new file mode 100644 index 000000000..6de9d0b0a Binary files /dev/null and b/examples/celestial-circus/images/arm-front-up.png differ diff --git a/examples/celestial-circus/images/bench.png b/examples/celestial-circus/images/bench.png new file mode 100644 index 000000000..d4f5a9b0f Binary files /dev/null and b/examples/celestial-circus/images/bench.png differ diff --git a/examples/celestial-circus/images/body-bottom.png b/examples/celestial-circus/images/body-bottom.png new file mode 100644 index 000000000..023407bc4 Binary files /dev/null and b/examples/celestial-circus/images/body-bottom.png differ diff --git a/examples/celestial-circus/images/body-top.png b/examples/celestial-circus/images/body-top.png new file mode 100644 index 000000000..a44a3dda9 Binary files /dev/null and b/examples/celestial-circus/images/body-top.png differ diff --git a/examples/celestial-circus/images/chest.png b/examples/celestial-circus/images/chest.png new file mode 100644 index 000000000..f71231f95 Binary files /dev/null and b/examples/celestial-circus/images/chest.png differ diff --git a/examples/celestial-circus/images/cloud-back.png b/examples/celestial-circus/images/cloud-back.png new file mode 100644 index 000000000..0dd588d23 Binary files /dev/null and b/examples/celestial-circus/images/cloud-back.png differ diff --git a/examples/celestial-circus/images/cloud-front.png b/examples/celestial-circus/images/cloud-front.png new file mode 100644 index 000000000..1fde08ac2 Binary files /dev/null and b/examples/celestial-circus/images/cloud-front.png differ diff --git a/examples/celestial-circus/images/collar.png b/examples/celestial-circus/images/collar.png new file mode 100644 index 000000000..c70d84d23 Binary files /dev/null and b/examples/celestial-circus/images/collar.png differ diff --git a/examples/celestial-circus/images/ear.png b/examples/celestial-circus/images/ear.png new file mode 100644 index 000000000..4434a9eff Binary files /dev/null and b/examples/celestial-circus/images/ear.png differ diff --git a/examples/celestial-circus/images/eye-back-shadow.png b/examples/celestial-circus/images/eye-back-shadow.png new file mode 100644 index 000000000..56d8402e9 Binary files /dev/null and b/examples/celestial-circus/images/eye-back-shadow.png differ diff --git a/examples/celestial-circus/images/eye-front-shadow.png b/examples/celestial-circus/images/eye-front-shadow.png new file mode 100644 index 000000000..4308cdf3d Binary files /dev/null and b/examples/celestial-circus/images/eye-front-shadow.png differ diff --git a/examples/celestial-circus/images/eye-reflex-back.png b/examples/celestial-circus/images/eye-reflex-back.png new file mode 100644 index 000000000..1fba7bfed Binary files /dev/null and b/examples/celestial-circus/images/eye-reflex-back.png differ diff --git a/examples/celestial-circus/images/eye-reflex-front.png b/examples/celestial-circus/images/eye-reflex-front.png new file mode 100644 index 000000000..ac4970234 Binary files /dev/null and b/examples/celestial-circus/images/eye-reflex-front.png differ diff --git a/examples/celestial-circus/images/eye-white-back.png b/examples/celestial-circus/images/eye-white-back.png new file mode 100644 index 000000000..2a2a8dc26 Binary files /dev/null and b/examples/celestial-circus/images/eye-white-back.png differ diff --git a/examples/celestial-circus/images/eye-white-front.png b/examples/celestial-circus/images/eye-white-front.png new file mode 100644 index 000000000..78746d454 Binary files /dev/null and b/examples/celestial-circus/images/eye-white-front.png differ diff --git a/examples/celestial-circus/images/eyelashes-down-back.png b/examples/celestial-circus/images/eyelashes-down-back.png new file mode 100644 index 000000000..769697e5c Binary files /dev/null and b/examples/celestial-circus/images/eyelashes-down-back.png differ diff --git a/examples/celestial-circus/images/eyelashes-down-front.png b/examples/celestial-circus/images/eyelashes-down-front.png new file mode 100644 index 000000000..9987b199c Binary files /dev/null and b/examples/celestial-circus/images/eyelashes-down-front.png differ diff --git a/examples/celestial-circus/images/eyelashes-top-back.png b/examples/celestial-circus/images/eyelashes-top-back.png new file mode 100644 index 000000000..00c43ee5f Binary files /dev/null and b/examples/celestial-circus/images/eyelashes-top-back.png differ diff --git a/examples/celestial-circus/images/eyelashes-top-front.png b/examples/celestial-circus/images/eyelashes-top-front.png new file mode 100644 index 000000000..d5653af3b Binary files /dev/null and b/examples/celestial-circus/images/eyelashes-top-front.png differ diff --git a/examples/celestial-circus/images/face.png b/examples/celestial-circus/images/face.png new file mode 100644 index 000000000..46f0e2528 Binary files /dev/null and b/examples/celestial-circus/images/face.png differ diff --git a/examples/celestial-circus/images/feathers-back.png b/examples/celestial-circus/images/feathers-back.png new file mode 100644 index 000000000..8649378f5 Binary files /dev/null and b/examples/celestial-circus/images/feathers-back.png differ diff --git a/examples/celestial-circus/images/feathers-front.png b/examples/celestial-circus/images/feathers-front.png new file mode 100644 index 000000000..8d22e8e9c Binary files /dev/null and b/examples/celestial-circus/images/feathers-front.png differ diff --git a/examples/celestial-circus/images/fringe-middle-back.png b/examples/celestial-circus/images/fringe-middle-back.png new file mode 100644 index 000000000..7c74b7018 Binary files /dev/null and b/examples/celestial-circus/images/fringe-middle-back.png differ diff --git a/examples/celestial-circus/images/fringe-middle-front.png b/examples/celestial-circus/images/fringe-middle-front.png new file mode 100644 index 000000000..cafd5036c Binary files /dev/null and b/examples/celestial-circus/images/fringe-middle-front.png differ diff --git a/examples/celestial-circus/images/fringe-side-back.png b/examples/celestial-circus/images/fringe-side-back.png new file mode 100644 index 000000000..b646bcc46 Binary files /dev/null and b/examples/celestial-circus/images/fringe-side-back.png differ diff --git a/examples/celestial-circus/images/fringe-side-front.png b/examples/celestial-circus/images/fringe-side-front.png new file mode 100644 index 000000000..4d8acd2df Binary files /dev/null and b/examples/celestial-circus/images/fringe-side-front.png differ diff --git a/examples/celestial-circus/images/glove-bottom-back.png b/examples/celestial-circus/images/glove-bottom-back.png new file mode 100644 index 000000000..2a09cdf10 Binary files /dev/null and b/examples/celestial-circus/images/glove-bottom-back.png differ diff --git a/examples/celestial-circus/images/glove-bottom-front.png b/examples/celestial-circus/images/glove-bottom-front.png new file mode 100644 index 000000000..383bb6cfb Binary files /dev/null and b/examples/celestial-circus/images/glove-bottom-front.png differ diff --git a/examples/celestial-circus/images/hair-back-1.png b/examples/celestial-circus/images/hair-back-1.png new file mode 100644 index 000000000..da6449285 Binary files /dev/null and b/examples/celestial-circus/images/hair-back-1.png differ diff --git a/examples/celestial-circus/images/hair-back-2.png b/examples/celestial-circus/images/hair-back-2.png new file mode 100644 index 000000000..867e3928f Binary files /dev/null and b/examples/celestial-circus/images/hair-back-2.png differ diff --git a/examples/celestial-circus/images/hair-back-3.png b/examples/celestial-circus/images/hair-back-3.png new file mode 100644 index 000000000..8e804dc12 Binary files /dev/null and b/examples/celestial-circus/images/hair-back-3.png differ diff --git a/examples/celestial-circus/images/hair-back-4.png b/examples/celestial-circus/images/hair-back-4.png new file mode 100644 index 000000000..0b7c0fd06 Binary files /dev/null and b/examples/celestial-circus/images/hair-back-4.png differ diff --git a/examples/celestial-circus/images/hair-back-5.png b/examples/celestial-circus/images/hair-back-5.png new file mode 100644 index 000000000..8cea39bed Binary files /dev/null and b/examples/celestial-circus/images/hair-back-5.png differ diff --git a/examples/celestial-circus/images/hair-back-6.png b/examples/celestial-circus/images/hair-back-6.png new file mode 100644 index 000000000..5481e87aa Binary files /dev/null and b/examples/celestial-circus/images/hair-back-6.png differ diff --git a/examples/celestial-circus/images/hair-hat-shadow.png b/examples/celestial-circus/images/hair-hat-shadow.png new file mode 100644 index 000000000..635e82da0 Binary files /dev/null and b/examples/celestial-circus/images/hair-hat-shadow.png differ diff --git a/examples/celestial-circus/images/hand-back.png b/examples/celestial-circus/images/hand-back.png new file mode 100644 index 000000000..aaf6a47c0 Binary files /dev/null and b/examples/celestial-circus/images/hand-back.png differ diff --git a/examples/celestial-circus/images/hand-front.png b/examples/celestial-circus/images/hand-front.png new file mode 100644 index 000000000..814f75086 Binary files /dev/null and b/examples/celestial-circus/images/hand-front.png differ diff --git a/examples/celestial-circus/images/hat-back.png b/examples/celestial-circus/images/hat-back.png new file mode 100644 index 000000000..a8c389120 Binary files /dev/null and b/examples/celestial-circus/images/hat-back.png differ diff --git a/examples/celestial-circus/images/hat-front.png b/examples/celestial-circus/images/hat-front.png new file mode 100644 index 000000000..0b8e60b9b Binary files /dev/null and b/examples/celestial-circus/images/hat-front.png differ diff --git a/examples/celestial-circus/images/head-back.png b/examples/celestial-circus/images/head-back.png new file mode 100644 index 000000000..e261afad7 Binary files /dev/null and b/examples/celestial-circus/images/head-back.png differ diff --git a/examples/celestial-circus/images/jabot.png b/examples/celestial-circus/images/jabot.png new file mode 100644 index 000000000..3109d812d Binary files /dev/null and b/examples/celestial-circus/images/jabot.png differ diff --git a/examples/celestial-circus/images/leg-back.png b/examples/celestial-circus/images/leg-back.png new file mode 100644 index 000000000..1fbfe5524 Binary files /dev/null and b/examples/celestial-circus/images/leg-back.png differ diff --git a/examples/celestial-circus/images/leg-front.png b/examples/celestial-circus/images/leg-front.png new file mode 100644 index 000000000..1ba14bdb4 Binary files /dev/null and b/examples/celestial-circus/images/leg-front.png differ diff --git a/examples/celestial-circus/images/logo-brooch.png b/examples/celestial-circus/images/logo-brooch.png new file mode 100644 index 000000000..dbe8cbcf3 Binary files /dev/null and b/examples/celestial-circus/images/logo-brooch.png differ diff --git a/examples/celestial-circus/images/mouth.png b/examples/celestial-circus/images/mouth.png new file mode 100644 index 000000000..2e5e8169e Binary files /dev/null and b/examples/celestial-circus/images/mouth.png differ diff --git a/examples/celestial-circus/images/neck.png b/examples/celestial-circus/images/neck.png new file mode 100644 index 000000000..646482658 Binary files /dev/null and b/examples/celestial-circus/images/neck.png differ diff --git a/examples/celestial-circus/images/nose-shadow.png b/examples/celestial-circus/images/nose-shadow.png new file mode 100644 index 000000000..92c9d49d4 Binary files /dev/null and b/examples/celestial-circus/images/nose-shadow.png differ diff --git a/examples/celestial-circus/images/nose.-highlight.png b/examples/celestial-circus/images/nose.-highlight.png new file mode 100644 index 000000000..64fb6db63 Binary files /dev/null and b/examples/celestial-circus/images/nose.-highlight.png differ diff --git a/examples/celestial-circus/images/nose.png b/examples/celestial-circus/images/nose.png new file mode 100644 index 000000000..6b1c3b0e6 Binary files /dev/null and b/examples/celestial-circus/images/nose.png differ diff --git a/examples/celestial-circus/images/pupil-back.png b/examples/celestial-circus/images/pupil-back.png new file mode 100644 index 000000000..8c57b0b66 Binary files /dev/null and b/examples/celestial-circus/images/pupil-back.png differ diff --git a/examples/celestial-circus/images/pupil-front.png b/examples/celestial-circus/images/pupil-front.png new file mode 100644 index 000000000..33503d6f7 Binary files /dev/null and b/examples/celestial-circus/images/pupil-front.png differ diff --git a/examples/celestial-circus/images/rope-back.png b/examples/celestial-circus/images/rope-back.png new file mode 100644 index 000000000..e7d6ec365 Binary files /dev/null and b/examples/celestial-circus/images/rope-back.png differ diff --git a/examples/celestial-circus/images/rope-front-bottom.png b/examples/celestial-circus/images/rope-front-bottom.png new file mode 100644 index 000000000..21975d10b Binary files /dev/null and b/examples/celestial-circus/images/rope-front-bottom.png differ diff --git a/examples/celestial-circus/images/rope-front.png b/examples/celestial-circus/images/rope-front.png new file mode 100644 index 000000000..e7d6ec365 Binary files /dev/null and b/examples/celestial-circus/images/rope-front.png differ diff --git a/examples/celestial-circus/images/skirt.png b/examples/celestial-circus/images/skirt.png new file mode 100644 index 000000000..74027e8d1 Binary files /dev/null and b/examples/celestial-circus/images/skirt.png differ diff --git a/examples/celestial-circus/images/sock-bow.png b/examples/celestial-circus/images/sock-bow.png new file mode 100644 index 000000000..96bad27bb Binary files /dev/null and b/examples/celestial-circus/images/sock-bow.png differ diff --git a/examples/celestial-circus/images/spine-logo-body.png b/examples/celestial-circus/images/spine-logo-body.png new file mode 100644 index 000000000..98c142d52 Binary files /dev/null and b/examples/celestial-circus/images/spine-logo-body.png differ diff --git a/examples/celestial-circus/images/star-big.png b/examples/celestial-circus/images/star-big.png new file mode 100644 index 000000000..97067555d Binary files /dev/null and b/examples/celestial-circus/images/star-big.png differ diff --git a/examples/celestial-circus/images/star-medium.png b/examples/celestial-circus/images/star-medium.png new file mode 100644 index 000000000..9a566c45e Binary files /dev/null and b/examples/celestial-circus/images/star-medium.png differ diff --git a/examples/celestial-circus/images/star-small.png b/examples/celestial-circus/images/star-small.png new file mode 100644 index 000000000..dcfc5c340 Binary files /dev/null and b/examples/celestial-circus/images/star-small.png differ diff --git a/examples/celestial-circus/images/underskirt-back.png b/examples/celestial-circus/images/underskirt-back.png new file mode 100644 index 000000000..252a27cc6 Binary files /dev/null and b/examples/celestial-circus/images/underskirt-back.png differ diff --git a/examples/celestial-circus/images/underskirt.png b/examples/celestial-circus/images/underskirt.png new file mode 100644 index 000000000..95db605c1 Binary files /dev/null and b/examples/celestial-circus/images/underskirt.png differ diff --git a/examples/celestial-circus/images/wing-back.png b/examples/celestial-circus/images/wing-back.png new file mode 100644 index 000000000..227e272d6 Binary files /dev/null and b/examples/celestial-circus/images/wing-back.png differ diff --git a/examples/celestial-circus/images/wing-front.png b/examples/celestial-circus/images/wing-front.png new file mode 100644 index 000000000..0187fa061 Binary files /dev/null and b/examples/celestial-circus/images/wing-front.png differ diff --git a/examples/celestial-circus/license.txt b/examples/celestial-circus/license.txt new file mode 100644 index 000000000..b97f5d202 --- /dev/null +++ b/examples/celestial-circus/license.txt @@ -0,0 +1,8 @@ +Copyright (c) 2023, Esoteric Software + +The images in this project may be redistributed as long as they are accompanied +by this license file. The images may not be used for commercial use of any +kind. + +The project file is released into the public domain. It may be used as the basis +for derivative work. \ No newline at end of file diff --git a/examples/chibi-stickers/export/chibi-stickers-pma.atlas b/examples/chibi-stickers/export/chibi-stickers-pma.atlas index 40a95adb7..2c6520350 100644 --- a/examples/chibi-stickers/export/chibi-stickers-pma.atlas +++ b/examples/chibi-stickers/export/chibi-stickers-pma.atlas @@ -4,167 +4,149 @@ chibi-stickers-pma.png pma: true scale: 0.5 common/angry-mark - bounds: 83, 2, 42, 41 + bounds: 278, 85, 42, 41 common/big-purple-fear - bounds: 70, 54, 134, 72 + bounds: 2, 54, 134, 72 common/big-tear - bounds: 35, 44, 33, 82 -common/eye-3 - bounds: 336, 55, 15, 26 + bounds: 138, 93, 33, 82 rotate: 90 +common/eye-3 + bounds: 226, 25, 15, 26 common/eye-closed-happy - bounds: 2, 2, 25, 9 + bounds: 267, 7, 25, 9 + rotate: 90 common/eye-dafault - bounds: 339, 31, 22, 21 + bounds: 203, 20, 22, 21 rotate: 90 common/eye-equal - bounds: 369, 101, 25, 15 - rotate: 90 + bounds: 308, 43, 25, 15 common/eye-fire - bounds: 311, 25, 26, 28 + bounds: 278, 57, 26, 28 + rotate: 90 common/eye-half-open - bounds: 206, 54, 26, 16 + bounds: 138, 2, 26, 16 common/eye-heart - bounds: 344, 100, 26, 23 - rotate: 90 + bounds: 308, 60, 26, 23 common/eye-reverse-v - bounds: 234, 54, 26, 16 + bounds: 166, 2, 26, 16 common/eye-sideway-v - bounds: 307, 72, 21, 23 - rotate: 90 + bounds: 336, 60, 21, 23 common/eye-slant-close - bounds: 262, 54, 23, 16 + bounds: 194, 2, 23, 16 common/eye-small-dot - bounds: 362, 38, 15, 15 + bounds: 119, 2, 15, 15 common/eye-sparkle - bounds: 35, 13, 30, 29 + bounds: 372, 97, 30, 29 common/eye-star - bounds: 282, 23, 29, 27 - rotate: 90 + bounds: 404, 99, 29, 27 common/eye-twirl - bounds: 324, 2, 21, 23 + bounds: 226, 2, 21, 23 rotate: 90 common/eye-u - bounds: 246, 72, 24, 17 + bounds: 2, 2, 24, 17 common/eye-x - bounds: 332, 72, 25, 22 - rotate: 90 + bounds: 176, 20, 25, 22 common/lamp - bounds: 157, 5, 47, 65 + bounds: 138, 44, 47, 65 rotate: 90 common/mouth-3 - bounds: 306, 55, 15, 28 + bounds: 89, 2, 15, 28 rotate: 90 common/mouth-bracket - bounds: 266, 3, 34, 11 + bounds: 322, 85, 34, 11 common/mouth-doubt - bounds: 356, 72, 26, 15 - rotate: 90 + bounds: 243, 34, 26, 15 common/mouth-fangs - bounds: 67, 3, 39, 14 + bounds: 205, 52, 39, 14 rotate: 90 common/mouth-line - bounds: 70, 45, 36, 7 + bounds: 435, 96, 36, 7 common/mouth-neutral - bounds: 237, 2, 27, 12 + bounds: 245, 51, 27, 12 common/mouth-o-tall - bounds: 269, 93, 22, 33 + bounds: 221, 53, 22, 33 common/mouth-open-smile - bounds: 237, 16, 36, 22 - rotate: 90 + bounds: 138, 20, 36, 22 common/mouth-rectangle - bounds: 246, 91, 35, 21 - rotate: 90 + bounds: 435, 105, 35, 21 common/mouth-reverse-v - bounds: 332, 99, 27, 10 - rotate: 90 + bounds: 473, 95, 27, 10 common/mouth-s - bounds: 224, 11, 41, 11 - rotate: 90 + bounds: 28, 8, 41, 11 common/mouth-smile-little - bounds: 272, 72, 33, 19 + bounds: 117, 19, 33, 19 + rotate: 90 common/mouth-toungue-sticking-out - bounds: 293, 95, 31, 21 - rotate: 90 + bounds: 245, 65, 31, 21 common/mouth-u - bounds: 261, 16, 36, 19 - rotate: 90 + bounds: 472, 107, 36, 19 common/mouth-v - bounds: 316, 99, 27, 14 + bounds: 251, 5, 27, 14 rotate: 90 common/mouth-x - bounds: 349, 8, 21, 20 - rotate: 90 + bounds: 335, 38, 21, 20 common/purple-fear-lines - bounds: 127, 4, 48, 28 - rotate: 90 + bounds: 322, 98, 48, 28 common/shadow - bounds: 2, 13, 113, 31 - rotate: 90 + bounds: 2, 21, 113, 31 common/small-dash - bounds: 29, 2, 9, 20 + bounds: 404, 88, 9, 20 rotate: 90 common/small-drop-line - bounds: 287, 54, 16, 17 - rotate: 90 + bounds: 71, 2, 16, 17 common/small-purple-fear - bounds: 206, 72, 54, 38 - rotate: 90 + bounds: 222, 88, 54, 38 common/tear - bounds: 302, 2, 20, 19 + bounds: 274, 36, 20, 19 chibi-stickers-pma_2.png - size: 512, 512 + size: 1024, 256 filter: Linear, Linear pma: true scale: 0.5 erikari/arm - bounds: 239, 24, 28, 90 - rotate: 90 + bounds: 981, 164, 28, 90 erikari/arm-shoulder-decoration - bounds: 327, 345, 32, 43 - rotate: 90 + bounds: 790, 149, 32, 43 erikari/back-hair - bounds: 2, 95, 158, 141 - rotate: 90 + bounds: 258, 113, 158, 141 erikari/back-hair-long - bounds: 2, 255, 220, 254 + bounds: 2, 34, 220, 254 + rotate: 90 erikari/blush - bounds: 136, 4, 29, 18 + bounds: 981, 133, 29, 18 + rotate: 90 erikari/body - bounds: 272, 183, 70, 98 + bounds: 584, 115, 70, 98 erikari/bracelet - bounds: 205, 11, 33, 11 + bounds: 1011, 221, 33, 11 + rotate: 90 erikari/collar - bounds: 294, 61, 61, 62 + bounds: 390, 48, 61, 62 erikari/ear - bounds: 258, 66, 34, 42 + bounds: 258, 2, 34, 42 erikari/eyebrow - bounds: 240, 2, 20, 12 - rotate: 90 + bounds: 453, 98, 20, 12 erikari/hair-front - bounds: 327, 379, 130, 65 - rotate: 90 + bounds: 258, 46, 130, 65 erikari/hair-side - bounds: 2, 9, 43, 132 + bounds: 656, 149, 43, 132 rotate: 90 erikari/hat-border - bounds: 2, 54, 254, 39 + bounds: 418, 215, 254, 39 erikari/hat-top - bounds: 224, 283, 160, 60 + bounds: 674, 194, 160, 60 erikari/head-base - bounds: 145, 110, 143, 125 - rotate: 90 + bounds: 836, 129, 143, 125 erikari/leg - bounds: 136, 24, 28, 101 + bounds: 2, 4, 28, 101 rotate: 90 erikari/leg-decoration - bounds: 167, 9, 36, 13 + bounds: 770, 134, 36, 13 erikari/skirt - bounds: 224, 345, 164, 101 - rotate: 90 + bounds: 418, 112, 164, 101 erikari/strawberries-decoration - bounds: 272, 125, 112, 56 + bounds: 656, 91, 112, 56 chibi-stickers-pma_3.png size: 512, 256 @@ -172,36 +154,37 @@ chibi-stickers-pma_3.png pma: true scale: 0.5 harri/arm - bounds: 354, 125, 28, 90 + bounds: 147, 21, 28, 90 rotate: 90 harri/back-hair - bounds: 2, 87, 158, 141 - rotate: 90 + bounds: 2, 107, 158, 141 harri/back-hair-long - bounds: 272, 105, 40, 80 + bounds: 147, 51, 40, 80 rotate: 90 harri/beard - bounds: 169, 89, 10, 11 + bounds: 2, 2, 10, 11 harri/blush - bounds: 344, 155, 29, 18 + bounds: 265, 103, 29, 18 harri/body - bounds: 272, 147, 70, 98 + bounds: 307, 94, 70, 98 + rotate: 90 harri/body-decoration - bounds: 344, 175, 70, 67 - rotate: 90 + bounds: 407, 97, 70, 67 harri/ear - bounds: 413, 203, 34, 42 -harri/eyebrow - bounds: 145, 88, 22, 12 -harri/hair-front - bounds: 189, 10, 143, 90 -harri/head-base - bounds: 145, 102, 143, 125 + bounds: 229, 57, 34, 42 rotate: 90 +harri/eyebrow + bounds: 494, 226, 22, 12 + rotate: 90 +harri/hair-front + bounds: 2, 15, 143, 90 +harri/head-base + bounds: 162, 123, 143, 125 harri/leg - bounds: 334, 2, 28, 101 + bounds: 162, 93, 28, 101 + rotate: 90 harri/sword - bounds: 2, 3, 185, 82 + bounds: 307, 166, 185, 82 chibi-stickers-pma_4.png size: 1024, 256 @@ -209,43 +192,40 @@ chibi-stickers-pma_4.png pma: true scale: 0.5 luke/arm - bounds: 184, 4, 28, 90 + bounds: 930, 224, 28, 90 + rotate: 90 luke/arm-shoulder-decoration - bounds: 487, 120, 31, 27 + bounds: 581, 112, 31, 27 rotate: 90 luke/back-hair - bounds: 157, 96, 158, 141 - rotate: 90 + bounds: 173, 111, 158, 141 luke/blush - bounds: 427, 112, 29, 18 + bounds: 151, 68, 29, 18 + rotate: 90 luke/body - bounds: 516, 156, 70, 98 + bounds: 700, 123, 70, 98 + rotate: 90 luke/eyebrow - bounds: 458, 118, 27, 12 + bounds: 2, 2, 27, 12 luke/face-cover - bounds: 2, 85, 169, 153 - rotate: 90 + bounds: 2, 99, 169, 153 luke/glasses-shadow - bounds: 2, 2, 147, 81 + bounds: 2, 16, 147, 81 luke/hair-decoration - bounds: 320, 2, 130, 107 + bounds: 478, 145, 130, 107 luke/hair-front - bounds: 427, 132, 122, 57 - rotate: 90 + bounds: 700, 195, 122, 57 luke/head-base - bounds: 300, 111, 143, 125 - rotate: 90 + bounds: 333, 127, 143, 125 luke/leg - bounds: 486, 153, 28, 101 + bounds: 478, 115, 28, 101 + rotate: 90 luke/shield - bounds: 214, 6, 88, 104 - rotate: 90 + bounds: 610, 148, 88, 104 luke/skirt - bounds: 151, 2, 81, 31 - rotate: 90 + bounds: 930, 191, 81, 31 luke/sword - bounds: 452, 6, 104, 71 - rotate: 90 + bounds: 824, 181, 104, 71 chibi-stickers-pma_5.png size: 512, 256 @@ -253,33 +233,31 @@ chibi-stickers-pma_5.png pma: true scale: 0.5 mario/arm - bounds: 164, 30, 28, 90 - rotate: 90 + bounds: 244, 2, 28, 90 mario/back-hair - bounds: 2, 105, 168, 148 + bounds: 2, 101, 168, 148 mario/back-hair-long - bounds: 2, 17, 86, 91 + bounds: 151, 6, 86, 91 rotate: 90 mario/beard - bounds: 317, 106, 147, 93 - rotate: 90 + bounds: 2, 6, 147, 93 mario/blush - bounds: 144, 30, 29, 18 + bounds: 492, 220, 29, 18 rotate: 90 mario/body - bounds: 311, 34, 70, 98 + bounds: 317, 111, 70, 98 rotate: 90 mario/ear - bounds: 125, 61, 34, 42 + bounds: 456, 207, 34, 42 mario/eyebrow - bounds: 125, 27, 32, 17 - rotate: 90 + bounds: 417, 164, 32, 17 mario/hair-front - bounds: 172, 60, 137, 66 + bounds: 317, 183, 137, 66 mario/head-base - bounds: 172, 128, 143, 125 + bounds: 172, 124, 143, 125 mario/leg - bounds: 95, 2, 28, 101 + bounds: 172, 94, 28, 101 + rotate: 90 chibi-stickers-pma_6.png size: 1024, 256 @@ -287,42 +265,39 @@ chibi-stickers-pma_6.png pma: true scale: 0.5 misaki/arm - bounds: 505, 22, 28, 90 + bounds: 609, 95, 28, 90 misaki/back-hair - bounds: 194, 96, 158, 141 - rotate: 90 + bounds: 194, 105, 158, 141 misaki/back-hair-long - bounds: 2, 59, 190, 195 + bounds: 2, 51, 190, 195 misaki/belt - bounds: 525, 178, 76, 26 - rotate: 90 + bounds: 741, 190, 76, 26 misaki/blush - bounds: 180, 2, 29, 18 + bounds: 844, 228, 29, 18 misaki/body - bounds: 433, 11, 70, 98 + bounds: 641, 176, 70, 98 + rotate: 90 misaki/ear - bounds: 144, 15, 34, 42 + bounds: 144, 7, 34, 42 misaki/eyebrow - bounds: 211, 8, 30, 12 + bounds: 194, 54, 30, 12 misaki/glasses - bounds: 180, 22, 141, 35 + bounds: 194, 68, 141, 35 misaki/glasses-side - bounds: 144, 5, 8, 23 + bounds: 354, 111, 8, 23 rotate: 90 misaki/hair-front - bounds: 464, 114, 140, 59 - rotate: 90 + bounds: 499, 187, 140, 59 misaki/hair-side - bounds: 2, 10, 47, 140 + bounds: 2, 2, 47, 140 rotate: 90 misaki/head-base - bounds: 337, 111, 143, 125 - rotate: 90 + bounds: 354, 121, 143, 125 misaki/leg - bounds: 194, 66, 28, 101 + bounds: 741, 218, 28, 101 rotate: 90 misaki/skirt - bounds: 323, 4, 108, 90 + bounds: 499, 95, 108, 90 chibi-stickers-pma_7.png size: 512, 256 @@ -330,34 +305,32 @@ chibi-stickers-pma_7.png pma: true scale: 0.5 nate/arm - bounds: 132, 18, 28, 90 -nate/back-hair - bounds: 2, 110, 158, 141 -nate/beard - bounds: 307, 104, 147, 68 + bounds: 151, 65, 28, 90 rotate: 90 +nate/back-hair + bounds: 2, 109, 158, 141 +nate/beard + bounds: 2, 39, 147, 68 nate/blush - bounds: 46, 18, 29, 18 + bounds: 407, 165, 29, 18 nate/body - bounds: 2, 38, 70, 98 + bounds: 307, 113, 70, 98 rotate: 90 nate/ear - bounds: 2, 2, 34, 42 - rotate: 90 + bounds: 451, 208, 34, 42 nate/eyebrow - bounds: 77, 9, 27, 12 - rotate: 90 + bounds: 265, 111, 27, 12 nate/glasses - bounds: 306, 67, 141, 35 + bounds: 2, 2, 141, 35 nate/glasses-side - bounds: 46, 8, 8, 16 - rotate: 90 + bounds: 151, 47, 8, 16 nate/hair-front - bounds: 162, 59, 142, 65 + bounds: 307, 185, 142, 65 nate/head-base - bounds: 162, 126, 143, 125 + bounds: 162, 125, 143, 125 nate/leg - bounds: 102, 7, 28, 101 + bounds: 162, 95, 28, 101 + rotate: 90 chibi-stickers-pma_8.png size: 512, 256 @@ -365,32 +338,30 @@ chibi-stickers-pma_8.png pma: true scale: 0.5 sinisa/arm - bounds: 249, 19, 28, 90 + bounds: 147, 52, 28, 90 + rotate: 90 sinisa/back-hair bounds: 2, 96, 158, 141 - rotate: 90 sinisa/beard - bounds: 272, 115, 139, 45 - rotate: 90 + bounds: 307, 192, 139, 45 sinisa/blush - bounds: 300, 40, 29, 18 - rotate: 90 + bounds: 147, 32, 29, 18 sinisa/body - bounds: 177, 11, 70, 98 -sinisa/body-decoration - bounds: 279, 2, 27, 27 -sinisa/ear - bounds: 279, 71, 34, 42 -sinisa/eyebrow - bounds: 279, 31, 38, 19 + bounds: 307, 120, 70, 98 rotate: 90 +sinisa/body-decoration + bounds: 265, 83, 27, 27 +sinisa/ear + bounds: 448, 195, 34, 42 +sinisa/eyebrow + bounds: 407, 171, 38, 19 sinisa/hair-front bounds: 2, 2, 143, 92 sinisa/head-base - bounds: 145, 111, 143, 125 - rotate: 90 + bounds: 162, 112, 143, 125 sinisa/leg - bounds: 147, 8, 28, 101 + bounds: 162, 82, 28, 101 + rotate: 90 chibi-stickers-pma_9.png size: 512, 256 @@ -398,38 +369,33 @@ chibi-stickers-pma_9.png pma: true scale: 0.5 soeren/arm - bounds: 2, 3, 28, 90 + bounds: 254, 47, 28, 90 soeren/back-hair - bounds: 156, 104, 150, 141 - rotate: 90 + bounds: 2, 111, 150, 141 soeren/beard - bounds: 132, 32, 145, 68 + bounds: 2, 41, 145, 68 soeren/blush - bounds: 32, 3, 29, 18 + bounds: 284, 119, 29, 18 soeren/body - bounds: 32, 23, 70, 98 + bounds: 154, 67, 70, 98 rotate: 90 soeren/ear - bounds: 279, 5, 34, 42 + bounds: 200, 23, 34, 42 soeren/eyebrow - bounds: 63, 9, 27, 12 + bounds: 460, 137, 27, 12 soeren/glasses - bounds: 117, 102, 152, 37 - rotate: 90 + bounds: 2, 2, 152, 37 soeren/glasses-side - bounds: 92, 14, 7, 20 + bounds: 490, 245, 7, 20 rotate: 90 soeren/glove - bounds: 279, 49, 42, 53 + bounds: 156, 12, 42, 53 soeren/hair-front - bounds: 2, 95, 159, 113 - rotate: 90 + bounds: 154, 139, 159, 113 soeren/head-base - bounds: 299, 111, 143, 125 - rotate: 90 + bounds: 315, 127, 143, 125 soeren/leg - bounds: 132, 2, 28, 101 - rotate: 90 + bounds: 460, 151, 28, 101 chibi-stickers-pma_10.png size: 512, 256 diff --git a/examples/chibi-stickers/export/chibi-stickers-pma.png b/examples/chibi-stickers/export/chibi-stickers-pma.png index a19b60918..9d34074eb 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma.png and b/examples/chibi-stickers/export/chibi-stickers-pma.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_10.png b/examples/chibi-stickers/export/chibi-stickers-pma_10.png index a45988d68..96fd8446c 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_10.png and b/examples/chibi-stickers/export/chibi-stickers-pma_10.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_2.png b/examples/chibi-stickers/export/chibi-stickers-pma_2.png index 8bade66da..d5cc25473 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_2.png and b/examples/chibi-stickers/export/chibi-stickers-pma_2.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_3.png b/examples/chibi-stickers/export/chibi-stickers-pma_3.png index 2345278d4..553711ea7 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_3.png and b/examples/chibi-stickers/export/chibi-stickers-pma_3.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_4.png b/examples/chibi-stickers/export/chibi-stickers-pma_4.png index 5f88f3514..a3fd7b4a6 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_4.png and b/examples/chibi-stickers/export/chibi-stickers-pma_4.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_5.png b/examples/chibi-stickers/export/chibi-stickers-pma_5.png index b34ebfd38..2ef4531f3 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_5.png and b/examples/chibi-stickers/export/chibi-stickers-pma_5.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_6.png b/examples/chibi-stickers/export/chibi-stickers-pma_6.png index bf8872aff..cfd215321 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_6.png and b/examples/chibi-stickers/export/chibi-stickers-pma_6.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_7.png b/examples/chibi-stickers/export/chibi-stickers-pma_7.png index c08168247..8b4b1c138 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_7.png and b/examples/chibi-stickers/export/chibi-stickers-pma_7.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_8.png b/examples/chibi-stickers/export/chibi-stickers-pma_8.png index 7cb361aa7..2ceaa8744 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_8.png and b/examples/chibi-stickers/export/chibi-stickers-pma_8.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers-pma_9.png b/examples/chibi-stickers/export/chibi-stickers-pma_9.png index 64b7b6b97..0493d8c16 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers-pma_9.png and b/examples/chibi-stickers/export/chibi-stickers-pma_9.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers.atlas b/examples/chibi-stickers/export/chibi-stickers.atlas index 798f616e0..36c2c6c43 100644 --- a/examples/chibi-stickers/export/chibi-stickers.atlas +++ b/examples/chibi-stickers/export/chibi-stickers.atlas @@ -3,424 +3,390 @@ chibi-stickers.png filter: Linear, Linear scale: 0.5 common/angry-mark - bounds: 83, 2, 42, 41 + bounds: 278, 85, 42, 41 common/big-purple-fear - bounds: 70, 54, 134, 72 + bounds: 2, 54, 134, 72 common/big-tear - bounds: 35, 44, 33, 82 -common/eye-3 - bounds: 336, 55, 15, 26 + bounds: 138, 93, 33, 82 rotate: 90 +common/eye-3 + bounds: 226, 25, 15, 26 common/eye-closed-happy - bounds: 2, 2, 25, 9 + bounds: 267, 7, 25, 9 + rotate: 90 common/eye-dafault - bounds: 339, 31, 22, 21 + bounds: 203, 20, 22, 21 rotate: 90 common/eye-equal - bounds: 369, 101, 25, 15 - rotate: 90 + bounds: 308, 43, 25, 15 common/eye-fire - bounds: 311, 25, 26, 28 + bounds: 278, 57, 26, 28 + rotate: 90 common/eye-half-open - bounds: 206, 54, 26, 16 + bounds: 138, 2, 26, 16 common/eye-heart - bounds: 344, 100, 26, 23 - rotate: 90 + bounds: 308, 60, 26, 23 common/eye-reverse-v - bounds: 234, 54, 26, 16 + bounds: 166, 2, 26, 16 common/eye-sideway-v - bounds: 307, 72, 21, 23 - rotate: 90 + bounds: 336, 60, 21, 23 common/eye-slant-close - bounds: 262, 54, 23, 16 + bounds: 194, 2, 23, 16 common/eye-small-dot - bounds: 362, 38, 15, 15 + bounds: 119, 2, 15, 15 common/eye-sparkle - bounds: 35, 13, 30, 29 + bounds: 372, 97, 30, 29 common/eye-star - bounds: 282, 23, 29, 27 - rotate: 90 + bounds: 404, 99, 29, 27 common/eye-twirl - bounds: 324, 2, 21, 23 + bounds: 226, 2, 21, 23 rotate: 90 common/eye-u - bounds: 246, 72, 24, 17 + bounds: 2, 2, 24, 17 common/eye-x - bounds: 332, 72, 25, 22 - rotate: 90 + bounds: 176, 20, 25, 22 common/lamp - bounds: 157, 5, 47, 65 + bounds: 138, 44, 47, 65 rotate: 90 common/mouth-3 - bounds: 306, 55, 15, 28 + bounds: 89, 2, 15, 28 rotate: 90 common/mouth-bracket - bounds: 266, 3, 34, 11 + bounds: 322, 85, 34, 11 common/mouth-doubt - bounds: 356, 72, 26, 15 - rotate: 90 + bounds: 243, 34, 26, 15 common/mouth-fangs - bounds: 67, 3, 39, 14 + bounds: 205, 52, 39, 14 rotate: 90 common/mouth-line - bounds: 70, 45, 36, 7 + bounds: 435, 96, 36, 7 common/mouth-neutral - bounds: 237, 2, 27, 12 + bounds: 245, 51, 27, 12 common/mouth-o-tall - bounds: 269, 93, 22, 33 + bounds: 221, 53, 22, 33 common/mouth-open-smile - bounds: 237, 16, 36, 22 - rotate: 90 + bounds: 138, 20, 36, 22 common/mouth-rectangle - bounds: 246, 91, 35, 21 - rotate: 90 + bounds: 435, 105, 35, 21 common/mouth-reverse-v - bounds: 332, 99, 27, 10 - rotate: 90 + bounds: 473, 95, 27, 10 common/mouth-s - bounds: 224, 11, 41, 11 - rotate: 90 + bounds: 28, 8, 41, 11 common/mouth-smile-little - bounds: 272, 72, 33, 19 + bounds: 117, 19, 33, 19 + rotate: 90 common/mouth-toungue-sticking-out - bounds: 293, 95, 31, 21 - rotate: 90 + bounds: 245, 65, 31, 21 common/mouth-u - bounds: 261, 16, 36, 19 - rotate: 90 + bounds: 472, 107, 36, 19 common/mouth-v - bounds: 316, 99, 27, 14 + bounds: 251, 5, 27, 14 rotate: 90 common/mouth-x - bounds: 349, 8, 21, 20 - rotate: 90 + bounds: 335, 38, 21, 20 common/purple-fear-lines - bounds: 127, 4, 48, 28 - rotate: 90 + bounds: 322, 98, 48, 28 common/shadow - bounds: 2, 13, 113, 31 - rotate: 90 + bounds: 2, 21, 113, 31 common/small-dash - bounds: 29, 2, 9, 20 + bounds: 404, 88, 9, 20 rotate: 90 common/small-drop-line - bounds: 287, 54, 16, 17 - rotate: 90 + bounds: 71, 2, 16, 17 common/small-purple-fear - bounds: 206, 72, 54, 38 - rotate: 90 + bounds: 222, 88, 54, 38 common/tear - bounds: 302, 2, 20, 19 + bounds: 274, 36, 20, 19 chibi-stickers_2.png - size: 512, 512 + size: 1024, 256 filter: Linear, Linear scale: 0.5 erikari/arm - bounds: 239, 24, 28, 90 - rotate: 90 + bounds: 981, 164, 28, 90 erikari/arm-shoulder-decoration - bounds: 327, 345, 32, 43 - rotate: 90 + bounds: 790, 149, 32, 43 erikari/back-hair - bounds: 2, 95, 158, 141 - rotate: 90 + bounds: 258, 113, 158, 141 erikari/back-hair-long - bounds: 2, 255, 220, 254 + bounds: 2, 34, 220, 254 + rotate: 90 erikari/blush - bounds: 136, 4, 29, 18 + bounds: 981, 133, 29, 18 + rotate: 90 erikari/body - bounds: 272, 183, 70, 98 + bounds: 584, 115, 70, 98 erikari/bracelet - bounds: 205, 11, 33, 11 + bounds: 1011, 221, 33, 11 + rotate: 90 erikari/collar - bounds: 294, 61, 61, 62 + bounds: 390, 48, 61, 62 erikari/ear - bounds: 258, 66, 34, 42 + bounds: 258, 2, 34, 42 erikari/eyebrow - bounds: 240, 2, 20, 12 - rotate: 90 + bounds: 453, 98, 20, 12 erikari/hair-front - bounds: 327, 379, 130, 65 - rotate: 90 + bounds: 258, 46, 130, 65 erikari/hair-side - bounds: 2, 9, 43, 132 + bounds: 656, 149, 43, 132 rotate: 90 erikari/hat-border - bounds: 2, 54, 254, 39 + bounds: 418, 215, 254, 39 erikari/hat-top - bounds: 224, 283, 160, 60 + bounds: 674, 194, 160, 60 erikari/head-base - bounds: 145, 110, 143, 125 - rotate: 90 + bounds: 836, 129, 143, 125 erikari/leg - bounds: 136, 24, 28, 101 + bounds: 2, 4, 28, 101 rotate: 90 erikari/leg-decoration - bounds: 167, 9, 36, 13 + bounds: 770, 134, 36, 13 erikari/skirt - bounds: 224, 345, 164, 101 - rotate: 90 + bounds: 418, 112, 164, 101 erikari/strawberries-decoration - bounds: 272, 125, 112, 56 + bounds: 656, 91, 112, 56 chibi-stickers_3.png size: 512, 256 filter: Linear, Linear scale: 0.5 harri/arm - bounds: 354, 125, 28, 90 + bounds: 147, 21, 28, 90 rotate: 90 harri/back-hair - bounds: 2, 87, 158, 141 - rotate: 90 + bounds: 2, 107, 158, 141 harri/back-hair-long - bounds: 272, 105, 40, 80 + bounds: 147, 51, 40, 80 rotate: 90 harri/beard - bounds: 169, 89, 10, 11 + bounds: 2, 2, 10, 11 harri/blush - bounds: 344, 155, 29, 18 + bounds: 265, 103, 29, 18 harri/body - bounds: 272, 147, 70, 98 + bounds: 307, 94, 70, 98 + rotate: 90 harri/body-decoration - bounds: 344, 175, 70, 67 - rotate: 90 + bounds: 407, 97, 70, 67 harri/ear - bounds: 413, 203, 34, 42 -harri/eyebrow - bounds: 145, 88, 22, 12 -harri/hair-front - bounds: 189, 10, 143, 90 -harri/head-base - bounds: 145, 102, 143, 125 + bounds: 229, 57, 34, 42 rotate: 90 +harri/eyebrow + bounds: 494, 226, 22, 12 + rotate: 90 +harri/hair-front + bounds: 2, 15, 143, 90 +harri/head-base + bounds: 162, 123, 143, 125 harri/leg - bounds: 334, 2, 28, 101 + bounds: 162, 93, 28, 101 + rotate: 90 harri/sword - bounds: 2, 3, 185, 82 + bounds: 307, 166, 185, 82 chibi-stickers_4.png size: 1024, 256 filter: Linear, Linear scale: 0.5 luke/arm - bounds: 184, 4, 28, 90 + bounds: 930, 224, 28, 90 + rotate: 90 luke/arm-shoulder-decoration - bounds: 487, 120, 31, 27 + bounds: 581, 112, 31, 27 rotate: 90 luke/back-hair - bounds: 157, 96, 158, 141 - rotate: 90 + bounds: 173, 111, 158, 141 luke/blush - bounds: 427, 112, 29, 18 + bounds: 151, 68, 29, 18 + rotate: 90 luke/body - bounds: 516, 156, 70, 98 + bounds: 700, 123, 70, 98 + rotate: 90 luke/eyebrow - bounds: 458, 118, 27, 12 + bounds: 2, 2, 27, 12 luke/face-cover - bounds: 2, 85, 169, 153 - rotate: 90 + bounds: 2, 99, 169, 153 luke/glasses-shadow - bounds: 2, 2, 147, 81 + bounds: 2, 16, 147, 81 luke/hair-decoration - bounds: 320, 2, 130, 107 + bounds: 478, 145, 130, 107 luke/hair-front - bounds: 427, 132, 122, 57 - rotate: 90 + bounds: 700, 195, 122, 57 luke/head-base - bounds: 300, 111, 143, 125 - rotate: 90 + bounds: 333, 127, 143, 125 luke/leg - bounds: 486, 153, 28, 101 + bounds: 478, 115, 28, 101 + rotate: 90 luke/shield - bounds: 214, 6, 88, 104 - rotate: 90 + bounds: 610, 148, 88, 104 luke/skirt - bounds: 151, 2, 81, 31 - rotate: 90 + bounds: 930, 191, 81, 31 luke/sword - bounds: 452, 6, 104, 71 - rotate: 90 + bounds: 824, 181, 104, 71 chibi-stickers_5.png size: 512, 256 filter: Linear, Linear scale: 0.5 mario/arm - bounds: 164, 30, 28, 90 - rotate: 90 + bounds: 244, 2, 28, 90 mario/back-hair - bounds: 2, 105, 168, 148 + bounds: 2, 101, 168, 148 mario/back-hair-long - bounds: 2, 17, 86, 91 + bounds: 151, 6, 86, 91 rotate: 90 mario/beard - bounds: 317, 106, 147, 93 - rotate: 90 + bounds: 2, 6, 147, 93 mario/blush - bounds: 144, 30, 29, 18 + bounds: 492, 220, 29, 18 rotate: 90 mario/body - bounds: 311, 34, 70, 98 + bounds: 317, 111, 70, 98 rotate: 90 mario/ear - bounds: 125, 61, 34, 42 + bounds: 456, 207, 34, 42 mario/eyebrow - bounds: 125, 27, 32, 17 - rotate: 90 + bounds: 417, 164, 32, 17 mario/hair-front - bounds: 172, 60, 137, 66 + bounds: 317, 183, 137, 66 mario/head-base - bounds: 172, 128, 143, 125 + bounds: 172, 124, 143, 125 mario/leg - bounds: 95, 2, 28, 101 + bounds: 172, 94, 28, 101 + rotate: 90 chibi-stickers_6.png size: 1024, 256 filter: Linear, Linear scale: 0.5 misaki/arm - bounds: 505, 22, 28, 90 + bounds: 609, 95, 28, 90 misaki/back-hair - bounds: 194, 96, 158, 141 - rotate: 90 + bounds: 194, 105, 158, 141 misaki/back-hair-long - bounds: 2, 59, 190, 195 + bounds: 2, 51, 190, 195 misaki/belt - bounds: 525, 178, 76, 26 - rotate: 90 + bounds: 741, 190, 76, 26 misaki/blush - bounds: 180, 2, 29, 18 + bounds: 844, 228, 29, 18 misaki/body - bounds: 433, 11, 70, 98 + bounds: 641, 176, 70, 98 + rotate: 90 misaki/ear - bounds: 144, 15, 34, 42 + bounds: 144, 7, 34, 42 misaki/eyebrow - bounds: 211, 8, 30, 12 + bounds: 194, 54, 30, 12 misaki/glasses - bounds: 180, 22, 141, 35 + bounds: 194, 68, 141, 35 misaki/glasses-side - bounds: 144, 5, 8, 23 + bounds: 354, 111, 8, 23 rotate: 90 misaki/hair-front - bounds: 464, 114, 140, 59 - rotate: 90 + bounds: 499, 187, 140, 59 misaki/hair-side - bounds: 2, 10, 47, 140 + bounds: 2, 2, 47, 140 rotate: 90 misaki/head-base - bounds: 337, 111, 143, 125 - rotate: 90 + bounds: 354, 121, 143, 125 misaki/leg - bounds: 194, 66, 28, 101 + bounds: 741, 218, 28, 101 rotate: 90 misaki/skirt - bounds: 323, 4, 108, 90 + bounds: 499, 95, 108, 90 chibi-stickers_7.png size: 512, 256 filter: Linear, Linear scale: 0.5 nate/arm - bounds: 132, 18, 28, 90 -nate/back-hair - bounds: 2, 110, 158, 141 -nate/beard - bounds: 307, 104, 147, 68 + bounds: 151, 65, 28, 90 rotate: 90 +nate/back-hair + bounds: 2, 109, 158, 141 +nate/beard + bounds: 2, 39, 147, 68 nate/blush - bounds: 46, 18, 29, 18 + bounds: 407, 165, 29, 18 nate/body - bounds: 2, 38, 70, 98 + bounds: 307, 113, 70, 98 rotate: 90 nate/ear - bounds: 2, 2, 34, 42 - rotate: 90 + bounds: 451, 208, 34, 42 nate/eyebrow - bounds: 77, 9, 27, 12 - rotate: 90 + bounds: 265, 111, 27, 12 nate/glasses - bounds: 306, 67, 141, 35 + bounds: 2, 2, 141, 35 nate/glasses-side - bounds: 46, 8, 8, 16 - rotate: 90 + bounds: 151, 47, 8, 16 nate/hair-front - bounds: 162, 59, 142, 65 + bounds: 307, 185, 142, 65 nate/head-base - bounds: 162, 126, 143, 125 + bounds: 162, 125, 143, 125 nate/leg - bounds: 102, 7, 28, 101 + bounds: 162, 95, 28, 101 + rotate: 90 chibi-stickers_8.png size: 512, 256 filter: Linear, Linear scale: 0.5 sinisa/arm - bounds: 249, 19, 28, 90 + bounds: 147, 52, 28, 90 + rotate: 90 sinisa/back-hair bounds: 2, 96, 158, 141 - rotate: 90 sinisa/beard - bounds: 272, 115, 139, 45 - rotate: 90 + bounds: 307, 192, 139, 45 sinisa/blush - bounds: 300, 40, 29, 18 - rotate: 90 + bounds: 147, 32, 29, 18 sinisa/body - bounds: 177, 11, 70, 98 -sinisa/body-decoration - bounds: 279, 2, 27, 27 -sinisa/ear - bounds: 279, 71, 34, 42 -sinisa/eyebrow - bounds: 279, 31, 38, 19 + bounds: 307, 120, 70, 98 rotate: 90 +sinisa/body-decoration + bounds: 265, 83, 27, 27 +sinisa/ear + bounds: 448, 195, 34, 42 +sinisa/eyebrow + bounds: 407, 171, 38, 19 sinisa/hair-front bounds: 2, 2, 143, 92 sinisa/head-base - bounds: 145, 111, 143, 125 - rotate: 90 + bounds: 162, 112, 143, 125 sinisa/leg - bounds: 147, 8, 28, 101 + bounds: 162, 82, 28, 101 + rotate: 90 chibi-stickers_9.png size: 512, 256 filter: Linear, Linear scale: 0.5 soeren/arm - bounds: 2, 3, 28, 90 + bounds: 254, 47, 28, 90 soeren/back-hair - bounds: 156, 104, 150, 141 - rotate: 90 + bounds: 2, 111, 150, 141 soeren/beard - bounds: 132, 32, 145, 68 + bounds: 2, 41, 145, 68 soeren/blush - bounds: 32, 3, 29, 18 + bounds: 284, 119, 29, 18 soeren/body - bounds: 32, 23, 70, 98 + bounds: 154, 67, 70, 98 rotate: 90 soeren/ear - bounds: 279, 5, 34, 42 + bounds: 200, 23, 34, 42 soeren/eyebrow - bounds: 63, 9, 27, 12 + bounds: 460, 137, 27, 12 soeren/glasses - bounds: 117, 102, 152, 37 - rotate: 90 + bounds: 2, 2, 152, 37 soeren/glasses-side - bounds: 92, 14, 7, 20 + bounds: 490, 245, 7, 20 rotate: 90 soeren/glove - bounds: 279, 49, 42, 53 + bounds: 156, 12, 42, 53 soeren/hair-front - bounds: 2, 95, 159, 113 - rotate: 90 + bounds: 154, 139, 159, 113 soeren/head-base - bounds: 299, 111, 143, 125 - rotate: 90 + bounds: 315, 127, 143, 125 soeren/leg - bounds: 132, 2, 28, 101 - rotate: 90 + bounds: 460, 151, 28, 101 chibi-stickers_10.png size: 512, 256 diff --git a/examples/chibi-stickers/export/chibi-stickers.json b/examples/chibi-stickers/export/chibi-stickers.json index c734b6094..616ab727b 100644 --- a/examples/chibi-stickers/export/chibi-stickers.json +++ b/examples/chibi-stickers/export/chibi-stickers.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "yMOXnDA9zko", - "spine": "4.1.17", + "hash": "KgyftX4a7I4", + "spine": "4.2.09-beta", "x": -180, "y": -37.5, "width": 360, @@ -11,18 +11,34 @@ }, "bones": [ { "name": "root" }, - { "name": "hips", "parent": "root", "y": 155.08, "color": "ffcb42ff" }, + { "name": "hips", "parent": "root", "y": 155.08, "color": "ffcb42ff", "icon": "diamondB" }, { "name": "body-up", "parent": "hips", "length": 116.24, "rotation": 90, "color": "ffcb42ff" }, { "name": "head-base", "parent": "body-up", "length": 243.86, "x": 117.28, "color": "ffc20aff" }, { "name": "leg-r", "parent": "hips", "x": -42.43, "y": 10.89, "color": "ba2c2cff" }, { "name": "leg-up-r", "parent": "leg-r", "length": 82.42, "rotation": -90, "color": "ba2c2cff" }, - { "name": "leg-target-r", "parent": "root", "rotation": -90, "x": -42.43, "y": 1.14, "color": "ba2c2cff" }, + { + "name": "leg-target-r", + "parent": "root", + "rotation": -90, + "x": -42.43, + "y": 1.14, + "color": "ba2c2cff", + "icon": "ik" + }, { "name": "leg-down-r", "parent": "leg-up-r", "length": 82.42, "x": 82.42, "color": "ba2c2cff" }, { "name": "arm-holder-r", "parent": "body-up", "x": 104.34, "y": -46.44, "color": "227bdbff" }, { "name": "arm-up-r", "parent": "arm-holder-r", "length": 69.47, "rotation": -180, "color": "227bdbff" }, { "name": "arm-down-r", "parent": "arm-up-r", "length": 69.47, "x": 69.47, "color": "227bdbff" }, - { "name": "face-holder", "parent": "head-base", "x": 103.25, "color": "abe323ff" }, - { "name": "eye-r", "parent": "face-holder", "x": -1.13, "y": -73.48, "scaleY": -1, "color": "7bffccff" }, + { "name": "face-holder", "parent": "head-base", "x": 103.25, "color": "abe323ff", "icon": "arrowsB" }, + { + "name": "eye-r", + "parent": "face-holder", + "x": -1.13, + "y": -73.48, + "scaleY": -1, + "color": "7bffccff", + "icon": "eye" + }, { "name": "eyebrow-r", "parent": "eye-r", @@ -33,8 +49,8 @@ "color": "ffc237ff" }, { "name": "hair-front", "parent": "head-base", "length": 154.37, "x": 217.23, "skin": true, "color": "89f541a3" }, - { "name": "mouth", "parent": "face-holder", "rotation": -90, "x": -19.03 }, - { "name": "eye-l", "parent": "face-holder", "x": -1.13, "y": 73.48, "color": "7bffccff" }, + { "name": "mouth", "parent": "face-holder", "rotation": -90, "x": -19.03, "icon": "mouth" }, + { "name": "eye-l", "parent": "face-holder", "x": -1.13, "y": 73.48, "color": "7bffccff", "icon": "eye" }, { "name": "eyebrow-l", "parent": "eye-l", @@ -47,14 +63,22 @@ { "name": "leg-l", "parent": "hips", "x": 42.43, "y": 10.89, "scaleX": -1, "color": "4b308fff" }, { "name": "leg-up-l", "parent": "leg-l", "length": 82.42, "rotation": -90, "color": "4b308fff" }, { "name": "leg-down-l", "parent": "leg-up-l", "length": 82.42, "x": 82.42, "color": "4b308fff" }, - { "name": "leg-target-l", "parent": "root", "rotation": 90, "x": 42.43, "y": 1.14, "color": "4b308fff" }, + { + "name": "leg-target-l", + "parent": "root", + "rotation": 90, + "x": 42.43, + "y": 1.14, + "color": "4b308fff", + "icon": "ik" + }, { "name": "arm-holder-l", "parent": "body-up", "x": 104.34, "y": 46.44, "scaleY": -1, "color": "ff4646ff" }, { "name": "arm-up-l", "parent": "arm-holder-l", "length": 69.47, "rotation": -180, "color": "ff4646ff" }, { "name": "arm-down-l", "parent": "arm-up-l", "length": 69.47, "x": 69.47, "color": "ff4646ff" }, - { "name": "head-inverse", "parent": "head-base", "x": 160.07, "color": "fc0c0c6a" }, - { "name": "effect-head", "parent": "root", "x": -118.11, "y": 376.01, "color": "279ba7ff" }, - { "name": "eye-animator-l", "parent": "eye-l", "color": "ffc142ff" }, - { "name": "eye-animator-r", "parent": "eye-r", "color": "ffc142ff" }, + { "name": "head-inverse", "parent": "head-base", "x": 160.07, "color": "fc0c0c6a", "icon": "warning" }, + { "name": "effect-head", "parent": "root", "x": -118.11, "y": 376.01, "color": "279ba7ff", "icon": "particles" }, + { "name": "eye-animator-l", "parent": "eye-l", "color": "ffc142ff", "icon": "gear" }, + { "name": "eye-animator-r", "parent": "eye-r", "color": "ffc142ff", "icon": "gear" }, { "name": "skirt-side-rotator-r", "parent": "body-up", @@ -65,7 +89,7 @@ "skin": true, "color": "b35affa2" }, - { "name": "skirt-side-r", "parent": "skirt-side-rotator-r", "x": 141.46, "skin": true, "color": "b35affa2" }, + { "name": "skirt-side-r", "parent": "skirt-side-rotator-r", "x": 141.46, "skin": true, "color": "b35affa2", "icon": "arrowLeftRight" }, { "name": "skirt-side-rotator-l", "parent": "body-up", @@ -76,11 +100,19 @@ "skin": true, "color": "b35affa2" }, - { "name": "skirt-side-l", "parent": "skirt-side-rotator-l", "x": 142.13, "skin": true, "color": "b35affa2" }, - { "name": "skirt-middle", "parent": "body-up", "x": -26.36, "y": 0.2, "skin": true, "color": "b35affa2" }, - { "name": "small-drop-line1", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff" }, - { "name": "small-drop-line2", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff" }, - { "name": "small-drop-line3", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff" }, + { "name": "skirt-side-l", "parent": "skirt-side-rotator-l", "x": 142.13, "skin": true, "color": "b35affa2", "icon": "arrowLeftRight" }, + { + "name": "skirt-middle", + "parent": "body-up", + "x": -26.36, + "y": 0.2, + "skin": true, + "color": "b35affa2", + "icon": "arrowLeftRight" + }, + { "name": "small-drop-line1", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff", "icon": "particles" }, + { "name": "small-drop-line2", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff", "icon": "particles" }, + { "name": "small-drop-line3", "parent": "root", "x": -54.33, "y": 448.98, "color": "3a98a5ff", "icon": "particles" }, { "name": "hair-back-long-middle", "parent": "head-base", diff --git a/examples/chibi-stickers/export/chibi-stickers.png b/examples/chibi-stickers/export/chibi-stickers.png index 5236d4ec7..b2935fc85 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers.png and b/examples/chibi-stickers/export/chibi-stickers.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers.skel b/examples/chibi-stickers/export/chibi-stickers.skel index b4f80fc5e..a17d43779 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers.skel and b/examples/chibi-stickers/export/chibi-stickers.skel differ diff --git a/examples/chibi-stickers/export/chibi-stickers_10.png b/examples/chibi-stickers/export/chibi-stickers_10.png index 37556a864..298c824b9 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_10.png and b/examples/chibi-stickers/export/chibi-stickers_10.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_2.png b/examples/chibi-stickers/export/chibi-stickers_2.png index 840124d06..5a240f681 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_2.png and b/examples/chibi-stickers/export/chibi-stickers_2.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_3.png b/examples/chibi-stickers/export/chibi-stickers_3.png index fba832e6c..4f043b99b 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_3.png and b/examples/chibi-stickers/export/chibi-stickers_3.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_4.png b/examples/chibi-stickers/export/chibi-stickers_4.png index 4cc0e0452..9f78e1bd3 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_4.png and b/examples/chibi-stickers/export/chibi-stickers_4.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_5.png b/examples/chibi-stickers/export/chibi-stickers_5.png index c9e1f5ba3..6626180a5 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_5.png and b/examples/chibi-stickers/export/chibi-stickers_5.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_6.png b/examples/chibi-stickers/export/chibi-stickers_6.png index 281a720fa..8b25e61aa 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_6.png and b/examples/chibi-stickers/export/chibi-stickers_6.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_7.png b/examples/chibi-stickers/export/chibi-stickers_7.png index 91573827e..c1cabbcc5 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_7.png and b/examples/chibi-stickers/export/chibi-stickers_7.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_8.png b/examples/chibi-stickers/export/chibi-stickers_8.png index 9469dc331..07e30306a 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_8.png and b/examples/chibi-stickers/export/chibi-stickers_8.png differ diff --git a/examples/chibi-stickers/export/chibi-stickers_9.png b/examples/chibi-stickers/export/chibi-stickers_9.png index 73e082e61..8cf55f04d 100644 Binary files a/examples/chibi-stickers/export/chibi-stickers_9.png and b/examples/chibi-stickers/export/chibi-stickers_9.png differ diff --git a/examples/chibi-stickers/images/common/eye-sparkle.png b/examples/chibi-stickers/images/common/eye-sparkle.png index b37ea8a4b..7e657fefd 100644 Binary files a/examples/chibi-stickers/images/common/eye-sparkle.png and b/examples/chibi-stickers/images/common/eye-sparkle.png differ diff --git a/examples/chibi-stickers/images/erikari/ear.png b/examples/chibi-stickers/images/erikari/ear.png index 2ee60c0c0..60e942ba1 100644 Binary files a/examples/chibi-stickers/images/erikari/ear.png and b/examples/chibi-stickers/images/erikari/ear.png differ diff --git a/examples/chibi-stickers/images/erikari/leg.png b/examples/chibi-stickers/images/erikari/leg.png index 7d20c439a..2370bf14e 100644 Binary files a/examples/chibi-stickers/images/erikari/leg.png and b/examples/chibi-stickers/images/erikari/leg.png differ diff --git a/examples/chibi-stickers/images/harri/ear.png b/examples/chibi-stickers/images/harri/ear.png index bf6713c11..52ad7bc85 100644 Binary files a/examples/chibi-stickers/images/harri/ear.png and b/examples/chibi-stickers/images/harri/ear.png differ diff --git a/examples/chibi-stickers/images/mario/arm.png b/examples/chibi-stickers/images/mario/arm.png index 54baab50f..ce4f37040 100644 Binary files a/examples/chibi-stickers/images/mario/arm.png and b/examples/chibi-stickers/images/mario/arm.png differ diff --git a/examples/chibi-stickers/images/mario/beard.png b/examples/chibi-stickers/images/mario/beard.png index e4974272d..385238823 100644 Binary files a/examples/chibi-stickers/images/mario/beard.png and b/examples/chibi-stickers/images/mario/beard.png differ diff --git a/examples/chibi-stickers/images/mario/ear.png b/examples/chibi-stickers/images/mario/ear.png index 5263de56f..b407093b2 100644 Binary files a/examples/chibi-stickers/images/mario/ear.png and b/examples/chibi-stickers/images/mario/ear.png differ diff --git a/examples/chibi-stickers/images/misaki/ear.png b/examples/chibi-stickers/images/misaki/ear.png index 824ea559e..a3a270a14 100644 Binary files a/examples/chibi-stickers/images/misaki/ear.png and b/examples/chibi-stickers/images/misaki/ear.png differ diff --git a/examples/chibi-stickers/images/nate/ear.png b/examples/chibi-stickers/images/nate/ear.png index 691082cb7..85f0be834 100644 Binary files a/examples/chibi-stickers/images/nate/ear.png and b/examples/chibi-stickers/images/nate/ear.png differ diff --git a/examples/chibi-stickers/images/sinisa/arm.png b/examples/chibi-stickers/images/sinisa/arm.png index a3bbbe0e2..0a900d9ac 100644 Binary files a/examples/chibi-stickers/images/sinisa/arm.png and b/examples/chibi-stickers/images/sinisa/arm.png differ diff --git a/examples/chibi-stickers/images/sinisa/ear.png b/examples/chibi-stickers/images/sinisa/ear.png index 14f6dd8ce..8f3984639 100644 Binary files a/examples/chibi-stickers/images/sinisa/ear.png and b/examples/chibi-stickers/images/sinisa/ear.png differ diff --git a/examples/chibi-stickers/images/soeren/ear.png b/examples/chibi-stickers/images/soeren/ear.png index bf6713c11..52ad7bc85 100644 Binary files a/examples/chibi-stickers/images/soeren/ear.png and b/examples/chibi-stickers/images/soeren/ear.png differ diff --git a/examples/chibi-stickers/images/spineboy/ear.png b/examples/chibi-stickers/images/spineboy/ear.png index bf6713c11..52ad7bc85 100644 Binary files a/examples/chibi-stickers/images/spineboy/ear.png and b/examples/chibi-stickers/images/spineboy/ear.png differ diff --git a/examples/coin/export/coin-pma.atlas b/examples/coin/export/coin-pma.atlas index 290e1858d..ca11e4493 100644 --- a/examples/coin/export/coin-pma.atlas +++ b/examples/coin/export/coin-pma.atlas @@ -3,17 +3,17 @@ coin-pma.png filter: Linear, Linear pma: true coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/examples/coin/export/coin-pma.png b/examples/coin/export/coin-pma.png index 93e97ded9..65870eaed 100644 Binary files a/examples/coin/export/coin-pma.png and b/examples/coin/export/coin-pma.png differ diff --git a/examples/coin/export/coin-pro.json b/examples/coin/export/coin-pro.json index 03fd5fe07..9d51d1f55 100644 --- a/examples/coin/export/coin-pro.json +++ b/examples/coin/export/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.17", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/examples/coin/export/coin-pro.skel b/examples/coin/export/coin-pro.skel index eda3d9961..7cf937338 100644 Binary files a/examples/coin/export/coin-pro.skel and b/examples/coin/export/coin-pro.skel differ diff --git a/examples/coin/export/coin.atlas b/examples/coin/export/coin.atlas index 0ff436cff..369cf6779 100644 --- a/examples/coin/export/coin.atlas +++ b/examples/coin/export/coin.atlas @@ -2,17 +2,17 @@ coin.png size: 1024, 1024 filter: Linear, Linear coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/examples/coin/export/coin.png b/examples/coin/export/coin.png index 2298d1349..190d853ad 100644 Binary files a/examples/coin/export/coin.png and b/examples/coin/export/coin.png differ diff --git a/examples/dragon/export/dragon-ess.json b/examples/dragon/export/dragon-ess.json index 274ef6306..3d45816d7 100644 --- a/examples/dragon/export/dragon-ess.json +++ b/examples/dragon/export/dragon-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "aPoA1GjXkVI", - "spine": "4.1.17", + "hash": "XM8KoDHOBqA", + "spine": "4.2.09-beta", "x": -366.31, "y": -327.81, "width": 660.39, diff --git a/examples/dragon/export/dragon-ess.skel b/examples/dragon/export/dragon-ess.skel index 2fd796500..3bfb31358 100644 Binary files a/examples/dragon/export/dragon-ess.skel and b/examples/dragon/export/dragon-ess.skel differ diff --git a/examples/dragon/export/dragon-pma.atlas b/examples/dragon/export/dragon-pma.atlas index 10acc3e16..bb91276ed 100644 --- a/examples/dragon/export/dragon-pma.atlas +++ b/examples/dragon/export/dragon-pma.atlas @@ -2,128 +2,116 @@ dragon-pma.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon-pma_2.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon-pma_3.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon-pma_4.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon-pma_5.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon-pma_6.png - size: 1024, 1024 - filter: Linear, Linear - pma: true -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/examples/dragon/export/dragon-pma.png b/examples/dragon/export/dragon-pma.png index 5eec98d99..f2bb4c6dd 100644 Binary files a/examples/dragon/export/dragon-pma.png and b/examples/dragon/export/dragon-pma.png differ diff --git a/examples/dragon/export/dragon-pma_2.png b/examples/dragon/export/dragon-pma_2.png index 79226d9b5..c1d14d282 100644 Binary files a/examples/dragon/export/dragon-pma_2.png and b/examples/dragon/export/dragon-pma_2.png differ diff --git a/examples/dragon/export/dragon-pma_3.png b/examples/dragon/export/dragon-pma_3.png index f8189ea7d..05f7d73fc 100644 Binary files a/examples/dragon/export/dragon-pma_3.png and b/examples/dragon/export/dragon-pma_3.png differ diff --git a/examples/dragon/export/dragon-pma_4.png b/examples/dragon/export/dragon-pma_4.png index fc2b827cf..7de20b2c0 100644 Binary files a/examples/dragon/export/dragon-pma_4.png and b/examples/dragon/export/dragon-pma_4.png differ diff --git a/examples/dragon/export/dragon-pma_5.png b/examples/dragon/export/dragon-pma_5.png index e24a9465e..fa0f5075b 100644 Binary files a/examples/dragon/export/dragon-pma_5.png and b/examples/dragon/export/dragon-pma_5.png differ diff --git a/examples/dragon/export/dragon-pma_6.png b/examples/dragon/export/dragon-pma_6.png deleted file mode 100644 index 22396eff5..000000000 Binary files a/examples/dragon/export/dragon-pma_6.png and /dev/null differ diff --git a/examples/dragon/export/dragon.atlas b/examples/dragon/export/dragon.atlas index bca5b1e1b..47b3f3b2a 100644 --- a/examples/dragon/export/dragon.atlas +++ b/examples/dragon/export/dragon.atlas @@ -1,123 +1,112 @@ dragon.png size: 1024, 1024 filter: Linear, Linear -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon_2.png size: 1024, 1024 filter: Linear, Linear -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon_3.png size: 1024, 1024 filter: Linear, Linear -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon_4.png size: 1024, 1024 filter: Linear, Linear -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon_5.png size: 1024, 1024 filter: Linear, Linear -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon_6.png - size: 1024, 1024 - filter: Linear, Linear -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/examples/dragon/export/dragon.png b/examples/dragon/export/dragon.png index f39141c47..3bca338cd 100644 Binary files a/examples/dragon/export/dragon.png and b/examples/dragon/export/dragon.png differ diff --git a/examples/dragon/export/dragon_2.png b/examples/dragon/export/dragon_2.png index 09429b5f8..3dbe2a5a0 100644 Binary files a/examples/dragon/export/dragon_2.png and b/examples/dragon/export/dragon_2.png differ diff --git a/examples/dragon/export/dragon_3.png b/examples/dragon/export/dragon_3.png index 1a0e35759..df2896d51 100644 Binary files a/examples/dragon/export/dragon_3.png and b/examples/dragon/export/dragon_3.png differ diff --git a/examples/dragon/export/dragon_4.png b/examples/dragon/export/dragon_4.png index 80239b8d4..270b0959d 100644 Binary files a/examples/dragon/export/dragon_4.png and b/examples/dragon/export/dragon_4.png differ diff --git a/examples/dragon/export/dragon_5.png b/examples/dragon/export/dragon_5.png index 5a98f7efa..4e9f7a843 100644 Binary files a/examples/dragon/export/dragon_5.png and b/examples/dragon/export/dragon_5.png differ diff --git a/examples/dragon/export/dragon_6.png b/examples/dragon/export/dragon_6.png deleted file mode 100644 index f40aed7c7..000000000 Binary files a/examples/dragon/export/dragon_6.png and /dev/null differ diff --git a/examples/goblins/export/goblins-ess.json b/examples/goblins/export/goblins-ess.json index 14d356e61..006f225bd 100644 --- a/examples/goblins/export/goblins-ess.json +++ b/examples/goblins/export/goblins-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "djttFmlR6Co", - "spine": "4.1.17", + "hash": "J/xnqOZtLkc", + "spine": "4.2.09-beta", "x": -92.53, "y": -5.3, "width": 234.03, diff --git a/examples/goblins/export/goblins-ess.skel b/examples/goblins/export/goblins-ess.skel index a01b3f896..3d793d6c8 100644 Binary files a/examples/goblins/export/goblins-ess.skel and b/examples/goblins/export/goblins-ess.skel differ diff --git a/examples/goblins/export/goblins-pma.atlas b/examples/goblins/export/goblins-pma.atlas index 758c7fdf8..eed0924e9 100644 --- a/examples/goblins/export/goblins-pma.atlas +++ b/examples/goblins/export/goblins-pma.atlas @@ -3,95 +3,100 @@ goblins-pma.png filter: Linear, Linear pma: true dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/examples/goblins/export/goblins-pma.png b/examples/goblins/export/goblins-pma.png index 4613441cb..a6688e2cc 100644 Binary files a/examples/goblins/export/goblins-pma.png and b/examples/goblins/export/goblins-pma.png differ diff --git a/examples/goblins/export/goblins-pro.json b/examples/goblins/export/goblins-pro.json index 4819a6573..62cd1cf7f 100644 --- a/examples/goblins/export/goblins-pro.json +++ b/examples/goblins/export/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.17", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/examples/goblins/export/goblins-pro.skel b/examples/goblins/export/goblins-pro.skel index 82135aa72..8e1a73328 100644 Binary files a/examples/goblins/export/goblins-pro.skel and b/examples/goblins/export/goblins-pro.skel differ diff --git a/examples/goblins/export/goblins.atlas b/examples/goblins/export/goblins.atlas index b40ca29fc..06022ce54 100644 --- a/examples/goblins/export/goblins.atlas +++ b/examples/goblins/export/goblins.atlas @@ -2,95 +2,100 @@ goblins.png size: 1024, 128 filter: Linear, Linear dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/examples/goblins/export/goblins.png b/examples/goblins/export/goblins.png index 2fab39406..6ac8d5454 100644 Binary files a/examples/goblins/export/goblins.png and b/examples/goblins/export/goblins.png differ diff --git a/examples/hero/export/hero-ess.json b/examples/hero/export/hero-ess.json index d9999ef12..fa44d4697 100644 --- a/examples/hero/export/hero-ess.json +++ b/examples/hero/export/hero-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oG+kkp8qkDs", - "spine": "4.1.17", + "hash": "mbCHnrNWyvU", + "spine": "4.2.09-beta", "x": -87.83, "y": 0.01, "width": 319.3, diff --git a/examples/hero/export/hero-ess.skel b/examples/hero/export/hero-ess.skel index ac005c347..591780661 100644 Binary files a/examples/hero/export/hero-ess.skel and b/examples/hero/export/hero-ess.skel differ diff --git a/examples/hero/export/hero-pma.atlas b/examples/hero/export/hero-pma.atlas index b7a8cde8f..c22105510 100644 --- a/examples/hero/export/hero-pma.atlas +++ b/examples/hero/export/hero-pma.atlas @@ -3,59 +3,58 @@ hero-pma.png filter: Linear, Linear pma: true body - bounds: 452, 157, 97, 95 - rotate: 90 + bounds: 324, 88, 97, 95 cape - bounds: 247, 95, 146, 159 + bounds: 176, 95, 146, 159 chain-ball - bounds: 241, 11, 64, 68 + bounds: 423, 115, 64, 68 chain-flat - bounds: 241, 4, 16, 5 + bounds: 2, 2, 16, 5 chain-round - bounds: 307, 10, 17, 14 - rotate: 90 + bounds: 423, 99, 17, 14 eyes - bounds: 68, 5, 82, 31 + bounds: 678, 223, 82, 31 fingers - bounds: 2, 3, 31, 33 + bounds: 948, 221, 31, 33 foot1 - bounds: 483, 2, 50, 42 + bounds: 762, 212, 50, 42 foot2 - bounds: 185, 41, 53, 38 + bounds: 140, 26, 53, 38 + rotate: 90 forearm1 - bounds: 73, 38, 41, 49 + bounds: 814, 213, 41, 49 rotate: 90 forearm2 - bounds: 35, 4, 31, 32 + bounds: 981, 222, 31, 32 hand1 - bounds: 191, 2, 37, 48 + bounds: 865, 217, 37, 48 rotate: 90 hand2 - bounds: 152, 7, 31, 37 - rotate: 90 + bounds: 915, 217, 31, 37 handle - bounds: 323, 13, 134, 14 + bounds: 542, 240, 134, 14 head - bounds: 73, 81, 172, 173 + bounds: 2, 81, 172, 173 mantles - bounds: 395, 118, 136, 55 - rotate: 90 + bounds: 2, 24, 136, 55 mouth - bounds: 395, 103, 61, 13 + bounds: 2, 9, 61, 13 shin1 - bounds: 428, 44, 53, 57 + bounds: 542, 126, 53, 57 + rotate: 90 shin2 - bounds: 458, 104, 51, 54 - rotate: 90 + bounds: 489, 129, 51, 54 sword - bounds: 2, 38, 216, 69 - rotate: 90 + bounds: 324, 185, 216, 69 thigh1 - bounds: 366, 30, 60, 63 -thigh2 - bounds: 307, 29, 57, 64 -upper-arm1 - bounds: 483, 46, 50, 56 -upper-arm2 - bounds: 124, 40, 39, 59 + bounds: 608, 178, 60, 63 + rotate: 90 +thigh2 + bounds: 542, 181, 57, 64 + rotate: 90 +upper-arm1 + bounds: 601, 126, 50, 56 + rotate: 90 +upper-arm2 + bounds: 673, 182, 39, 59 rotate: 90 diff --git a/examples/hero/export/hero-pma.png b/examples/hero/export/hero-pma.png index d57095726..750f2ae3e 100644 Binary files a/examples/hero/export/hero-pma.png and b/examples/hero/export/hero-pma.png differ diff --git a/examples/hero/export/hero-pro.json b/examples/hero/export/hero-pro.json index 07b57cb64..1ee50b58c 100644 --- a/examples/hero/export/hero-pro.json +++ b/examples/hero/export/hero-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "kY+s2zL/cWE", - "spine": "4.1.17", + "hash": "osXzZ/Pexog", + "spine": "4.2.09-beta", "x": -85.7, "y": -0.02, "width": 321.77, @@ -309,7 +309,7 @@ }, { "name": "weapon/morningstar", - "bones": [ "chain8", "chain3", "weapon-morningstar-physics4", "weapon-morningstar", "chain1", "chain5", "chain4", "weapon-morningstar-physics1", "chain6", "chain7", "weapon-morningstar-physics2", "weapon-morningstar-physics3", "chain2" ], + "bones": [ "weapon-morningstar", "weapon-morningstar-physics2", "weapon-morningstar-physics3", "chain4", "chain1", "chain3", "weapon-morningstar-physics1", "weapon-morningstar-physics4", "chain5", "chain6", "chain7", "chain8", "chain2" ], "path": [ "weapon-morningstar" ] }, { diff --git a/examples/hero/export/hero-pro.skel b/examples/hero/export/hero-pro.skel index 0cae9299f..66fb52f3c 100644 Binary files a/examples/hero/export/hero-pro.skel and b/examples/hero/export/hero-pro.skel differ diff --git a/examples/hero/export/hero.atlas b/examples/hero/export/hero.atlas index f376c1304..a5dce9934 100644 --- a/examples/hero/export/hero.atlas +++ b/examples/hero/export/hero.atlas @@ -2,59 +2,58 @@ hero.png size: 1024, 256 filter: Linear, Linear body - bounds: 452, 157, 97, 95 - rotate: 90 + bounds: 324, 88, 97, 95 cape - bounds: 247, 95, 146, 159 + bounds: 176, 95, 146, 159 chain-ball - bounds: 241, 11, 64, 68 + bounds: 423, 115, 64, 68 chain-flat - bounds: 241, 4, 16, 5 + bounds: 2, 2, 16, 5 chain-round - bounds: 307, 10, 17, 14 - rotate: 90 + bounds: 423, 99, 17, 14 eyes - bounds: 68, 5, 82, 31 + bounds: 678, 223, 82, 31 fingers - bounds: 2, 3, 31, 33 + bounds: 948, 221, 31, 33 foot1 - bounds: 483, 2, 50, 42 + bounds: 762, 212, 50, 42 foot2 - bounds: 185, 41, 53, 38 + bounds: 140, 26, 53, 38 + rotate: 90 forearm1 - bounds: 73, 38, 41, 49 + bounds: 814, 213, 41, 49 rotate: 90 forearm2 - bounds: 35, 4, 31, 32 + bounds: 981, 222, 31, 32 hand1 - bounds: 191, 2, 37, 48 + bounds: 865, 217, 37, 48 rotate: 90 hand2 - bounds: 152, 7, 31, 37 - rotate: 90 + bounds: 915, 217, 31, 37 handle - bounds: 323, 13, 134, 14 + bounds: 542, 240, 134, 14 head - bounds: 73, 81, 172, 173 + bounds: 2, 81, 172, 173 mantles - bounds: 395, 118, 136, 55 - rotate: 90 + bounds: 2, 24, 136, 55 mouth - bounds: 395, 103, 61, 13 + bounds: 2, 9, 61, 13 shin1 - bounds: 428, 44, 53, 57 + bounds: 542, 126, 53, 57 + rotate: 90 shin2 - bounds: 458, 104, 51, 54 - rotate: 90 + bounds: 489, 129, 51, 54 sword - bounds: 2, 38, 216, 69 - rotate: 90 + bounds: 324, 185, 216, 69 thigh1 - bounds: 366, 30, 60, 63 -thigh2 - bounds: 307, 29, 57, 64 -upper-arm1 - bounds: 483, 46, 50, 56 -upper-arm2 - bounds: 124, 40, 39, 59 + bounds: 608, 178, 60, 63 + rotate: 90 +thigh2 + bounds: 542, 181, 57, 64 + rotate: 90 +upper-arm1 + bounds: 601, 126, 50, 56 + rotate: 90 +upper-arm2 + bounds: 673, 182, 39, 59 rotate: 90 diff --git a/examples/hero/export/hero.png b/examples/hero/export/hero.png index d10217369..d81647d95 100644 Binary files a/examples/hero/export/hero.png and b/examples/hero/export/hero.png differ diff --git a/examples/mix-and-match/export/mix-and-match-pma.atlas b/examples/mix-and-match/export/mix-and-match-pma.atlas index c2eb27f20..b4cc35fa9 100644 --- a/examples/mix-and-match/export/mix-and-match-pma.atlas +++ b/examples/mix-and-match/export/mix-and-match-pma.atlas @@ -4,360 +4,356 @@ mix-and-match-pma.png pma: true scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/examples/mix-and-match/export/mix-and-match-pma.png b/examples/mix-and-match/export/mix-and-match-pma.png index 1c7c748eb..0f60ebf9a 100644 Binary files a/examples/mix-and-match/export/mix-and-match-pma.png and b/examples/mix-and-match/export/mix-and-match-pma.png differ diff --git a/examples/mix-and-match/export/mix-and-match-pro.json b/examples/mix-and-match/export/mix-and-match-pro.json index 1cf000ddd..c9fbbd628 100644 --- a/examples/mix-and-match/export/mix-and-match-pro.json +++ b/examples/mix-and-match/export/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "wi43rlDXH1o", - "spine": "4.1.17", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-control", "bag-strap-back", "bag-strap-front", "bag-back-down", "bag", "bag-flap", "bag-back-front" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-down-back", "cape-back-rotator", "cape-blue-middle-back", "cape-blue-control", "cape-blue-up-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-blue-down", "cape-blue-up", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-back-rotator", "cape-red-back-inside", "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-foot-front", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-down-back", "dress-control-foot-back", "dress-control-leg-up-back", "dress-control-middle", "sleeve-control-front", "sleeve-control-back" ], - "transform": [ "leg-down-back", "leg-down-front", "leg-up", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-back", "skirt-control", "skirt-control-back-down", "skirt-control-front", "skirt-control-front-down", "skirt-control-middle", "skirt-control-up" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "backpack-control", "pompom-control", "hat-control", "zip-boy", "backpack", "hat" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "hat-base", "hair-strand-back-3", "bag-control", "hair-strand-front-2", "pompom-control", "hair-holder-front", "hair-strand-front-1", "zip-girl", "bag-strap-back", "hair-strand-front-4", "bag-strap-front", "hair-holder-back", "bag-back-down", "bag", "hair-strand-back-1", "hat-control", "hair-strand-front-3", "bag-flap", "hat", "hair-strand-back-2", "scarf-back", "bag-back-front" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "dress-control-foot-front", "cape-blue-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-blue-middle-back", "cape-blue-control", "cape-blue-up-back", "dress-control-foot-back", "dress-control-leg-down-back", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-up-front", "cape-blue-down", "cape-blue-up", "dress-control-middle", "cape-front-rotator", "sleeve-control-front", "cape-blue-down-front", "cape-blue-down-middle", "sleeve-control-back" ], - "transform": [ "leg-down-back", "leg-down-front", "leg-up", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-back-rotator", "skirt-rotation-front", "cape-red-back-inside", "cape-red-front-inside", "skirt-control-back", "cape-red-front-outside", "skirt-control", "skirt-control-front", "skirt-control-back-down", "cape-front-rotator", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "skirt-control-up", "skirt-rotation-back" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-3", "hair-strand-front-2", "hair-holder-front", "hair-strand-front-1", "hair-strand-front-4", "hair-holder-back", "hair-strand-back-1", "hair-strand-front-3", "hair-strand-back-2", "scarf-back" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/examples/mix-and-match/export/mix-and-match-pro.skel b/examples/mix-and-match/export/mix-and-match-pro.skel index e57bc08a0..90d19987e 100644 Binary files a/examples/mix-and-match/export/mix-and-match-pro.skel and b/examples/mix-and-match/export/mix-and-match-pro.skel differ diff --git a/examples/mix-and-match/export/mix-and-match.atlas b/examples/mix-and-match/export/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/examples/mix-and-match/export/mix-and-match.atlas +++ b/examples/mix-and-match/export/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/examples/mix-and-match/export/mix-and-match.png b/examples/mix-and-match/export/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/examples/mix-and-match/export/mix-and-match.png and b/examples/mix-and-match/export/mix-and-match.png differ diff --git a/examples/owl/export/owl-pma.atlas b/examples/owl/export/owl-pma.atlas index 686314430..35485dbe8 100644 --- a/examples/owl/export/owl-pma.atlas +++ b/examples/owl/export/owl-pma.atlas @@ -4,71 +4,64 @@ owl-pma.png pma: true scale: 0.5 L_eye-closed - bounds: 512, 5, 90, 86 - rotate: 90 + bounds: 508, 115, 90, 86 L_eye-iris - bounds: 600, 10, 90, 86 - rotate: 90 + bounds: 826, 183, 90, 86 L_eye-light - bounds: 688, 4, 21, 20 - rotate: 90 + bounds: 1001, 488, 21, 20 L_eye-pupil - bounds: 856, 13, 63, 60 - rotate: 90 + bounds: 752, 154, 63, 60 L_foot - bounds: 834, 78, 64, 48 - rotate: 90 + bounds: 817, 133, 64, 48 L_wing - bounds: 349, 4, 81, 110 - rotate: 90 + bounds: 342, 91, 81, 110 R_eye-closed - bounds: 637, 119, 90, 86 - rotate: 90 + bounds: 508, 27, 90, 86 R_eye-iris - bounds: 688, 27, 90, 86 + bounds: 600, 111, 90, 86 rotate: 90 R_eye-light - bounds: 710, 4, 21, 20 - rotate: 90 + bounds: 1001, 466, 21, 20 R_eye-pupil - bounds: 884, 80, 63, 60 + bounds: 691, 72, 63, 60 rotate: 90 R_foot - bounds: 845, 145, 64, 48 - rotate: 90 + bounds: 814, 83, 64, 48 R_wing - bounds: 421, 93, 81, 110 + bounds: 425, 91, 81, 110 beak - bounds: 776, 2, 39, 41 + bounds: 883, 140, 39, 41 beak-down - bounds: 817, 3, 37, 40 -body - bounds: 2, 7, 248, 196 -feather-1 - bounds: 918, 18, 59, 60 -feather-2 - bounds: 781, 144, 62, 65 -feather-3 - bounds: 776, 45, 56, 76 -head-base - bounds: 621, 211, 299, 237 + bounds: 753, 53, 37, 40 rotate: 90 +body + bounds: 2, 5, 248, 196 +feather-1 + bounds: 753, 92, 59, 60 +feather-2 + bounds: 688, 137, 62, 65 +feather-3 + bounds: 600, 2, 56, 76 + rotate: 90 +head-base + bounds: 621, 271, 299, 237 leaf-1 - bounds: 559, 102, 76, 101 + bounds: 922, 273, 76, 101 leaf-2 - bounds: 252, 4, 65, 95 + bounds: 621, 204, 65, 95 rotate: 90 leaf-3 - bounds: 252, 71, 132, 77 + bounds: 922, 376, 132, 77 rotate: 90 leaf-4 - bounds: 461, 2, 89, 49 - rotate: 90 + bounds: 600, 60, 89, 49 leaf-5 - bounds: 504, 97, 53, 106 + bounds: 718, 216, 53, 106 + rotate: 90 leaf-6 - bounds: 331, 87, 88, 116 + bounds: 252, 85, 88, 116 leaf-7 - bounds: 725, 123, 54, 86 + bounds: 252, 29, 54, 86 + rotate: 90 wood - bounds: 2, 205, 617, 305 + bounds: 2, 203, 617, 305 diff --git a/examples/owl/export/owl-pma.png b/examples/owl/export/owl-pma.png index 38b7f9f6b..2c9f188de 100644 Binary files a/examples/owl/export/owl-pma.png and b/examples/owl/export/owl-pma.png differ diff --git a/examples/owl/export/owl-pro.json b/examples/owl/export/owl-pro.json index 5bb3e0d96..1e6733aba 100644 --- a/examples/owl/export/owl-pro.json +++ b/examples/owl/export/owl-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "Xf8aPQe0Mh0", - "spine": "4.1.17", + "hash": "WhZADUSP9U4", + "spine": "4.2.09-beta", "x": -644, "y": -274, "width": 1350.84, @@ -21,8 +21,16 @@ "color": "1a8600ff" }, { "name": "branch-2", "parent": "branch-1", "length": 391.45, "rotation": -30.2, "x": 487.04, "color": "1a8600ff" }, - { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff" }, - { "name": "body-top-control", "parent": "owl-base", "rotation": 92.53, "x": -3.85, "y": 227.57, "color": "1697ffff" }, + { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff", "icon": "diamond" }, + { + "name": "body-top-control", + "parent": "owl-base", + "rotation": 92.53, + "x": -3.85, + "y": 227.57, + "color": "1697ffff", + "icon": "triangle" + }, { "name": "branch-3", "parent": "branch-2", "length": 231.51, "rotation": 30.15, "x": 391.45, "color": "1a8600ff" }, { "name": "branch-4", "parent": "branch-3", "length": 158.83, "rotation": 38.9, "x": 231.51, "color": "1a8600ff" }, { "name": "branch-5", "parent": "branch-4", "length": 82.96, "rotation": -26.21, "x": 158.83, "color": "1a8600ff" }, @@ -35,9 +43,17 @@ "y": -20.15, "color": "1a8600ff" }, - { "name": "head", "parent": "body-top-control", "rotation": -90, "x": 51, "y": 0.33, "color": "1697ffff" }, - { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff" }, - { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff" }, + { + "name": "head", + "parent": "body-top-control", + "rotation": -90, + "x": 51, + "y": 0.33, + "color": "1697ffff", + "icon": "square" + }, + { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff", "icon": "arrows" }, + { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff", "icon": "arrows" }, { "name": "leaf-1", "parent": "branch-1", diff --git a/examples/owl/export/owl-pro.skel b/examples/owl/export/owl-pro.skel index d313366c7..67a85a25a 100644 Binary files a/examples/owl/export/owl-pro.skel and b/examples/owl/export/owl-pro.skel differ diff --git a/examples/owl/export/owl.atlas b/examples/owl/export/owl.atlas index 1b1d4b8b1..439d0d3d6 100644 --- a/examples/owl/export/owl.atlas +++ b/examples/owl/export/owl.atlas @@ -3,71 +3,64 @@ owl.png filter: Linear, Linear scale: 0.5 L_eye-closed - bounds: 512, 5, 90, 86 - rotate: 90 + bounds: 508, 115, 90, 86 L_eye-iris - bounds: 600, 10, 90, 86 - rotate: 90 + bounds: 826, 183, 90, 86 L_eye-light - bounds: 688, 4, 21, 20 - rotate: 90 + bounds: 1001, 488, 21, 20 L_eye-pupil - bounds: 856, 13, 63, 60 - rotate: 90 + bounds: 752, 154, 63, 60 L_foot - bounds: 834, 78, 64, 48 - rotate: 90 + bounds: 817, 133, 64, 48 L_wing - bounds: 349, 4, 81, 110 - rotate: 90 + bounds: 342, 91, 81, 110 R_eye-closed - bounds: 637, 119, 90, 86 - rotate: 90 + bounds: 508, 27, 90, 86 R_eye-iris - bounds: 688, 27, 90, 86 + bounds: 600, 111, 90, 86 rotate: 90 R_eye-light - bounds: 710, 4, 21, 20 - rotate: 90 + bounds: 1001, 466, 21, 20 R_eye-pupil - bounds: 884, 80, 63, 60 + bounds: 691, 72, 63, 60 rotate: 90 R_foot - bounds: 845, 145, 64, 48 - rotate: 90 + bounds: 814, 83, 64, 48 R_wing - bounds: 421, 93, 81, 110 + bounds: 425, 91, 81, 110 beak - bounds: 776, 2, 39, 41 + bounds: 883, 140, 39, 41 beak-down - bounds: 817, 3, 37, 40 -body - bounds: 2, 7, 248, 196 -feather-1 - bounds: 918, 18, 59, 60 -feather-2 - bounds: 781, 144, 62, 65 -feather-3 - bounds: 776, 45, 56, 76 -head-base - bounds: 621, 211, 299, 237 + bounds: 753, 53, 37, 40 rotate: 90 +body + bounds: 2, 5, 248, 196 +feather-1 + bounds: 753, 92, 59, 60 +feather-2 + bounds: 688, 137, 62, 65 +feather-3 + bounds: 600, 2, 56, 76 + rotate: 90 +head-base + bounds: 621, 271, 299, 237 leaf-1 - bounds: 559, 102, 76, 101 + bounds: 922, 273, 76, 101 leaf-2 - bounds: 252, 4, 65, 95 + bounds: 621, 204, 65, 95 rotate: 90 leaf-3 - bounds: 252, 71, 132, 77 + bounds: 922, 376, 132, 77 rotate: 90 leaf-4 - bounds: 461, 2, 89, 49 - rotate: 90 + bounds: 600, 60, 89, 49 leaf-5 - bounds: 504, 97, 53, 106 + bounds: 718, 216, 53, 106 + rotate: 90 leaf-6 - bounds: 331, 87, 88, 116 + bounds: 252, 85, 88, 116 leaf-7 - bounds: 725, 123, 54, 86 + bounds: 252, 29, 54, 86 + rotate: 90 wood - bounds: 2, 205, 617, 305 + bounds: 2, 203, 617, 305 diff --git a/examples/owl/export/owl.png b/examples/owl/export/owl.png index a375217a7..168467c23 100644 Binary files a/examples/owl/export/owl.png and b/examples/owl/export/owl.png differ diff --git a/examples/powerup/export/powerup-ess.json b/examples/powerup/export/powerup-ess.json index a0962846b..1a7a1641c 100644 --- a/examples/powerup/export/powerup-ess.json +++ b/examples/powerup/export/powerup-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "g51gqFUAXaM", - "spine": "4.1.17", + "hash": "wOo6/a6ZKBY", + "spine": "4.2.09-beta", "x": -207.3, "y": 119.41, "width": 413.19, diff --git a/examples/powerup/export/powerup-ess.skel b/examples/powerup/export/powerup-ess.skel index f09ad750f..d0e664bc6 100644 Binary files a/examples/powerup/export/powerup-ess.skel and b/examples/powerup/export/powerup-ess.skel differ diff --git a/examples/powerup/export/powerup-pma.atlas b/examples/powerup/export/powerup-pma.atlas index dc5036020..5167d4147 100644 --- a/examples/powerup/export/powerup-pma.atlas +++ b/examples/powerup/export/powerup-pma.atlas @@ -3,10 +3,8 @@ powerup-pma.png filter: Linear, Linear pma: true star - bounds: 279, 63, 76, 72 - rotate: 90 + bounds: 2, 2, 76, 72 token - bounds: 154, 17, 123, 122 + bounds: 141, 104, 123, 122 wing - bounds: 2, 2, 137, 150 - rotate: 90 + bounds: 2, 76, 137, 150 diff --git a/examples/powerup/export/powerup-pma.png b/examples/powerup/export/powerup-pma.png index 85e6673c9..2c2188051 100644 Binary files a/examples/powerup/export/powerup-pma.png and b/examples/powerup/export/powerup-pma.png differ diff --git a/examples/powerup/export/powerup-pro.json b/examples/powerup/export/powerup-pro.json index b14497dea..e8443b9f1 100644 --- a/examples/powerup/export/powerup-pro.json +++ b/examples/powerup/export/powerup-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "/2dOCTLjcJ4", - "spine": "4.1.17", + "hash": "c5dsNFnALbw", + "spine": "4.2.09-beta", "x": -208.76, "y": 119.41, "width": 414.65, diff --git a/examples/powerup/export/powerup-pro.skel b/examples/powerup/export/powerup-pro.skel index f870cbef6..d1299d1cd 100644 Binary files a/examples/powerup/export/powerup-pro.skel and b/examples/powerup/export/powerup-pro.skel differ diff --git a/examples/powerup/export/powerup.atlas b/examples/powerup/export/powerup.atlas index b601845d1..3e6cbbdd0 100644 --- a/examples/powerup/export/powerup.atlas +++ b/examples/powerup/export/powerup.atlas @@ -2,10 +2,8 @@ powerup.png size: 512, 256 filter: Linear, Linear star - bounds: 279, 63, 76, 72 - rotate: 90 + bounds: 2, 2, 76, 72 token - bounds: 154, 17, 123, 122 + bounds: 141, 104, 123, 122 wing - bounds: 2, 2, 137, 150 - rotate: 90 + bounds: 2, 76, 137, 150 diff --git a/examples/powerup/export/powerup.png b/examples/powerup/export/powerup.png index 8689eb99e..a39708888 100644 Binary files a/examples/powerup/export/powerup.png and b/examples/powerup/export/powerup.png differ diff --git a/examples/raptor/export/raptor-pma.atlas b/examples/raptor/export/raptor-pma.atlas index 5b4981c80..456015eaf 100644 --- a/examples/raptor/export/raptor-pma.atlas +++ b/examples/raptor/export/raptor-pma.atlas @@ -4,98 +4,91 @@ raptor-pma.png pma: true scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/examples/raptor/export/raptor-pma.png b/examples/raptor/export/raptor-pma.png index 96886a609..2f3c0edd2 100644 Binary files a/examples/raptor/export/raptor-pma.png and b/examples/raptor/export/raptor-pma.png differ diff --git a/examples/raptor/export/raptor-pro.json b/examples/raptor/export/raptor-pro.json index 5439b9138..afd89f343 100644 --- a/examples/raptor/export/raptor-pro.json +++ b/examples/raptor/export/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.17", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/examples/raptor/export/raptor-pro.skel b/examples/raptor/export/raptor-pro.skel index e35ec23d5..26900a1b8 100644 Binary files a/examples/raptor/export/raptor-pro.skel and b/examples/raptor/export/raptor-pro.skel differ diff --git a/examples/raptor/export/raptor.atlas b/examples/raptor/export/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/examples/raptor/export/raptor.atlas +++ b/examples/raptor/export/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/examples/raptor/export/raptor.png b/examples/raptor/export/raptor.png index a67b73a21..f8bed53d2 100644 Binary files a/examples/raptor/export/raptor.png and b/examples/raptor/export/raptor.png differ diff --git a/examples/raptor/manual-maps/light-sprite.png b/examples/raptor/manual-maps/light-sprite.png index 2c6899668..2ed7797c4 100644 Binary files a/examples/raptor/manual-maps/light-sprite.png and b/examples/raptor/manual-maps/light-sprite.png differ diff --git a/examples/sack/export/sack-pro.json b/examples/sack/export/sack-pro.json index 6967bc793..6da5b88a0 100644 --- a/examples/sack/export/sack-pro.json +++ b/examples/sack/export/sack-pro.json @@ -1,6 +1,6 @@ { "skeleton": { - "hash": "kHS66sthDLE", + "hash": "SvPpD4qESzE", "spine": "4.2.09-beta", "x": -265.35, "y": -64.53, @@ -587,12 +587,113 @@ }, { "time": 1.0333 } ] + } + }, + "physics": { + "belly": { + "mass": [ + { "value": 0.32 } + ] + }, + "bone": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone2": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone2b": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone2c": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone2d": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone3": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone3b": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone3c": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone3d": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone4": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone5": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] + }, + "bone6": { + "damping": [ + { "value": 0.7374 } + ], + "mass": [ + { "value": 0.43 } + ] }, "cape-front": { - "translate": [ - {}, - { "time": 0.2, "x": -705.92 }, - { "time": 0.3667 } + "mass": [ + { "value": 0.35 } ] } } diff --git a/examples/sack/export/sack-pro.skel b/examples/sack/export/sack-pro.skel index 06fde1d82..3ff9b1745 100644 Binary files a/examples/sack/export/sack-pro.skel and b/examples/sack/export/sack-pro.skel differ diff --git a/examples/sack/sack-pro.spine b/examples/sack/sack-pro.spine index 543b9a0fc..adcdd3fcd 100644 Binary files a/examples/sack/sack-pro.spine and b/examples/sack/sack-pro.spine differ diff --git a/examples/speedy/export/speedy-ess.json b/examples/speedy/export/speedy-ess.json index 473af5cda..945ad0bf1 100644 --- a/examples/speedy/export/speedy-ess.json +++ b/examples/speedy/export/speedy-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "D5Ad2Zbw5iM", - "spine": "4.1.17", + "hash": "jfCRgeUPmtM", + "spine": "4.2.09-beta", "x": -95.43, "y": -18.79, "width": 196.03, diff --git a/examples/speedy/export/speedy-ess.skel b/examples/speedy/export/speedy-ess.skel index 79b26ba65..a77c9fe61 100644 Binary files a/examples/speedy/export/speedy-ess.skel and b/examples/speedy/export/speedy-ess.skel differ diff --git a/examples/speedy/export/speedy-pma.atlas b/examples/speedy/export/speedy-pma.atlas index ac9dd561e..c6a1a73d1 100644 --- a/examples/speedy/export/speedy-pma.atlas +++ b/examples/speedy/export/speedy-pma.atlas @@ -3,71 +3,70 @@ speedy-pma.png filter: Linear, Linear pma: true belt-ends - bounds: 648, 5, 45, 56 + bounds: 965, 81, 45, 56 rotate: 90 hair-1 - bounds: 422, 3, 82, 39 + bounds: 635, 87, 82, 39 hair-2 - bounds: 572, 2, 74, 43 + bounds: 719, 83, 74, 43 head bounds: 2, 2, 116, 124 hood-end1a - bounds: 377, 42, 23, 84 + bounds: 879, 103, 23, 84 + rotate: 90 hood-end1b - bounds: 572, 47, 28, 79 + bounds: 795, 67, 28, 79 + rotate: 90 hood-end1c - bounds: 120, 3, 31, 70 + bounds: 636, 24, 31, 70 rotate: 90 hood-end1d - bounds: 447, 44, 29, 82 + bounds: 795, 97, 29, 82 + rotate: 90 hood-end1e - bounds: 264, 4, 35, 78 + bounds: 248, 2, 35, 78 rotate: 90 hood-end1f - bounds: 657, 55, 39, 71 + bounds: 509, 42, 39, 71 + rotate: 90 hood-end2a - bounds: 344, 9, 30, 76 + bounds: 120, 9, 30, 76 rotate: 90 hood-end2b - bounds: 698, 55, 38, 71 -hood-end2c - bounds: 506, 2, 42, 64 + bounds: 509, 2, 38, 71 rotate: 90 +hood-end2c + bounds: 337, 18, 42, 64 hood-end2d - bounds: 602, 50, 23, 76 + bounds: 712, 58, 23, 76 + rotate: 90 hood-end2e - bounds: 627, 52, 28, 74 + bounds: 636, 57, 28, 74 + rotate: 90 hood-end2f - bounds: 192, 3, 31, 70 + bounds: 879, 70, 31, 70 rotate: 90 left-foot - bounds: 478, 46, 80, 47 + bounds: 199, 2, 80, 47 rotate: 90 left-foot-bent01 - bounds: 208, 39, 87, 43 - rotate: 90 + bounds: 248, 39, 87, 43 left-foot-bent02 - bounds: 402, 44, 82, 43 - rotate: 90 + bounds: 470, 83, 82, 43 left-foot-side - bounds: 120, 36, 90, 42 - rotate: 90 + bounds: 199, 84, 90, 42 left-hand - bounds: 796, 73, 52, 53 + bounds: 582, 28, 52, 53 right-foot - bounds: 738, 60, 66, 56 - rotate: 90 + bounds: 381, 25, 66, 56 right-foot-bent01 - bounds: 332, 41, 85, 43 - rotate: 90 + bounds: 383, 83, 85, 43 right-foot-bent02 - bounds: 527, 47, 79, 43 - rotate: 90 + bounds: 554, 83, 79, 43 right-foot-side - bounds: 164, 36, 90, 42 - rotate: 90 + bounds: 291, 84, 90, 42 right-hand - bounds: 738, 2, 56, 58 + bounds: 449, 25, 56, 58 rotate: 90 torso - bounds: 253, 41, 77, 85 + bounds: 120, 41, 77, 85 diff --git a/examples/speedy/export/speedy-pma.png b/examples/speedy/export/speedy-pma.png index 414ed24cb..80840481e 100644 Binary files a/examples/speedy/export/speedy-pma.png and b/examples/speedy/export/speedy-pma.png differ diff --git a/examples/speedy/export/speedy.atlas b/examples/speedy/export/speedy.atlas index 11fc4f9c3..c3214483f 100644 --- a/examples/speedy/export/speedy.atlas +++ b/examples/speedy/export/speedy.atlas @@ -2,71 +2,70 @@ speedy.png size: 1024, 128 filter: Linear, Linear belt-ends - bounds: 648, 5, 45, 56 + bounds: 965, 81, 45, 56 rotate: 90 hair-1 - bounds: 422, 3, 82, 39 + bounds: 635, 87, 82, 39 hair-2 - bounds: 572, 2, 74, 43 + bounds: 719, 83, 74, 43 head bounds: 2, 2, 116, 124 hood-end1a - bounds: 377, 42, 23, 84 + bounds: 879, 103, 23, 84 + rotate: 90 hood-end1b - bounds: 572, 47, 28, 79 + bounds: 795, 67, 28, 79 + rotate: 90 hood-end1c - bounds: 120, 3, 31, 70 + bounds: 636, 24, 31, 70 rotate: 90 hood-end1d - bounds: 447, 44, 29, 82 + bounds: 795, 97, 29, 82 + rotate: 90 hood-end1e - bounds: 264, 4, 35, 78 + bounds: 248, 2, 35, 78 rotate: 90 hood-end1f - bounds: 657, 55, 39, 71 + bounds: 509, 42, 39, 71 + rotate: 90 hood-end2a - bounds: 344, 9, 30, 76 + bounds: 120, 9, 30, 76 rotate: 90 hood-end2b - bounds: 698, 55, 38, 71 -hood-end2c - bounds: 506, 2, 42, 64 + bounds: 509, 2, 38, 71 rotate: 90 +hood-end2c + bounds: 337, 18, 42, 64 hood-end2d - bounds: 602, 50, 23, 76 + bounds: 712, 58, 23, 76 + rotate: 90 hood-end2e - bounds: 627, 52, 28, 74 + bounds: 636, 57, 28, 74 + rotate: 90 hood-end2f - bounds: 192, 3, 31, 70 + bounds: 879, 70, 31, 70 rotate: 90 left-foot - bounds: 478, 46, 80, 47 + bounds: 199, 2, 80, 47 rotate: 90 left-foot-bent01 - bounds: 208, 39, 87, 43 - rotate: 90 + bounds: 248, 39, 87, 43 left-foot-bent02 - bounds: 402, 44, 82, 43 - rotate: 90 + bounds: 470, 83, 82, 43 left-foot-side - bounds: 120, 36, 90, 42 - rotate: 90 + bounds: 199, 84, 90, 42 left-hand - bounds: 796, 73, 52, 53 + bounds: 582, 28, 52, 53 right-foot - bounds: 738, 60, 66, 56 - rotate: 90 + bounds: 381, 25, 66, 56 right-foot-bent01 - bounds: 332, 41, 85, 43 - rotate: 90 + bounds: 383, 83, 85, 43 right-foot-bent02 - bounds: 527, 47, 79, 43 - rotate: 90 + bounds: 554, 83, 79, 43 right-foot-side - bounds: 164, 36, 90, 42 - rotate: 90 + bounds: 291, 84, 90, 42 right-hand - bounds: 738, 2, 56, 58 + bounds: 449, 25, 56, 58 rotate: 90 torso - bounds: 253, 41, 77, 85 + bounds: 120, 41, 77, 85 diff --git a/examples/speedy/export/speedy.png b/examples/speedy/export/speedy.png index d1f3e3b60..216e61f41 100644 Binary files a/examples/speedy/export/speedy.png and b/examples/speedy/export/speedy.png differ diff --git a/examples/spineboy/export/spineboy-ess.json b/examples/spineboy/export/spineboy-ess.json index 81688ebcc..7987236a0 100644 --- a/examples/spineboy/export/spineboy-ess.json +++ b/examples/spineboy/export/spineboy-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "SmUDxzck41o", - "spine": "4.1.17", + "hash": "5GZvPpyyFDA", + "spine": "4.2.09-beta", "x": -221.27, "y": -8.57, "width": 470.72, diff --git a/examples/spineboy/export/spineboy-ess.skel b/examples/spineboy/export/spineboy-ess.skel index 198f0f3a7..b99096b38 100644 Binary files a/examples/spineboy/export/spineboy-ess.skel and b/examples/spineboy/export/spineboy-ess.skel differ diff --git a/examples/spineboy/export/spineboy-pma.atlas b/examples/spineboy/export/spineboy-pma.atlas index 9c8bd8e81..ad3d77b11 100644 --- a/examples/spineboy/export/spineboy-pma.atlas +++ b/examples/spineboy/export/spineboy-pma.atlas @@ -4,99 +4,92 @@ spineboy-pma.png pma: true scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/examples/spineboy/export/spineboy-pma.png b/examples/spineboy/export/spineboy-pma.png index 1f322d0bd..711fd836e 100644 Binary files a/examples/spineboy/export/spineboy-pma.png and b/examples/spineboy/export/spineboy-pma.png differ diff --git a/examples/spineboy/export/spineboy-pro.json b/examples/spineboy/export/spineboy-pro.json index 78ba1dc0f..b82754e49 100644 --- a/examples/spineboy/export/spineboy-pro.json +++ b/examples/spineboy/export/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.17", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/examples/spineboy/export/spineboy-pro.skel b/examples/spineboy/export/spineboy-pro.skel index c14f30405..2dd1473d6 100644 Binary files a/examples/spineboy/export/spineboy-pro.skel and b/examples/spineboy/export/spineboy-pro.skel differ diff --git a/examples/spineboy/export/spineboy-run.atlas b/examples/spineboy/export/spineboy-run.atlas index e54da2e7b..7c0a3b9eb 100644 --- a/examples/spineboy/export/spineboy-run.atlas +++ b/examples/spineboy/export/spineboy-run.atlas @@ -1,50 +1,50 @@ spineboy-run.png - size: 1182, 687 + size: 1177, 685 filter: Linear, Linear pma: true spineboy-pro-run index: 8 - bounds: 2, 371, 304, 314 - offsets: 11, 22, 316, 341 + bounds: 2, 369, 302, 314 + offsets: 12, 22, 316, 341 spineboy-pro-run index: 9 - bounds: 2, 44, 278, 325 + bounds: 2, 42, 278, 325 offsets: 30, 2, 316, 341 spineboy-pro-run index: 0 - bounds: 308, 439, 246, 320 + bounds: 306, 438, 245, 320 offsets: 67, 1, 316, 341 rotate: 90 spineboy-pro-run index: 3 - bounds: 630, 443, 242, 320 - offsets: 12, 20, 316, 341 - rotate: 90 -spineboy-pro-run - index: 7 - bounds: 952, 389, 228, 296 - offsets: 36, 33, 316, 341 -spineboy-pro-run - index: 4 - bounds: 308, 195, 242, 320 - offsets: 2, 4, 316, 341 - rotate: 90 -spineboy-pro-run - index: 5 - bounds: 630, 200, 241, 316 - offsets: 8, 3, 316, 341 - rotate: 90 -spineboy-pro-run - index: 1 - bounds: 282, 2, 191, 318 - offsets: 70, 3, 316, 341 + bounds: 628, 441, 242, 319 + offsets: 12, 21, 316, 341 rotate: 90 spineboy-pro-run index: 2 - bounds: 948, 81, 226, 306 + bounds: 949, 377, 226, 306 offsets: 34, 26, 316, 341 spineboy-pro-run - index: 6 - bounds: 630, 4, 194, 316 - offsets: 68, 4, 316, 341 + index: 4 + bounds: 306, 196, 240, 319 + offsets: 3, 5, 316, 341 + rotate: 90 +spineboy-pro-run + index: 1 + bounds: 282, 2, 192, 318 + offsets: 69, 3, 316, 341 + rotate: 90 +spineboy-pro-run + index: 5 + bounds: 628, 198, 241, 316 + offsets: 8, 3, 316, 341 + rotate: 90 +spineboy-pro-run + index: 7 + bounds: 946, 79, 226, 296 + offsets: 37, 33, 316, 341 +spineboy-pro-run + index: 6 + bounds: 627, 2, 194, 315 + offsets: 68, 5, 316, 341 rotate: 90 diff --git a/examples/spineboy/export/spineboy-run.png b/examples/spineboy/export/spineboy-run.png index f3ac39fd4..d599b34fa 100644 Binary files a/examples/spineboy/export/spineboy-run.png and b/examples/spineboy/export/spineboy-run.png differ diff --git a/examples/spineboy/export/spineboy.atlas b/examples/spineboy/export/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/examples/spineboy/export/spineboy.atlas +++ b/examples/spineboy/export/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/examples/spineboy/export/spineboy.png b/examples/spineboy/export/spineboy.png index 074f1e351..0ea9737f3 100644 Binary files a/examples/spineboy/export/spineboy.png and b/examples/spineboy/export/spineboy.png differ diff --git a/examples/spinosaurus/export/spinosaurus-ess.json b/examples/spinosaurus/export/spinosaurus-ess.json index ae8882af7..3c4ff9c84 100644 --- a/examples/spinosaurus/export/spinosaurus-ess.json +++ b/examples/spinosaurus/export/spinosaurus-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "9GzkJCsNn3g", - "spine": "4.1.17", + "hash": "Yij0BMhZTiQ", + "spine": "4.2.09-beta", "x": -840, "y": -766.03, "width": 1680, diff --git a/examples/spinosaurus/export/spinosaurus-ess.skel b/examples/spinosaurus/export/spinosaurus-ess.skel index 90d000e8b..af46b3b9d 100644 Binary files a/examples/spinosaurus/export/spinosaurus-ess.skel and b/examples/spinosaurus/export/spinosaurus-ess.skel differ diff --git a/examples/stretchyman/export/stretchyman-pro.json b/examples/stretchyman/export/stretchyman-pro.json index a7825e2dc..810313f42 100644 --- a/examples/stretchyman/export/stretchyman-pro.json +++ b/examples/stretchyman/export/stretchyman-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "8oGZUTwZfVI", - "spine": "4.1.20", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.09-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -577,7 +577,7 @@ "hip": { "translate": [ {}, - { "time": 1, "y": -1.98 }, + { "time": 1, "y": -4.42 }, { "time": 2 } ] } diff --git a/examples/stretchyman/export/stretchyman-pro.skel b/examples/stretchyman/export/stretchyman-pro.skel index 815094d5e..8f76baf37 100644 Binary files a/examples/stretchyman/export/stretchyman-pro.skel and b/examples/stretchyman/export/stretchyman-pro.skel differ diff --git a/examples/tank/export/tank-pma.atlas b/examples/tank/export/tank-pma.atlas index a84ddf165..32525f6b6 100644 --- a/examples/tank/export/tank-pma.atlas +++ b/examples/tank/export/tank-pma.atlas @@ -4,54 +4,61 @@ tank-pma.png pma: true scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/examples/tank/export/tank-pma.png b/examples/tank/export/tank-pma.png index 270499d29..e84347737 100644 Binary files a/examples/tank/export/tank-pma.png and b/examples/tank/export/tank-pma.png differ diff --git a/examples/tank/export/tank-pro.json b/examples/tank/export/tank-pro.json index 223e04572..a858278b4 100644 --- a/examples/tank/export/tank-pro.json +++ b/examples/tank/export/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.17", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/examples/tank/export/tank-pro.skel b/examples/tank/export/tank-pro.skel index 7b1f71bf2..163e64629 100644 Binary files a/examples/tank/export/tank-pro.skel and b/examples/tank/export/tank-pro.skel differ diff --git a/examples/tank/export/tank.atlas b/examples/tank/export/tank.atlas index 295fb0d22..fdc5a755b 100644 --- a/examples/tank/export/tank.atlas +++ b/examples/tank/export/tank.atlas @@ -3,54 +3,61 @@ tank.png filter: Linear, Linear scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/examples/tank/export/tank.png b/examples/tank/export/tank.png index a50ffc8e4..e0e7f1bfe 100644 Binary files a/examples/tank/export/tank.png and b/examples/tank/export/tank.png differ diff --git a/examples/vine/export/vine-pro.json b/examples/vine/export/vine-pro.json index d0930c9ca..4af855ccf 100644 --- a/examples/vine/export/vine-pro.json +++ b/examples/vine/export/vine-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "J/Kz2d3OlD0", - "spine": "4.1.17", + "hash": "umDSKvQSk4I", + "spine": "4.2.09-beta", "x": -87.7, "y": -1.71, "width": 227.65, diff --git a/examples/vine/export/vine-pro.skel b/examples/vine/export/vine-pro.skel index 0cb9578f7..961ccc37e 100644 Binary files a/examples/vine/export/vine-pro.skel and b/examples/vine/export/vine-pro.skel differ diff --git a/examples/windmill/export/windmill-ess.json b/examples/windmill/export/windmill-ess.json index ccb9f7259..6592cc414 100644 --- a/examples/windmill/export/windmill-ess.json +++ b/examples/windmill/export/windmill-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "tB4/IVbSSaY", - "spine": "4.1.17", + "hash": "RgV8O+WyhW4", + "spine": "4.2.09-beta", "x": -564.6, "y": -335.4, "width": 1124.2, diff --git a/examples/windmill/export/windmill-ess.skel b/examples/windmill/export/windmill-ess.skel index 869d54a2c..352c41ac2 100644 Binary files a/examples/windmill/export/windmill-ess.skel and b/examples/windmill/export/windmill-ess.skel differ diff --git a/examples/windmill/export/windmill-pma.atlas b/examples/windmill/export/windmill-pma.atlas index 8abee6cff..0ca3a5d93 100644 --- a/examples/windmill/export/windmill-pma.atlas +++ b/examples/windmill/export/windmill-pma.atlas @@ -4,66 +4,59 @@ windmill-pma.png pma: true scale: 0.5 bush1 - bounds: 398, 8, 56, 38 + bounds: 558, 70, 56, 38 + rotate: 90 bush2 - bounds: 558, 85, 67, 45 + bounds: 831, 358, 67, 45 rotate: 90 flower-leaf-back - bounds: 27, 5, 16, 11 + bounds: 364, 35, 16, 11 flower-leaf-front - bounds: 45, 5, 16, 11 + bounds: 795, 212, 16, 11 flower-shadow - bounds: 2, 7, 23, 9 + bounds: 999, 501, 23, 9 flower-stem - bounds: 63, 11, 5, 27 - rotate: 90 + bounds: 2, 4, 5, 27 flower1 - bounds: 558, 61, 22, 19 - rotate: 90 + bounds: 599, 149, 22, 19 flower2 - bounds: 579, 63, 20, 17 + bounds: 878, 405, 20, 17 rotate: 90 flower3 - bounds: 598, 67, 15, 16 + bounds: 558, 52, 15, 16 heat - bounds: 624, 185, 48, 52 + bounds: 949, 458, 48, 52 rooster - bounds: 274, 4, 27, 25 - rotate: 90 + bounds: 897, 430, 27, 25 tree1-leaves1 - bounds: 605, 99, 49, 53 + bounds: 599, 170, 49, 53 tree1-leaves2 - bounds: 640, 47, 48, 50 + bounds: 650, 173, 48, 50 tree1-leaves3 - bounds: 500, 3, 43, 42 - rotate: 90 + bounds: 831, 314, 43, 42 tree1-leaves4 - bounds: 544, 3, 43, 42 - rotate: 90 + bounds: 319, 4, 43, 42 tree1-trunk - bounds: 558, 154, 64, 83 + bounds: 831, 427, 64, 83 tree2-leaves1 - bounds: 588, 8, 50, 53 + bounds: 897, 457, 50, 53 tree2-leaves2 - bounds: 656, 133, 48, 50 + bounds: 700, 173, 48, 50 tree2-leaves3 - bounds: 456, 2, 44, 42 + bounds: 275, 2, 44, 42 rotate: 90 tree2-leaves4 - bounds: 640, 2, 43, 42 - rotate: 90 + bounds: 750, 181, 43, 42 tree2-leaves5 - bounds: 684, 3, 42, 42 + bounds: 831, 270, 42, 42 tree2-trunk - bounds: 301, 7, 39, 95 - rotate: 90 + bounds: 558, 128, 39, 95 windmill-base bounds: 2, 48, 554, 462 windmill-blades - bounds: 558, 239, 271, 270 - rotate: 90 + bounds: 558, 240, 271, 270 windmill-blades-wood-h bounds: 2, 33, 271, 13 windmill-blades-wood-v - bounds: 2, 18, 13, 270 + bounds: 558, 225, 13, 270 rotate: 90 diff --git a/examples/windmill/export/windmill-pma.png b/examples/windmill/export/windmill-pma.png index f13041cb5..e123229d6 100644 Binary files a/examples/windmill/export/windmill-pma.png and b/examples/windmill/export/windmill-pma.png differ diff --git a/examples/windmill/export/windmill.atlas b/examples/windmill/export/windmill.atlas index bf0a6cd99..e8960a47a 100644 --- a/examples/windmill/export/windmill.atlas +++ b/examples/windmill/export/windmill.atlas @@ -3,66 +3,59 @@ windmill.png filter: Linear, Linear scale: 0.5 bush1 - bounds: 398, 8, 56, 38 + bounds: 558, 70, 56, 38 + rotate: 90 bush2 - bounds: 558, 85, 67, 45 + bounds: 831, 358, 67, 45 rotate: 90 flower-leaf-back - bounds: 27, 5, 16, 11 + bounds: 364, 35, 16, 11 flower-leaf-front - bounds: 45, 5, 16, 11 + bounds: 795, 212, 16, 11 flower-shadow - bounds: 2, 7, 23, 9 + bounds: 999, 501, 23, 9 flower-stem - bounds: 63, 11, 5, 27 - rotate: 90 + bounds: 2, 4, 5, 27 flower1 - bounds: 558, 61, 22, 19 - rotate: 90 + bounds: 599, 149, 22, 19 flower2 - bounds: 579, 63, 20, 17 + bounds: 878, 405, 20, 17 rotate: 90 flower3 - bounds: 598, 67, 15, 16 + bounds: 558, 52, 15, 16 heat - bounds: 624, 185, 48, 52 + bounds: 949, 458, 48, 52 rooster - bounds: 274, 4, 27, 25 - rotate: 90 + bounds: 897, 430, 27, 25 tree1-leaves1 - bounds: 605, 99, 49, 53 + bounds: 599, 170, 49, 53 tree1-leaves2 - bounds: 640, 47, 48, 50 + bounds: 650, 173, 48, 50 tree1-leaves3 - bounds: 500, 3, 43, 42 - rotate: 90 + bounds: 831, 314, 43, 42 tree1-leaves4 - bounds: 544, 3, 43, 42 - rotate: 90 + bounds: 319, 4, 43, 42 tree1-trunk - bounds: 558, 154, 64, 83 + bounds: 831, 427, 64, 83 tree2-leaves1 - bounds: 588, 8, 50, 53 + bounds: 897, 457, 50, 53 tree2-leaves2 - bounds: 656, 133, 48, 50 + bounds: 700, 173, 48, 50 tree2-leaves3 - bounds: 456, 2, 44, 42 + bounds: 275, 2, 44, 42 rotate: 90 tree2-leaves4 - bounds: 640, 2, 43, 42 - rotate: 90 + bounds: 750, 181, 43, 42 tree2-leaves5 - bounds: 684, 3, 42, 42 + bounds: 831, 270, 42, 42 tree2-trunk - bounds: 301, 7, 39, 95 - rotate: 90 + bounds: 558, 128, 39, 95 windmill-base bounds: 2, 48, 554, 462 windmill-blades - bounds: 558, 239, 271, 270 - rotate: 90 + bounds: 558, 240, 271, 270 windmill-blades-wood-h bounds: 2, 33, 271, 13 windmill-blades-wood-v - bounds: 2, 18, 13, 270 + bounds: 558, 225, 13, 270 rotate: 90 diff --git a/examples/windmill/export/windmill.png b/examples/windmill/export/windmill.png index be9f3fe0a..9cca7fed4 100644 Binary files a/examples/windmill/export/windmill.png and b/examples/windmill/export/windmill.png differ diff --git a/spine-cocos2d-objc/Resources/coin-pro.json b/spine-cocos2d-objc/Resources/coin-pro.json index 1f26f47b6..9d51d1f55 100644 --- a/spine-cocos2d-objc/Resources/coin-pro.json +++ b/spine-cocos2d-objc/Resources/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.23-beta", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-cocos2d-objc/Resources/coin.atlas b/spine-cocos2d-objc/Resources/coin.atlas index 0ff436cff..369cf6779 100644 --- a/spine-cocos2d-objc/Resources/coin.atlas +++ b/spine-cocos2d-objc/Resources/coin.atlas @@ -2,17 +2,17 @@ coin.png size: 1024, 1024 filter: Linear, Linear coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-cocos2d-objc/Resources/coin.png b/spine-cocos2d-objc/Resources/coin.png index 5221caea1..190d853ad 100644 Binary files a/spine-cocos2d-objc/Resources/coin.png and b/spine-cocos2d-objc/Resources/coin.png differ diff --git a/spine-cocos2d-objc/Resources/goblins-pro.json b/spine-cocos2d-objc/Resources/goblins-pro.json index 6caf03bb0..62cd1cf7f 100644 --- a/spine-cocos2d-objc/Resources/goblins-pro.json +++ b/spine-cocos2d-objc/Resources/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-cocos2d-objc/Resources/goblins.atlas b/spine-cocos2d-objc/Resources/goblins.atlas index b40ca29fc..06022ce54 100644 --- a/spine-cocos2d-objc/Resources/goblins.atlas +++ b/spine-cocos2d-objc/Resources/goblins.atlas @@ -2,95 +2,100 @@ goblins.png size: 1024, 128 filter: Linear, Linear dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-cocos2d-objc/Resources/goblins.png b/spine-cocos2d-objc/Resources/goblins.png index 5c1e4e7b6..6ac8d5454 100644 Binary files a/spine-cocos2d-objc/Resources/goblins.png and b/spine-cocos2d-objc/Resources/goblins.png differ diff --git a/spine-cocos2d-objc/Resources/raptor-pro.json b/spine-cocos2d-objc/Resources/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-cocos2d-objc/Resources/raptor-pro.json +++ b/spine-cocos2d-objc/Resources/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-cocos2d-objc/Resources/raptor.atlas b/spine-cocos2d-objc/Resources/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/spine-cocos2d-objc/Resources/raptor.atlas +++ b/spine-cocos2d-objc/Resources/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-cocos2d-objc/Resources/raptor.png b/spine-cocos2d-objc/Resources/raptor.png index 474f6316b..f8bed53d2 100644 Binary files a/spine-cocos2d-objc/Resources/raptor.png and b/spine-cocos2d-objc/Resources/raptor.png differ diff --git a/spine-cocos2d-objc/Resources/spineboy-pro.json b/spine-cocos2d-objc/Resources/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-cocos2d-objc/Resources/spineboy-pro.json +++ b/spine-cocos2d-objc/Resources/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-cocos2d-objc/Resources/spineboy.atlas b/spine-cocos2d-objc/Resources/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-cocos2d-objc/Resources/spineboy.atlas +++ b/spine-cocos2d-objc/Resources/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-cocos2d-objc/Resources/spineboy.png b/spine-cocos2d-objc/Resources/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-cocos2d-objc/Resources/spineboy.png and b/spine-cocos2d-objc/Resources/spineboy.png differ diff --git a/spine-cocos2d-objc/Resources/tank-pro.json b/spine-cocos2d-objc/Resources/tank-pro.json index dfc32cab5..a858278b4 100644 --- a/spine-cocos2d-objc/Resources/tank-pro.json +++ b/spine-cocos2d-objc/Resources/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.23-beta", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/spine-cocos2d-objc/Resources/tank.atlas b/spine-cocos2d-objc/Resources/tank.atlas index 295fb0d22..fdc5a755b 100644 --- a/spine-cocos2d-objc/Resources/tank.atlas +++ b/spine-cocos2d-objc/Resources/tank.atlas @@ -3,54 +3,61 @@ tank.png filter: Linear, Linear scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-cocos2d-objc/Resources/tank.png b/spine-cocos2d-objc/Resources/tank.png index 2227d210a..e0e7f1bfe 100644 Binary files a/spine-cocos2d-objc/Resources/tank.png and b/spine-cocos2d-objc/Resources/tank.png differ diff --git a/spine-cocos2dx/example/Resources/common/coin-pro.skel b/spine-cocos2dx/example/Resources/common/coin-pro.skel index 1d51ea693..7cf937338 100644 Binary files a/spine-cocos2dx/example/Resources/common/coin-pro.skel and b/spine-cocos2dx/example/Resources/common/coin-pro.skel differ diff --git a/spine-cocos2dx/example/Resources/common/coin.atlas b/spine-cocos2dx/example/Resources/common/coin.atlas index 0ff436cff..369cf6779 100644 --- a/spine-cocos2dx/example/Resources/common/coin.atlas +++ b/spine-cocos2dx/example/Resources/common/coin.atlas @@ -2,17 +2,17 @@ coin.png size: 1024, 1024 filter: Linear, Linear coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-cocos2dx/example/Resources/common/coin.png b/spine-cocos2dx/example/Resources/common/coin.png index 5221caea1..190d853ad 100644 Binary files a/spine-cocos2dx/example/Resources/common/coin.png and b/spine-cocos2dx/example/Resources/common/coin.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-ess.skel b/spine-cocos2dx/example/Resources/common/dragon-ess.skel index 27e251df1..3bfb31358 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-ess.skel and b/spine-cocos2dx/example/Resources/common/dragon-ess.skel differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma.atlas b/spine-cocos2dx/example/Resources/common/dragon-pma.atlas index 10acc3e16..bb91276ed 100644 --- a/spine-cocos2dx/example/Resources/common/dragon-pma.atlas +++ b/spine-cocos2dx/example/Resources/common/dragon-pma.atlas @@ -2,128 +2,116 @@ dragon-pma.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon-pma_2.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon-pma_3.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon-pma_4.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon-pma_5.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon-pma_6.png - size: 1024, 1024 - filter: Linear, Linear - pma: true -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma.png b/spine-cocos2dx/example/Resources/common/dragon-pma.png index bc49bf978..f2bb4c6dd 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma.png and b/spine-cocos2dx/example/Resources/common/dragon-pma.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma_2.png b/spine-cocos2dx/example/Resources/common/dragon-pma_2.png index 084bc5e93..c1d14d282 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma_2.png and b/spine-cocos2dx/example/Resources/common/dragon-pma_2.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma_3.png b/spine-cocos2dx/example/Resources/common/dragon-pma_3.png index 17276d4e6..05f7d73fc 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma_3.png and b/spine-cocos2dx/example/Resources/common/dragon-pma_3.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma_4.png b/spine-cocos2dx/example/Resources/common/dragon-pma_4.png index f0b9d721b..7de20b2c0 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma_4.png and b/spine-cocos2dx/example/Resources/common/dragon-pma_4.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma_5.png b/spine-cocos2dx/example/Resources/common/dragon-pma_5.png index f98942cba..fa0f5075b 100644 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma_5.png and b/spine-cocos2dx/example/Resources/common/dragon-pma_5.png differ diff --git a/spine-cocos2dx/example/Resources/common/dragon-pma_6.png b/spine-cocos2dx/example/Resources/common/dragon-pma_6.png deleted file mode 100644 index ebbfe9285..000000000 Binary files a/spine-cocos2dx/example/Resources/common/dragon-pma_6.png and /dev/null differ diff --git a/spine-cocos2dx/example/Resources/common/goblins-pro.json b/spine-cocos2dx/example/Resources/common/goblins-pro.json index 6caf03bb0..62cd1cf7f 100644 --- a/spine-cocos2dx/example/Resources/common/goblins-pro.json +++ b/spine-cocos2dx/example/Resources/common/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-cocos2dx/example/Resources/common/goblins.atlas b/spine-cocos2dx/example/Resources/common/goblins.atlas index b40ca29fc..06022ce54 100644 --- a/spine-cocos2dx/example/Resources/common/goblins.atlas +++ b/spine-cocos2dx/example/Resources/common/goblins.atlas @@ -2,95 +2,100 @@ goblins.png size: 1024, 128 filter: Linear, Linear dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-cocos2dx/example/Resources/common/goblins.png b/spine-cocos2dx/example/Resources/common/goblins.png index 5c1e4e7b6..6ac8d5454 100644 Binary files a/spine-cocos2dx/example/Resources/common/goblins.png and b/spine-cocos2dx/example/Resources/common/goblins.png differ diff --git a/spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel b/spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel index 4cca62bce..90d19987e 100644 Binary files a/spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel and b/spine-cocos2dx/example/Resources/common/mix-and-match-pro.skel differ diff --git a/spine-cocos2dx/example/Resources/common/mix-and-match.atlas b/spine-cocos2dx/example/Resources/common/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-cocos2dx/example/Resources/common/mix-and-match.atlas +++ b/spine-cocos2dx/example/Resources/common/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-cocos2dx/example/Resources/common/mix-and-match.png b/spine-cocos2dx/example/Resources/common/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-cocos2dx/example/Resources/common/mix-and-match.png and b/spine-cocos2dx/example/Resources/common/mix-and-match.png differ diff --git a/spine-cocos2dx/example/Resources/common/raptor-pro.json b/spine-cocos2dx/example/Resources/common/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-cocos2dx/example/Resources/common/raptor-pro.json +++ b/spine-cocos2dx/example/Resources/common/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-cocos2dx/example/Resources/common/raptor.atlas b/spine-cocos2dx/example/Resources/common/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/spine-cocos2dx/example/Resources/common/raptor.atlas +++ b/spine-cocos2dx/example/Resources/common/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-cocos2dx/example/Resources/common/raptor.png b/spine-cocos2dx/example/Resources/common/raptor.png index 474f6316b..f8bed53d2 100644 Binary files a/spine-cocos2dx/example/Resources/common/raptor.png and b/spine-cocos2dx/example/Resources/common/raptor.png differ diff --git a/spine-cocos2dx/example/Resources/common/spineboy-pro.json b/spine-cocos2dx/example/Resources/common/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-cocos2dx/example/Resources/common/spineboy-pro.json +++ b/spine-cocos2dx/example/Resources/common/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-cocos2dx/example/Resources/common/spineboy.atlas b/spine-cocos2dx/example/Resources/common/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-cocos2dx/example/Resources/common/spineboy.atlas +++ b/spine-cocos2dx/example/Resources/common/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-cocos2dx/example/Resources/common/spineboy.png b/spine-cocos2dx/example/Resources/common/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-cocos2dx/example/Resources/common/spineboy.png and b/spine-cocos2dx/example/Resources/common/spineboy.png differ diff --git a/spine-cocos2dx/example/Resources/common/tank-pro.skel b/spine-cocos2dx/example/Resources/common/tank-pro.skel index 3f7020c06..163e64629 100644 Binary files a/spine-cocos2dx/example/Resources/common/tank-pro.skel and b/spine-cocos2dx/example/Resources/common/tank-pro.skel differ diff --git a/spine-cocos2dx/example/Resources/common/tank.atlas b/spine-cocos2dx/example/Resources/common/tank.atlas index 295fb0d22..fdc5a755b 100644 --- a/spine-cocos2dx/example/Resources/common/tank.atlas +++ b/spine-cocos2dx/example/Resources/common/tank.atlas @@ -3,54 +3,61 @@ tank.png filter: Linear, Linear scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-cocos2dx/example/Resources/common/tank.png b/spine-cocos2dx/example/Resources/common/tank.png index 2227d210a..e0e7f1bfe 100644 Binary files a/spine-cocos2dx/example/Resources/common/tank.png and b/spine-cocos2dx/example/Resources/common/tank.png differ diff --git a/spine-flutter/example/assets/chibi/chibi-stickers.atlas b/spine-flutter/example/assets/chibi/chibi-stickers.atlas deleted file mode 100644 index 106cfcca4..000000000 --- a/spine-flutter/example/assets/chibi/chibi-stickers.atlas +++ /dev/null @@ -1,409 +0,0 @@ -chibi-stickers.webp -size:2017,491 -filter:Linear,Linear -scale:0.5 -common/angry-mark -bounds:1801,65,42,41 -common/big-purple-fear -bounds:1640,212,134,71 -offsets:0,0,134,72 -rotate:90 -common/big-tear -bounds:1454,15,33,82 -common/eye-3 -bounds:1611,2,15,26 -rotate:90 -common/eye-closed-happy -bounds:1685,348,25,9 -common/eye-dafault -bounds:1993,51,22,21 -common/eye-equal -bounds:1271,146,25,15 -common/eye-fire -bounds:1673,49,26,28 -common/eye-half-open -bounds:1475,101,26,16 -rotate:90 -common/eye-heart -bounds:1094,2,26,23 -rotate:90 -common/eye-reverse-v -bounds:1945,26,26,16 -common/eye-sideway-v -bounds:945,2,21,23 -rotate:90 -common/eye-slant-close -bounds:321,72,23,16 -common/eye-small-dot -bounds:1120,146,14,14 -offsets:0,1,15,15 -common/eye-sparkle -bounds:1810,4,30,29 -rotate:90 -common/eye-star -bounds:534,235,29,27 -rotate:90 -common/eye-twirl -bounds:970,2,21,23 -rotate:90 -common/eye-u -bounds:733,238,24,17 -rotate:90 -common/eye-x -bounds:1993,74,25,22 -rotate:90 -common/lamp -bounds:1319,2,47,65 -common/mouth-3 -bounds:1581,2,15,28 -rotate:90 -common/mouth-bracket -bounds:1450,2,34,11 -common/mouth-doubt -bounds:1639,2,26,15 -common/mouth-fangs -bounds:549,300,39,14 -rotate:90 -common/mouth-line -bounds:1601,212,36,7 -common/mouth-neutral -bounds:807,2,27,12 -common/mouth-o-tall -bounds:1993,101,22,33 -common/mouth-open-smile -bounds:359,33,36,22 -rotate:90 -common/mouth-rectangle -bounds:875,2,35,21 -common/mouth-reverse-v -bounds:1368,2,27,10 -common/mouth-s -bounds:2003,262,41,11 -rotate:90 -common/mouth-smile-little -bounds:1928,71,33,19 -rotate:90 -common/mouth-toungue-sticking-out -bounds:912,2,31,21 -common/mouth-u -bounds:383,33,36,19 -rotate:90 -common/mouth-v -bounds:563,235,27,14 -rotate:90 -common/mouth-x -bounds:1944,4,21,20 -common/purple-fear-lines -bounds:1807,108,48,28 -common/shadow -bounds:359,2,111,29 -offsets:1,1,113,31 -common/small-drop-line -bounds:1925,22,16,17 -rotate:90 -common/small-purple-fear -bounds:1941,451,54,38 -common/tear -bounds:995,3,20,19 -rotate:90 -erikari/arm -bounds:1383,99,28,90 -rotate:90 -erikari/arm-shoulder-decoration -bounds:1765,2,32,43 -rotate:90 -erikari/back-hair -bounds:565,348,158,141 -erikari/back-hair-long -bounds:2,235,220,254 -erikari/blush -bounds:555,43,29,18 -rotate:90 -erikari/body -bounds:575,2,70,98 -rotate:90 -erikari/bracelet -bounds:1841,2,33,11 -rotate:90 -erikari/collar -bounds:1320,99,61,62 -erikari/ear -bounds:105,2,34,42 -rotate:90 -erikari/eyebrow -bounds:2003,241,19,12 -offsets:0,0,20,12 -rotate:90 -erikari/hair-front -bounds:517,103,130,65 -rotate:90 -erikari/hair-side -bounds:1137,176,43,132 -rotate:90 -erikari/hat-border -bounds:1685,450,254,39 -erikari/hat-top -bounds:346,71,160,60 -rotate:90 -erikari/head-base -bounds:1060,221,143,125 -erikari/leg -bounds:2,8,28,101 -rotate:90 -erikari/leg-decoration -bounds:1412,2,36,13 -erikari/skirt -bounds:224,233,164,101 -erikari/strawberries-decoration -bounds:1271,163,112,56 -harri/arm -bounds:1320,69,28,90 -rotate:90 -harri/back-hair -bounds:725,348,158,141 -harri/back-hair-long -bounds:1412,17,40,80 -harri/beard -bounds:1397,2,10,11 -rotate:90 -harri/blush -bounds:1240,156,29,18 -luke/blush -bounds:1240,156,29,18 -nate/blush -bounds:1240,156,29,18 -spineboy/blush -bounds:1240,156,29,18 -harri/body -bounds:675,2,70,98 -rotate:90 -harri/body-decoration -bounds:287,2,70,67 -harri/ear -bounds:149,2,34,42 -rotate:90 -soeren/ear -bounds:149,2,34,42 -rotate:90 -spineboy/ear -bounds:149,2,34,42 -rotate:90 -harri/eyebrow -bounds:2003,305,22,12 -rotate:90 -harri/hair-front -bounds:1866,358,143,90 -harri/head-base -bounds:1205,221,143,125 -luke/head-base -bounds:1205,221,143,125 -soeren/head-base -bounds:1205,221,143,125 -spineboy/head-base -bounds:1205,221,143,125 -harri/leg -bounds:1017,132,28,101 -rotate:90 -harri/sword -bounds:565,264,185,82 -luke/arm -bounds:1489,71,28,90 -rotate:90 -luke/arm-shoulder-decoration -bounds:1801,36,31,27 -luke/back-hair -bounds:885,348,158,141 -luke/body -bounds:775,16,70,98 -rotate:90 -luke/eyebrow -bounds:836,2,27,12 -nate/eyebrow -bounds:836,2,27,12 -spineboy/eyebrow -bounds:836,2,27,12 -luke/face-cover -bounds:224,336,169,153 -luke/glasses-shadow -bounds:584,181,147,81 -luke/hair-decoration -bounds:408,103,130,107 -rotate:90 -luke/hair-front -bounds:1013,162,122,57 -luke/leg -bounds:1016,30,28,101 -rotate:90 -luke/shield -bounds:1495,131,88,104 -rotate:90 -luke/skirt -bounds:1845,73,81,31 -luke/sword -bounds:1601,139,102,71 -offsets:0,0,104,71 -mario/arm -bounds:1489,41,28,90 -rotate:90 -mario/back-hair -bounds:395,341,168,148 -mario/back-hair-long -bounds:194,2,86,91 -rotate:90 -mario/beard -bounds:1858,136,147,93 -mario/blush -bounds:1854,17,29,18 -mario/body -bounds:1018,60,70,98 -rotate:90 -mario/ear -bounds:1949,100,34,42 -rotate:90 -mario/eyebrow -bounds:287,71,32,17 -mario/hair-front -bounds:874,158,137,66 -mario/head-base -bounds:1350,221,143,125 -mario/leg -bounds:1137,146,28,101 -rotate:90 -misaki/arm -bounds:1489,11,28,90 -rotate:90 -misaki/back-hair -bounds:1045,348,158,141 -misaki/back-hair-long -bounds:2,38,190,195 -misaki/belt -bounds:1016,2,76,26 -misaki/blush -bounds:1925,40,29,18 -rotate:90 -misaki/body -bounds:1701,36,70,98 -rotate:90 -misaki/ear -bounds:1949,64,34,42 -rotate:90 -misaki/eyebrow -bounds:775,2,30,12 -misaki/glasses -bounds:875,72,141,35 -misaki/glasses-side -bounds:1240,146,8,23 -rotate:90 -misaki/hair-front -bounds:733,88,140,59 -misaki/hair-side -bounds:875,109,47,140 -rotate:90 -misaki/head-base -bounds:1495,221,143,125 -misaki/leg -bounds:1601,109,28,101 -rotate:90 -misaki/skirt -bounds:1385,129,108,90 -nate/arm -bounds:1581,49,28,90 -rotate:90 -nate/back-hair -bounds:1205,348,158,141 -nate/beard -bounds:584,111,147,68 -nate/body -bounds:1120,74,70,98 -rotate:90 -nate/ear -bounds:1845,37,34,42 -rotate:90 -nate/glasses -bounds:584,74,141,35 -nate/glasses-side -bounds:555,33,8,16 -rotate:90 -nate/hair-front -bounds:390,235,142,65 -nate/head-base -bounds:1713,232,143,125 -nate/leg -bounds:1704,108,28,101 -rotate:90 -sinisa/arm -bounds:1581,19,28,90 -rotate:90 -sinisa/back-hair -bounds:1365,348,158,141 -sinisa/beard -bounds:875,25,139,45 -sinisa/blush -bounds:1945,44,29,18 -sinisa/body -bounds:1119,2,70,98 -rotate:90 -sinisa/body-decoration -bounds:555,74,27,27 -sinisa/ear -bounds:1889,29,34,42 -sinisa/eyebrow -bounds:1997,451,38,18 -offsets:0,0,38,19 -rotate:90 -sinisa/hair-front -bounds:1713,138,143,92 -sinisa/head-base -bounds:1858,231,143,125 -sinisa/leg -bounds:1495,101,28,101 -rotate:90 -soeren/arm -bounds:1673,6,28,90 -rotate:90 -soeren/back-hair -bounds:194,90,150,141 -soeren/beard -bounds:408,33,145,68 -soeren/blush -bounds:1885,9,29,18 -soeren/body -bounds:1219,2,70,98 -rotate:90 -soeren/eyebrow -bounds:2003,329,27,12 -rotate:90 -soeren/glasses -bounds:395,302,152,37 -soeren/glasses-side -bounds:1486,2,7,20 -rotate:90 -soeren/glove -bounds:1368,14,42,53 -soeren/hair-front -bounds:752,233,159,113 -soeren/leg -bounds:1598,79,28,101 -rotate:90 -spineboy/arm -bounds:1857,106,28,90 -rotate:90 -spineboy/arm-decoration -bounds:534,266,32,29 -rotate:90 -spineboy/arm-shoulder-decoration -bounds:1973,19,23,23 -spineboy/back-hair -bounds:1525,348,158,141 -spineboy/body -bounds:1220,74,70,98 -rotate:90 -spineboy/glasses -bounds:1685,359,179,89 -spineboy/glasses-shadow -bounds:733,149,139,82 -spineboy/hair-front -bounds:913,226,145,120 -spineboy/leg -bounds:472,2,29,101 -rotate:90 diff --git a/spine-flutter/example/assets/chibi/chibi-stickers.skel b/spine-flutter/example/assets/chibi/chibi-stickers.skel deleted file mode 100644 index 61779a67b..000000000 Binary files a/spine-flutter/example/assets/chibi/chibi-stickers.skel and /dev/null differ diff --git a/spine-flutter/example/assets/chibi/chibi-stickers.webp b/spine-flutter/example/assets/chibi/chibi-stickers.webp deleted file mode 100644 index 2232efb04..000000000 Binary files a/spine-flutter/example/assets/chibi/chibi-stickers.webp and /dev/null differ diff --git a/spine-flutter/example/assets/dragon-ess.json b/spine-flutter/example/assets/dragon-ess.json deleted file mode 100644 index 274ef6306..000000000 --- a/spine-flutter/example/assets/dragon-ess.json +++ /dev/null @@ -1,1079 +0,0 @@ -{ -"skeleton": { - "hash": "aPoA1GjXkVI", - "spine": "4.1.17", - "x": -366.31, - "y": -327.81, - "width": 660.39, - "height": 643, - "images": "./images/", - "audio": "././" -}, -"bones": [ - { "name": "root", "y": -176.12 }, - { "name": "center", "parent": "root", "y": 176.12, "color": "ffe300ff" }, - { - "name": "back", - "parent": "center", - "length": 115.38, - "rotation": 151.83, - "x": 16.04, - "y": 27.94, - "color": "ffe400ff" - }, - { - "name": "chest", - "parent": "center", - "length": 31.24, - "rotation": 161.7, - "x": 52.53, - "y": 15.35, - "color": "ffe400ff" - }, - { - "name": "neck", - "parent": "center", - "length": 41.37, - "rotation": 39.06, - "x": 64.76, - "y": 11.98, - "color": "ffe400ff" - }, - { - "name": "chin", - "parent": "neck", - "length": 153.16, - "rotation": -69.07, - "x": 64.63, - "y": -6.99, - "color": "ffe400ff" - }, - { - "name": "head", - "parent": "neck", - "length": 188.84, - "rotation": 8.07, - "x": 69.96, - "y": 2.5, - "color": "ffe400ff" - }, - { - "name": "left-front-thigh", - "parent": "chest", - "length": 67.42, - "rotation": 138.94, - "x": -45.59, - "y": 7.93, - "color": "ff0000ff" - }, - { - "name": "left-front-leg", - "parent": "left-front-thigh", - "length": 51.58, - "rotation": 43.36, - "x": 67.42, - "y": 0.03, - "color": "ff0000ff" - }, - { - "name": "left-front-toe1", - "parent": "left-front-leg", - "length": 51.45, - "rotation": -98.01, - "x": 45.54, - "y": 2.43, - "color": "ff0000ff" - }, - { - "name": "left-front-toe2", - "parent": "left-front-leg", - "length": 61.98, - "rotation": -55.26, - "x": 51.58, - "y": -0.13, - "color": "ff0000ff" - }, - { - "name": "left-front-toe3", - "parent": "left-front-leg", - "length": 45.65, - "rotation": -11.14, - "x": 54.19, - "y": 0.6, - "scaleX": 1.135, - "color": "ff0000ff" - }, - { - "name": "left-front-toe4", - "parent": "left-front-leg", - "length": 53.47, - "rotation": 19.43, - "x": 50.61, - "y": 7.09, - "scaleX": 1.135, - "color": "ff0000ff" - }, - { - "name": "right-rear-thigh", - "parent": "back", - "length": 123.47, - "rotation": 104.88, - "x": 65.31, - "y": 59.89, - "color": "29ff00ff" - }, - { - "name": "left-rear-thigh", - "parent": "right-rear-thigh", - "length": 88.06, - "rotation": 28.35, - "x": -8.59, - "y": 30.19, - "color": "ff0000ff" - }, - { - "name": "left-rear-leg", - "parent": "left-rear-thigh", - "length": 103.74, - "rotation": -122.41, - "x": 96.04, - "y": -0.97, - "color": "ff0000ff" - }, - { - "name": "left-wing", - "parent": "chest", - "length": 301.12, - "rotation": -75.51, - "x": -7.25, - "y": -24.66, - "color": "ff0000ff" - }, - { - "name": "right-front-thigh", - "parent": "chest", - "length": 81.64, - "rotation": 67.97, - "x": -10.89, - "y": 28.25, - "color": "29ff00ff" - }, - { - "name": "right-front-leg", - "parent": "right-front-thigh", - "length": 66.53, - "rotation": 92.7, - "x": 83.05, - "y": -0.31, - "color": "29ff00ff" - }, - { - "name": "right-front-toe1", - "parent": "right-front-leg", - "length": 46.66, - "rotation": 8.59, - "x": 70.03, - "y": 5.31, - "color": "29ff00ff" - }, - { - "name": "right-front-toe2", - "parent": "right-front-leg", - "length": 53.67, - "rotation": -35.02, - "x": 66.53, - "y": 0.34, - "color": "29ff00ff" - }, - { - "name": "right-front-toe3", - "parent": "right-front-leg", - "length": 58.39, - "rotation": -74.67, - "x": 62.1, - "y": -0.79, - "color": "29ff00ff" - }, - { - "name": "right-rear-leg", - "parent": "right-rear-thigh", - "length": 91.06, - "rotation": -129.04, - "x": 123.47, - "y": -0.27, - "color": "29ff00ff" - }, - { - "name": "right-rear-toe1", - "parent": "right-rear-leg", - "length": 95, - "rotation": 141.98, - "x": 90.07, - "y": 2.12, - "color": "29ff00ff" - }, - { - "name": "right-rear-toe2", - "parent": "right-rear-leg", - "length": 99.29, - "rotation": 125.32, - "x": 89.6, - "y": 1.52, - "color": "29ff00ff" - }, - { - "name": "right-rear-toe3", - "parent": "right-rear-leg", - "length": 103.46, - "rotation": 112.27, - "x": 91.06, - "y": -0.35, - "color": "29ff00ff" - }, - { - "name": "right-wing", - "parent": "head", - "length": 359.5, - "rotation": 83.21, - "x": -74.68, - "y": 20.91, - "color": "29ff00ff" - }, - { - "name": "tail1", - "parent": "back", - "length": 65.65, - "rotation": 44.32, - "x": 115.38, - "y": -0.2, - "color": "ffe400ff" - }, - { - "name": "tail2", - "parent": "tail1", - "length": 54.5, - "rotation": 12, - "x": 65.65, - "y": 0.23, - "color": "ffe400ff" - }, - { - "name": "tail3", - "parent": "tail2", - "length": 41.78, - "rotation": 1.8, - "x": 54.5, - "y": 0.37, - "color": "ffe400ff" - }, - { - "name": "tail4", - "parent": "tail3", - "length": 34.19, - "rotation": -1.8, - "x": 41.78, - "y": 0.16, - "color": "ffe400ff" - }, - { - "name": "tail5", - "parent": "tail4", - "length": 32.33, - "rotation": -3.15, - "x": 34.19, - "y": -0.19, - "color": "ffe400ff" - }, - { - "name": "tail6", - "parent": "tail5", - "length": 80.08, - "rotation": -29.55, - "x": 32.33, - "y": -0.23, - "color": "ffe400ff" - } -], -"slots": [ - { "name": "left-rear-leg", "bone": "left-rear-leg", "attachment": "left-rear-leg" }, - { "name": "left-rear-thigh", "bone": "left-rear-thigh", "attachment": "left-rear-thigh" }, - { "name": "left-wing", "bone": "left-wing", "attachment": "left-wing" }, - { "name": "tail6", "bone": "tail6", "attachment": "tail06" }, - { "name": "tail5", "bone": "tail5", "attachment": "tail05" }, - { "name": "tail4", "bone": "tail4", "attachment": "tail04" }, - { "name": "tail3", "bone": "tail3", "attachment": "tail03" }, - { "name": "tail2", "bone": "tail2", "attachment": "tail02" }, - { "name": "tail1", "bone": "tail1", "attachment": "tail01" }, - { "name": "back", "bone": "back", "attachment": "back" }, - { "name": "left-front-thigh", "bone": "left-front-thigh", "attachment": "left-front-thigh" }, - { "name": "left-front-leg", "bone": "left-front-leg", "attachment": "left-front-leg" }, - { "name": "left-front-toe1", "bone": "left-front-toe1", "attachment": "front-toe-a" }, - { "name": "left-front-toe4", "bone": "left-front-toe4", "attachment": "front-toe-b" }, - { "name": "left-front-toe3", "bone": "left-front-toe3", "attachment": "front-toe-b" }, - { "name": "left-front-toe2", "bone": "left-front-toe2", "attachment": "front-toe-b" }, - { "name": "chest", "bone": "chest", "attachment": "chest" }, - { "name": "right-rear-toe1", "bone": "right-rear-toe1", "attachment": "right-rear-toe" }, - { "name": "right-rear-toe2", "bone": "right-rear-toe2", "attachment": "right-rear-toe" }, - { "name": "right-rear-toe3", "bone": "right-rear-toe3", "attachment": "right-rear-toe" }, - { "name": "right-rear-leg", "bone": "right-rear-leg", "attachment": "right-rear-leg" }, - { "name": "right-rear-thigh", "bone": "right-rear-thigh", "attachment": "right-rear-thigh" }, - { "name": "right-front-toe1", "bone": "right-front-toe1", "attachment": "front-toe-b" }, - { "name": "right-front-thigh", "bone": "right-front-thigh", "attachment": "right-front-thigh" }, - { "name": "right-front-leg", "bone": "right-front-leg", "attachment": "right-front-leg" }, - { "name": "right-front-toe2", "bone": "right-front-toe2", "attachment": "front-toe-b" }, - { "name": "right-front-toe3", "bone": "right-front-toe3", "attachment": "front-toe-b" }, - { "name": "chin", "bone": "chin", "attachment": "chin" }, - { "name": "right-wing", "bone": "right-wing", "attachment": "right-wing" }, - { "name": "head", "bone": "head", "attachment": "head" }, - { "name": "thiagobrayner", "bone": "root", "attachment": "thiagobrayner" } -], -"skins": [ - { - "name": "default", - "attachments": { - "back": { - "back": { "x": 35.85, "y": 19.99, "rotation": -151.83, "width": 190, "height": 185 } - }, - "chest": { - "chest": { "x": -14.6, "y": 24.79, "rotation": -161.7, "width": 136, "height": 122 } - }, - "chin": { - "chin": { "x": 66.55, "y": 7.32, "rotation": 30.01, "width": 214, "height": 146 } - }, - "head": { - "head": { "x": 76.69, "y": 32.21, "rotation": -47.13, "width": 296, "height": 260 } - }, - "left-front-leg": { - "left-front-leg": { "x": 14.69, "y": 0.49, "rotation": 16, "width": 84, "height": 57 } - }, - "left-front-thigh": { - "left-front-thigh": { "x": 27.66, "y": -11.59, "rotation": 58.66, "width": 84, "height": 72 } - }, - "left-front-toe1": { - "front-toe-a": { "x": 31.93, "y": 0.61, "rotation": 109.56, "width": 29, "height": 50 } - }, - "left-front-toe2": { - "front-toe-b": { "x": 26.84, "y": -4.95, "rotation": 109.51, "width": 56, "height": 57 } - }, - "left-front-toe3": { - "front-toe-b": { - "x": 18.22, - "y": -7.22, - "scaleX": 0.8811, - "scaleY": 0.9409, - "rotation": 99.71, - "width": 56, - "height": 57 - } - }, - "left-front-toe4": { - "front-toe-b": { "x": 23.21, "y": -11.69, "scaleX": 0.8811, "rotation": 79.89, "width": 56, "height": 57 } - }, - "left-rear-leg": { - "left-rear-leg": { "x": 67.29, "y": 12.63, "rotation": -162.65, "width": 206, "height": 177 } - }, - "left-rear-thigh": { - "left-rear-thigh": { "x": 56.03, "y": 27.39, "rotation": 74.94, "width": 91, "height": 149 } - }, - "left-wing": { - "left-wing": { - "x": -36.32, - "y": -44.53, - "rotation": -83.7, - "width": 264, - "height": 589, - "sequence": { "count": 9, "digits": 2 } - } - }, - "right-front-leg": { - "right-front-leg": { "x": 17.8, "y": 4.23, "rotation": 37.63, "width": 101, "height": 89 } - }, - "right-front-thigh": { - "right-front-thigh": { "x": 35.29, "y": 2.11, "rotation": 130.33, "width": 108, "height": 108 } - }, - "right-front-toe1": { - "front-toe-b": { "x": 24.5, "y": -2.61, "rotation": 104.18, "width": 56, "height": 57 } - }, - "right-front-toe2": { - "front-toe-b": { "x": 26.39, "y": 1.17, "rotation": 104.58, "width": 56, "height": 57 } - }, - "right-front-toe3": { - "front-toe-b": { "x": 30.67, "y": -0.07, "rotation": 112.3, "width": 56, "height": 57 } - }, - "right-rear-leg": { - "right-rear-leg": { "x": 60.88, "y": -5.73, "rotation": -127.67, "width": 116, "height": 100 } - }, - "right-rear-thigh": { - "right-rear-thigh": { "x": 53.25, "y": 12.58, "rotation": 103.29, "width": 91, "height": 149 } - }, - "right-rear-toe1": { - "right-rear-toe": { "x": 54.76, "y": -5.72, "rotation": 134.79, "width": 109, "height": 77 } - }, - "right-rear-toe2": { - "right-rear-toe": { "x": 57.03, "y": -7.23, "rotation": 134.43, "width": 109, "height": 77 } - }, - "right-rear-toe3": { - "right-rear-toe": { "x": 47.46, "y": -7.64, "rotation": 134.34, "width": 109, "height": 77 } - }, - "right-wing": { - "right-wing": { - "x": 35.09, - "y": 78.11, - "rotation": -130.34, - "width": 365, - "height": 643, - "sequence": { "count": 9, "digits": 2 } - } - }, - "tail1": { - "tail01": { "x": 22.6, "y": -4.5, "rotation": 163.85, "width": 120, "height": 153 } - }, - "tail2": { - "tail02": { "x": 18.12, "y": -1.75, "rotation": 151.85, "width": 95, "height": 120 } - }, - "tail3": { - "tail03": { "x": 16.94, "y": -2.01, "rotation": 150.04, "width": 73, "height": 92 } - }, - "tail4": { - "tail04": { "x": 15.35, "y": -2.18, "rotation": 151.85, "width": 56, "height": 71 } - }, - "tail5": { - "tail05": { "x": 15.06, "y": -3.57, "rotation": 155, "width": 52, "height": 59 } - }, - "tail6": { - "tail06": { "x": 28.02, "y": -16.83, "rotation": -175.45, "width": 95, "height": 68 } - }, - "thiagobrayner": { - "thiagobrayner": { "y": -95, "width": 350, "height": 31 } - } - } - } -], -"animations": { - "flying": { - "bones": { - "back": { - "rotate": [ - { - "curve": [ 0.042, 2.86, 0.143, 10.41 ] - }, - { - "time": 0.1667, - "value": 11.59, - "curve": [ 0.245, 15.58, 0.383, 22.41 ] - }, - { - "time": 0.5, - "value": 22.4, - "curve": [ 0.593, 22.39, 0.75, -3.18 ] - }, - { - "time": 0.8333, - "value": -3.18, - "curve": [ 0.875, -3.18, 0.942, -2.19 ] - }, - { "time": 1 } - ] - }, - "neck": { - "rotate": [ - { - "curve": [ 0.092, -0.1, 0.304, -21.22 ] - }, - { - "time": 0.3333, - "value": -23.16, - "curve": [ 0.386, -26.7, 0.442, -31.89 ] - }, - { - "time": 0.5333, - "value": -31.93, - "curve": [ 0.644, -31.97, 0.888, -0.1 ] - }, - { "time": 1 } - ] - }, - "right-rear-leg": { - "rotate": [ - { - "curve": [ 0.054, -7.16, 0.227, -10.75 ] - }, - { - "time": 0.3333, - "value": -10.75, - "curve": [ 0.417, -10.75, 0.583, 23.32 ] - }, - { - "time": 0.6667, - "value": 23.32, - "curve": [ 0.792, 23.32, 0.881, 13.94 ] - }, - { "time": 1 } - ] - }, - "right-rear-toe3": { - "rotate": [ - { - "value": -7.31, - "curve": [ 0.051, -3.08, 0.097, 0 ] - }, - { - "time": 0.1333, - "curve": [ 0.258, 0, 0.508, -36.06 ] - }, - { - "time": 0.6333, - "value": -36.06, - "curve": [ 0.723, -36.06, 0.875, -17.83 ] - }, - { "time": 1, "value": -7.31 } - ] - }, - "right-rear-toe2": { - "rotate": [ - { - "value": -1.41, - "curve": [ 0.025, -0.6, 0.047, 0 ] - }, - { - "time": 0.0667, - "curve": [ 0.192, 0, 0.442, -20.32 ] - }, - { - "time": 0.5667, - "value": -20.32, - "curve": [ 0.673, -20.32, 0.868, -5.88 ] - }, - { "time": 1, "value": -1.41 } - ] - }, - "right-rear-toe1": { - "rotate": [ - { - "curve": [ 0.125, 0, 0.375, -18.71 ] - }, - { - "time": 0.5, - "value": -18.71, - "curve": [ 0.625, -18.71, 0.875, 0 ] - }, - { "time": 1 } - ] - }, - "head": { - "rotate": [ - { - "curve": [ 0.125, 0, 0.375, 1.04 ] - }, - { - "time": 0.5, - "value": 1.04, - "curve": [ 0.625, 1.04, 0.875, 0 ] - }, - { "time": 1 } - ] - }, - "chin": { - "rotate": [ - { - "curve": [ 0.136, -10.78, 0.217, -12.01 ] - }, - { - "time": 0.3333, - "value": -11.71, - "curve": [ 0.443, -11.42, 0.508, 21.91 ] - }, - { - "time": 0.6667, - "value": 22.01, - "curve": [ 0.847, 22.13, 0.95, 5.91 ] - }, - { "time": 1 } - ] - }, - "left-front-thigh": { - "rotate": [ - { - "value": -0.02, - "curve": [ 0.068, -0.02, 0.348, -32.09 ] - }, - { - "time": 0.5, - "value": -32.02, - "curve": [ 0.653, -31.95, 0.906, 0 ] - }, - { "time": 1 } - ] - }, - "right-front-thigh": { - "rotate": [ - { - "curve": [ 0.053, -5.52, 0.125, -12.96 ] - }, - { - "time": 0.1667, - "value": -12.96, - "curve": [ 0.25, -12.96, 0.417, 16.2 ] - }, - { - "time": 0.5, - "value": 16.2, - "curve": [ 0.625, 16.2, 0.866, 9.48 ] - }, - { "time": 1 } - ] - }, - "left-front-leg": { - "rotate": [ - { - "curve": [ 0.09, -12.24, 0.131, -21.37 ] - }, - { - "time": 0.2, - "value": -21.49, - "curve": [ 0.319, -21.94, 0.5, 77.25 ] - }, - { - "time": 0.6, - "value": 77.25, - "curve": [ 0.7, 77.25, 0.908, 12.37 ] - }, - { "time": 1 } - ] - }, - "left-front-toe1": { - "rotate": [ - { - "curve": [ 0.071, -4.48, 0.2, -12.68 ] - }, - { - "time": 0.2667, - "value": -12.68, - "curve": [ 0.375, -12.68, 0.592, 6.99 ] - }, - { - "time": 0.7, - "value": 6.99, - "curve": [ 0.775, 6.99, 0.904, 3.55 ] - }, - { "time": 1 } - ] - }, - "left-front-toe2": { - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.331, 0.125, 1, 0.375, 1.029 ] - }, - { - "time": 0.5, - "x": 1.331, - "y": 1.029, - "curve": [ 0.625, 1.331, 0.875, 1, 0.625, 1.029, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "left-front-toe4": { - "rotate": [ - { - "curve": [ 0.125, 0, 0.375, 26.52 ] - }, - { - "time": 0.5, - "value": 26.52, - "curve": [ 0.625, 26.52, 0.875, 0 ] - }, - { "time": 1 } - ], - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.211, 0.125, 1, 0.375, 0.993 ] - }, - { - "time": 0.5, - "x": 1.211, - "y": 0.993, - "curve": [ 0.625, 1.211, 0.875, 1, 0.625, 0.993, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "left-front-toe3": { - "rotate": [ - { - "curve": [ 0.125, 0, 0.375, 16.99 ] - }, - { - "time": 0.5, - "value": 16.99, - "curve": [ 0.625, 16.99, 0.875, 0 ] - }, - { "time": 1 } - ], - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.355, 0.125, 1, 0.375, 1.008 ] - }, - { - "time": 0.5, - "x": 1.355, - "y": 1.008, - "curve": [ 0.625, 1.355, 0.875, 1, 0.625, 1.008, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "right-front-leg": { - "rotate": [ - { - "curve": [ 0.11, -8.79, 0.179, -18.3 ] - }, - { - "time": 0.2667, - "value": -18.31, - "curve": [ 0.352, -18.33, 0.55, 15.48 ] - }, - { - "time": 0.6333, - "value": 15.48, - "curve": [ 0.758, 15.48, 0.875, 7.9 ] - }, - { "time": 1 } - ] - }, - "right-front-toe1": { - "rotate": [ - { - "curve": [ 0.042, 0, 0.147, 8.28 ] - }, - { - "time": 0.1667, - "value": 10.52, - "curve": [ 0.238, 18.41, 0.406, 35.06 ] - }, - { - "time": 0.5, - "value": 34.84, - "curve": [ 0.577, 34.84, 0.669, 29.65 ] - }, - { - "time": 0.7667, - "value": 20.24, - "curve": [ 0.852, 11.97, 0.941, 0 ] - }, - { "time": 1 } - ], - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.412, 0.125, 1, 0.375, 1 ] - }, - { - "time": 0.5, - "x": 1.412, - "curve": [ 0.625, 1.412, 0.875, 1, 0.625, 1, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "right-front-toe2": { - "rotate": [ - { - "curve": [ 0.042, 0, 0.125, 24.7 ] - }, - { - "time": 0.1667, - "value": 24.7, - "curve": [ 0.25, 24.7, 0.417, 7.35 ] - }, - { - "time": 0.5, - "value": 7.35, - "curve": [ 0.544, 7.35, 0.671, 33.55 ] - }, - { - "time": 0.7333, - "value": 32.36, - "curve": [ 0.853, 30.19, 0.919, 0 ] - }, - { "time": 1 } - ], - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.407, 0.125, 1, 0.375, 1.058 ] - }, - { - "time": 0.5, - "x": 1.407, - "y": 1.058, - "curve": [ 0.625, 1.407, 0.875, 1, 0.625, 1.058, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "right-front-toe3": { - "rotate": [ - { - "curve": [ 0.033, 0, 0.1, 11.01 ] - }, - { - "time": 0.1333, - "value": 11.01, - "curve": [ 0.208, 11.01, 0.358, -5.41 ] - }, - { - "time": 0.4333, - "value": -5.41, - "curve": [ 0.508, -5.41, 0.658, 20.3 ] - }, - { - "time": 0.7333, - "value": 20.3, - "curve": [ 0.8, 20.3, 0.933, 0 ] - }, - { "time": 1 } - ], - "scale": [ - { - "curve": [ 0.125, 1, 0.375, 1.33, 0.125, 1, 0.375, 1.182 ] - }, - { - "time": 0.5, - "x": 1.33, - "y": 1.182, - "curve": [ 0.625, 1.33, 0.875, 1, 0.625, 1.182, 0.875, 1 ] - }, - { "time": 1 } - ] - }, - "right-wing": { - "rotate": [ - { - "value": -9.59, - "curve": [ 0.131, -9.59, 0.191, 22.41 ] - }, - { - "time": 0.3333, - "value": 22.81, - "curve": [ 0.417, 23.05, 0.533, 7.5 ] - }, - { - "time": 0.5667, - "value": 2.07, - "curve": [ 0.588, -1.48, 0.639, -8.35 ] - }, - { - "time": 0.7, - "value": -8.29, - "curve": [ 0.743, -8.24, 0.792, 5.28 ] - }, - { - "time": 0.8333, - "value": 5.02, - "curve": [ 0.904, 4.59, 0.957, -9.72 ] - }, - { "time": 1, "value": -9.59 } - ] - }, - "left-wing": { - "rotate": [ - { - "curve": [ 0.039, 0, 0.084, -21.1 ] - }, - { - "time": 0.1333, - "value": -21.1, - "curve": [ 0.292, -21.1, 0.505, 4.34 ] - }, - { - "time": 0.6333, - "value": 4.48, - "curve": [ 0.679, 4.48, 0.699, -6.03 ] - }, - { - "time": 0.7667, - "value": -5.95, - "curve": [ 0.857, -5.84, 0.936, 0 ] - }, - { "time": 1 } - ] - }, - "left-rear-leg": { - "rotate": [ - { - "curve": [ 0.08, 5.97, 0.25, 15.82 ] - }, - { - "time": 0.3333, - "value": 15.82, - "curve": [ 0.425, 15.82, 0.608, -17.33 ] - }, - { - "time": 0.7, - "value": -17.33, - "curve": [ 0.775, -17.33, 0.871, -8.98 ] - }, - { "time": 1 } - ] - }, - "center": { - "rotate": [ - { - "curve": [ 0.072, 6.07, 0.213, 17.69 ] - }, - { - "time": 0.3333, - "value": 17.69, - "curve": [ 0.454, 17.68, 0.583, -15 ] - }, - { - "time": 0.6667, - "value": -15, - "curve": [ 0.804, -15, 0.966, -3.62 ] - }, - { "time": 1 } - ], - "translate": [ - { - "curve": [ 0.125, 0, 0.375, -0.01, 0.162, 0, 0.288, 144.81 ] - }, - { - "time": 0.5, - "x": -0.01, - "y": 144.61, - "curve": [ 0.625, -0.01, 0.875, 0, 0.718, 145.5, 0.832, 0 ] - }, - { "time": 1 } - ] - }, - "tail1": { - "rotate": [ - { - "value": -1.88, - "curve": [ 0.125, -1.88, 0.375, -67.4 ] - }, - { - "time": 0.5, - "value": -67.4, - "curve": [ 0.625, -67.4, 0.875, -1.88 ] - }, - { "time": 1, "value": -1.88 } - ] - }, - "tail2": { - "rotate": [ - { - "value": -27.45, - "curve": [ 0.125, -27.45, 0.375, 2.68 ] - }, - { - "time": 0.5, - "value": 2.68, - "curve": [ 0.625, 2.68, 0.875, -27.45 ] - }, - { "time": 1, "value": -27.45 } - ] - }, - "tail3": { - "rotate": [ - { - "value": -7.63, - "curve": [ 0.125, -7.63, 0.375, 24.54 ] - }, - { - "time": 0.5, - "value": 24.54, - "curve": [ 0.625, 24.54, 0.875, -7.63 ] - }, - { "time": 1, "value": -7.63 } - ] - }, - "tail4": { - "rotate": [ - { - "value": -10.04, - "curve": [ 0.125, -10.04, 0.375, 1.03 ] - }, - { - "time": 0.5, - "value": 1.03, - "curve": [ 0.625, 1.03, 0.875, -10.04 ] - }, - { "time": 1, "value": -10.04 } - ] - }, - "tail5": { - "rotate": [ - { - "value": -11.26, - "curve": [ 0.152, -11.21, 0.334, 9.91 ] - }, - { - "time": 0.5, - "value": 9.93, - "curve": [ 0.662, 9.95, 0.844, -11.17 ] - }, - { "time": 1, "value": -11.26 } - ] - }, - "tail6": { - "rotate": [ - { - "value": 26.68, - "curve": [ 0.194, 26.72, 0.328, 35.84 ] - }, - { - "time": 0.5, - "value": 35.84, - "curve": [ 0.678, 35.84, 0.818, 26.62 ] - }, - { "time": 1, "value": 26.68 } - ] - }, - "right-rear-thigh": { - "rotate": [ - { - "curve": [ 0.055, -6.4, 0.166, -22.66 ] - }, - { - "time": 0.2667, - "value": -22.66, - "curve": [ 0.384, -22.66, 0.517, 19.08 ] - }, - { - "time": 0.6333, - "value": 19.32, - "curve": [ 0.746, 19.56, 0.91, 9.17 ] - }, - { "time": 1 } - ] - } - }, - "attachments": { - "default": { - "left-wing": { - "left-wing": { - "sequence": [ - { "mode": "loop", "delay": 0.0667 }, - { "time": 0.6 }, - { "time": 0.7333, "mode": "loop", "index": 1 }, - { "time": 0.8, "mode": "loop", "index": 2, "delay": 0.0333 }, - { "time": 0.9667, "index": 7 } - ] - } - }, - "right-wing": { - "right-wing": { - "sequence": [ - { "mode": "loop", "delay": 0.0667 }, - { "time": 0.6 }, - { "time": 0.7333, "mode": "loop", "index": 1 }, - { "time": 0.8, "mode": "loop", "index": 2, "delay": 0.0333 }, - { "time": 0.9667, "index": 7 } - ] - } - } - } - } - } -} -} \ No newline at end of file diff --git a/spine-flutter/example/assets/dragon-ess.skel b/spine-flutter/example/assets/dragon-ess.skel index 27e251df1..3bfb31358 100644 Binary files a/spine-flutter/example/assets/dragon-ess.skel and b/spine-flutter/example/assets/dragon-ess.skel differ diff --git a/spine-flutter/example/assets/dragon.atlas b/spine-flutter/example/assets/dragon.atlas index bca5b1e1b..47b3f3b2a 100644 --- a/spine-flutter/example/assets/dragon.atlas +++ b/spine-flutter/example/assets/dragon.atlas @@ -1,123 +1,112 @@ dragon.png size: 1024, 1024 filter: Linear, Linear -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon_2.png size: 1024, 1024 filter: Linear, Linear -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon_3.png size: 1024, 1024 filter: Linear, Linear -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon_4.png size: 1024, 1024 filter: Linear, Linear -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon_5.png size: 1024, 1024 filter: Linear, Linear -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon_6.png - size: 1024, 1024 - filter: Linear, Linear -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/spine-flutter/example/assets/dragon.png b/spine-flutter/example/assets/dragon.png index f39141c47..3bca338cd 100644 Binary files a/spine-flutter/example/assets/dragon.png and b/spine-flutter/example/assets/dragon.png differ diff --git a/spine-flutter/example/assets/dragon_2.png b/spine-flutter/example/assets/dragon_2.png index 09429b5f8..3dbe2a5a0 100644 Binary files a/spine-flutter/example/assets/dragon_2.png and b/spine-flutter/example/assets/dragon_2.png differ diff --git a/spine-flutter/example/assets/dragon_3.png b/spine-flutter/example/assets/dragon_3.png index 647bcb73b..df2896d51 100644 Binary files a/spine-flutter/example/assets/dragon_3.png and b/spine-flutter/example/assets/dragon_3.png differ diff --git a/spine-flutter/example/assets/dragon_4.png b/spine-flutter/example/assets/dragon_4.png index 8de760989..270b0959d 100644 Binary files a/spine-flutter/example/assets/dragon_4.png and b/spine-flutter/example/assets/dragon_4.png differ diff --git a/spine-flutter/example/assets/dragon_5.png b/spine-flutter/example/assets/dragon_5.png index 5a98f7efa..4e9f7a843 100644 Binary files a/spine-flutter/example/assets/dragon_5.png and b/spine-flutter/example/assets/dragon_5.png differ diff --git a/spine-flutter/example/assets/dragon_6.png b/spine-flutter/example/assets/dragon_6.png deleted file mode 100644 index 49a39f648..000000000 Binary files a/spine-flutter/example/assets/dragon_6.png and /dev/null differ diff --git a/spine-flutter/example/assets/mix-and-match-pro.skel b/spine-flutter/example/assets/mix-and-match-pro.skel index 4cca62bce..90d19987e 100644 Binary files a/spine-flutter/example/assets/mix-and-match-pro.skel and b/spine-flutter/example/assets/mix-and-match-pro.skel differ diff --git a/spine-flutter/example/assets/mix-and-match.atlas b/spine-flutter/example/assets/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-flutter/example/assets/mix-and-match.atlas +++ b/spine-flutter/example/assets/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-flutter/example/assets/mix-and-match.png b/spine-flutter/example/assets/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-flutter/example/assets/mix-and-match.png and b/spine-flutter/example/assets/mix-and-match.png differ diff --git a/spine-flutter/example/assets/spineboy-pro.json b/spine-flutter/example/assets/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-flutter/example/assets/spineboy-pro.json +++ b/spine-flutter/example/assets/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-flutter/example/assets/spineboy-pro.skel b/spine-flutter/example/assets/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-flutter/example/assets/spineboy-pro.skel and b/spine-flutter/example/assets/spineboy-pro.skel differ diff --git a/spine-flutter/example/assets/spineboy.atlas b/spine-flutter/example/assets/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-flutter/example/assets/spineboy.atlas +++ b/spine-flutter/example/assets/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-flutter/example/assets/spineboy.png b/spine-flutter/example/assets/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-flutter/example/assets/spineboy.png and b/spine-flutter/example/assets/spineboy.png differ diff --git a/spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json b/spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json index 9f27b879a..c9fbbd628 100644 --- a/spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json +++ b/spine-godot/example-v4/assets/mix-and-match/mix-and-match-pro.spine-json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas b/spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas +++ b/spine-godot/example-v4/assets/mix-and-match/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-godot/example-v4/assets/mix-and-match/mix-and-match.png b/spine-godot/example-v4/assets/mix-and-match/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-godot/example-v4/assets/mix-and-match/mix-and-match.png and b/spine-godot/example-v4/assets/mix-and-match/mix-and-match.png differ diff --git a/spine-godot/example-v4/assets/raggedyspineboy/raggedy spineboy.spine-json b/spine-godot/example-v4/assets/raggedyspineboy/raggedy spineboy.spine-json deleted file mode 100644 index ece22dd22..000000000 --- a/spine-godot/example-v4/assets/raggedyspineboy/raggedy spineboy.spine-json +++ /dev/null @@ -1,304 +0,0 @@ -{ -"skeleton": { - "hash": "ukmbgK+14T0", - "spine": "4.1.23-beta", - "x": -78.45, - "y": -9.66, - "width": 157.48, - "height": 364.98, - "images": "./images/", - "audio": "" -}, -"bones": [ - { "name": "root" }, - { "name": "hip", "parent": "root", "x": -0.79, "y": 82.38 }, - { "name": "abdomen", "parent": "hip", "length": 33.5, "rotation": 89.55, "y": -0.1 }, - { "name": "chest", "parent": "abdomen", "length": 29.58, "x": 38.08, "y": 0.73 }, - { "name": "L-arm", "parent": "chest", "length": 32.68, "rotation": -121.23, "x": 24.64, "y": -16.69 }, - { "name": "L-thigh", "parent": "hip", "length": 29.76, "rotation": -81.94, "x": 17.32, "y": -5.2 }, - { "name": "L-foot", "parent": "L-thigh", "length": 37.25, "rotation": -6.29, "x": 37.36, "y": -1.79 }, - { "name": "L-forearm", "parent": "L-arm", "length": 33.69, "rotation": -12.09, "x": 39.1, "y": -2.35 }, - { "name": "R-arm", "parent": "chest", "length": 36.76, "rotation": 133.38, "x": 26, "y": 13.63 }, - { "name": "R-thigh", "parent": "hip", "length": 29.49, "rotation": -93.16, "x": -18.19, "y": -6.06 }, - { "name": "R-foot", "parent": "R-thigh", "length": 39.99, "rotation": -1.8, "x": 36.41, "y": 0.27 }, - { "name": "R-forearm", "parent": "R-arm", "length": 36.13, "rotation": 2.73, "x": 41.66, "y": 0.28 }, - { "name": "head", "parent": "chest", "length": 94.23, "rotation": -2.25, "x": 41.02, "y": -0.11 }, - { "name": "scalp", "parent": "head", "length": 31.95, "rotation": -29.89, "x": 129.34, "y": 15.1 }, - { "name": "hair1", "parent": "scalp", "length": 23.01, "rotation": 68.49, "x": 36.51, "y": 4.13 }, - { "name": "hair2", "parent": "hair1", "length": 23.5, "rotation": 59.56, "x": 29.03, "y": 1.58 } -], -"slots": [ - { "name": "R-arm", "bone": "R-arm", "attachment": "arm" }, - { "name": "L-arm", "bone": "L-arm", "attachment": "arm" }, - { "name": "L-leg", "bone": "L-thigh", "attachment": "leg" }, - { "name": "R-leg", "bone": "R-thigh", "attachment": "leg" }, - { "name": "torso", "bone": "abdomen", "attachment": "torso" }, - { "name": "head", "bone": "head", "attachment": "head" } -], -"skins": [ - { - "name": "default", - "attachments": { - "head": { - "head": { - "type": "mesh", - "uvs": [ 0.60755, 0.01864, 0.64146, 0.03355, 0.70227, 0.06028, 0.76687, 0.08869, 0.80696, 0.14524, 0.84158, 0.19407, 1, 0.41294, 1, 0.78562, 0.67349, 1, 0.38214, 1, 0.13935, 0.8937, 0.07949, 0.78808, 0.05899, 0.7519, 0, 0.64781, 0, 0.40213, 0.15055, 0.27784, 0.25632, 0.21734, 0.28424, 0.20137, 0.31117, 0.18597, 0.32034, 0.16739, 0.32984, 0.14814, 0.3317, 0.12798, 0.33358, 0.1076, 0.29623, 0.08869, 0.21779, 0.06978, 0.2514, 0.03195, 0.32659, 0.01699, 0.37521, 0.00732, 0.41202, 0, 0.45684, 0, 0.49046, 0, 0.53155, 0, 0.56517, 0, 0.55023, 0.1049, 0.46058, 0.06437, 0.38587, 0.05086, 0.31117, 0.04816, 0.54649, 0.17516, 0.35973, 0.28865, 0.14308, 0.41294, 0.13188, 0.57777, 0.24767, 0.43186, 0.43817, 0.37511, 0.59878, 0.3616, 0.78181, 0.43726, 0.89761, 0.53994, 0.87616, 0.37787 ], - "triangles": [ 36, 25, 26, 35, 27, 28, 23, 25, 36, 24, 25, 23, 26, 35, 36, 35, 26, 27, 22, 36, 35, 23, 36, 22, 28, 29, 34, 35, 28, 34, 21, 35, 34, 35, 21, 22, 37, 20, 34, 37, 38, 20, 19, 20, 38, 18, 19, 38, 17, 18, 38, 2, 4, 37, 4, 2, 3, 43, 4, 5, 43, 37, 4, 42, 38, 37, 43, 42, 37, 6, 46, 5, 44, 43, 5, 39, 14, 15, 41, 15, 16, 39, 15, 41, 16, 17, 38, 41, 16, 38, 41, 38, 42, 46, 44, 5, 45, 46, 6, 44, 46, 45, 40, 14, 39, 40, 39, 41, 13, 14, 40, 12, 13, 40, 45, 6, 7, 11, 12, 40, 9, 10, 40, 11, 40, 10, 9, 41, 42, 9, 40, 41, 8, 9, 42, 42, 43, 8, 44, 8, 43, 8, 44, 45, 8, 45, 7, 34, 29, 30, 33, 31, 32, 33, 32, 0, 31, 34, 30, 34, 20, 21, 31, 33, 34, 37, 34, 33, 1, 33, 0, 2, 33, 1, 33, 2, 37 ], - "vertices": [ 1, 14, 17.04, -22.66, 1, 3, 14, 11.42, -25.02, 0.97438, 12, 187.6, -11.93, 0.00182, 13, 63.98, 5.58, 0.02381, 2, 14, 1.36, -29.25, 0.37005, 12, 182.37, -21.52, 0.62995, 3, 14, -9.34, -33.75, 0.09775, 12, 176.82, -31.71, 0.82289, 13, 64.49, -16.93, 0.07936, 3, 14, -22.66, -31.7, 0.05494, 12, 165.13, -38.42, 0.86351, 13, 57.7, -28.58, 0.08156, 3, 14, -34.17, -29.93, 0.01796, 12, 155.03, -44.22, 0.89858, 13, 51.83, -38.64, 0.08345, 1, 12, 109.81, -70.7, 1, 1, 12, 30.84, -74.45, 1, 1, 12, -16.96, -26.55, 1, 1, 12, -19.08, 18.11, 1, 1, 12, 1.68, 56.4, 1, 1, 12, 23.63, 66.63, 1, 1, 12, 31.14, 70.14, 1, 1, 12, 52.77, 80.23, 1, 2, 12, 104.83, 82.69, 0.99074, 13, -54.93, 46.39, 0.00926, 3, 12, 132.26, 60.87, 0.88784, 13, -20.27, 41.13, 0.11168, 15, 48.07, 46.13, 4.7E-4, 4, 14, 14.49, 45.72, 0.00833, 12, 145.85, 45.26, 0.85196, 13, -0.71, 34.37, 0.12365, 15, 30.69, 34.9, 0.01605, 4, 14, 14.72, 40.26, 0.01053, 12, 149.44, 41.14, 0.84249, 13, 4.45, 32.59, 0.12681, 15, 26.1, 31.94, 0.02016, 4, 14, 14.94, 35, 0.01266, 12, 152.9, 37.17, 0.83336, 13, 9.43, 30.87, 0.12986, 15, 21.68, 29.08, 0.02412, 4, 14, 17.31, 31.55, 0.05833, 12, 156.9, 35.95, 0.60487, 13, 13.51, 31.8, 0.21603, 15, 19.9, 25.29, 0.12077, 4, 14, 19.76, 27.97, 0.10569, 12, 161.05, 34.68, 0.368, 13, 17.74, 32.78, 0.30535, 15, 18.06, 21.36, 0.22096, 4, 14, 23.06, 25.24, 0.1279, 12, 165.34, 34.6, 0.18497, 13, 21.49, 34.84, 0.23674, 15, 17.37, 17.13, 0.45039, 3, 14, 26.39, 22.47, 0.15034, 13, 25.29, 36.92, 0.16741, 15, 16.67, 12.86, 0.68225, 3, 14, 33.01, 24.76, 0.02128, 13, 25.58, 43.92, 0.03309, 15, 22, 8.32, 0.94563, 1, 15, 33.6, 3.18, 1, 1, 15, 27.7, -4.32, 1, 1, 15, 15.91, -6.38, 1, 1, 15, 8.29, -7.71, 1, 1, 15, 2.52, -8.72, 1, 2, 14, 33.8, -6.24, 0.33703, 15, -4.33, -8.07, 0.66297, 2, 14, 30.77, -10.42, 0.58778, 15, -9.46, -7.58, 0.41222, 2, 14, 27.08, -15.53, 0.81447, 15, -15.74, -6.98, 0.18553, 2, 14, 24.05, -19.7, 0.97838, 15, -20.88, -6.49, 0.02162, 1, 14, 7.37, -4.8, 1, 1, 14, 22.4, 1.3, 1, 1, 15, 7.54, 1.64, 1, 3, 14, 38.63, 17.86, 0.0046, 13, 34.06, 46.62, 0.01618, 15, 18.9, -0.03, 0.97922, 1, 13, 30.82, 1.68, 1, 3, 14, -7.07, 41.74, 7.0E-5, 12, 131.49, 28.69, 0.99828, 15, 16.34, 51.47, 0.00165, 1, 12, 103.58, 60.65, 1, 1, 12, 68.57, 60.72, 1, 1, 12, 100.33, 44.43, 1, 1, 12, 113.74, 15.8, 1, 1, 12, 117.77, -8.69, 1, 1, 12, 103.07, -37.5, 1, 1, 12, 82.15, -56.28, 1, 3, 14, -68.87, -11.37, 0.00371, 12, 116.34, -51.37, 0.97904, 13, 21.84, -64.11, 0.01725 ], - "hull": 33, - "edges": [ 16, 14, 16, 18, 18, 20, 26, 28, 28, 30, 44, 46, 46, 48, 48, 50, 14, 12, 10, 12, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 2, 0, 0, 64, 2, 4, 4, 6, 20, 22, 22, 24, 24, 26, 80, 82, 82, 84, 84, 86, 86, 88, 88, 90, 90, 12, 80, 26, 34, 36, 30, 32, 32, 34, 36, 38, 38, 40, 40, 42, 42, 44, 12, 92, 6, 8, 8, 10 ], - "width": 136, - "height": 187 - } - }, - "L-arm": { - "arm": { - "type": "mesh", - "uvs": [ 1, 0.16418, 0.90368, 0.30178, 0.80735, 0.43938, 0.75345, 0.50664, 0.71536, 0.55417, 0.66561, 0.61626, 0.63234, 0.65778, 0.59417, 0.7054, 0.45366, 0.8527, 0.31316, 1, 0.15658, 1, 0, 1, 0, 0.71458, 0.13235, 0.59074, 0.26471, 0.4669, 0.34675, 0.39836, 0.39153, 0.36096, 0.43008, 0.32876, 0.4689, 0.29633, 0.52302, 0.25113, 0.59417, 0.1917, 0.72983, 0.09585, 0.86549, 0, 1, 0, 0.15703, 0.83582, 0.46722, 0.51561, 0.78995, 0.22527, 0.34029, 0.70958, 0.62889, 0.3843 ], - "triangles": [ 10, 24, 9, 9, 27, 8, 9, 24, 27, 10, 11, 24, 11, 12, 24, 8, 27, 7, 12, 13, 24, 24, 13, 27, 13, 14, 27, 27, 25, 7, 25, 27, 14, 7, 25, 6, 6, 25, 5, 18, 4, 17, 28, 4, 18, 4, 28, 3, 15, 16, 25, 16, 17, 25, 25, 17, 5, 17, 4, 5, 3, 28, 2, 28, 26, 2, 2, 26, 1, 18, 19, 28, 19, 20, 28, 28, 20, 26, 1, 26, 0, 20, 21, 26, 26, 22, 0, 26, 21, 22, 22, 23, 0, 25, 14, 15 ], - "vertices": [ 1, 4, -11.38, 11.41, 1, 1, 4, 0.99, 11.79, 1, 1, 4, 13.36, 12.18, 1, 1, 4, 19.69, 11.97, 1, 2, 4, 24.16, 11.83, 0.91748, 7, -17.58, 10.73, 0.08252, 2, 4, 30, 11.64, 0.75238, 7, -11.83, 11.77, 0.24762, 2, 4, 33.91, 11.51, 0.44551, 7, -7.98, 12.46, 0.55449, 2, 4, 38.39, 11.36, 0.2127, 7, -3.57, 13.26, 0.7873, 2, 4, 53.17, 9.61, 0.07308, 7, 11.25, 14.65, 0.92692, 2, 4, 67.95, 7.86, 0.00873, 7, 26.07, 16.03, 0.99127, 1, 7, 34.26, 8.51, 1, 1, 7, 42.44, 0.99, 1, 1, 7, 27.96, -14.77, 1, 2, 4, 50.33, -20.36, 0.05494, 7, 14.76, -15.25, 0.94506, 2, 4, 37.32, -18.06, 0.23231, 7, 1.56, -15.74, 0.76769, 2, 4, 29.76, -16.28, 0.47868, 7, -6.21, -15.58, 0.52132, 2, 4, 25.63, -15.31, 0.71242, 7, -10.45, -15.5, 0.28758, 2, 4, 22.08, -14.47, 0.81876, 7, -14.1, -15.42, 0.18124, 2, 4, 18.5, -13.63, 0.9506, 7, -17.77, -15.35, 0.0494, 2, 4, 13.51, -12.45, 0.97879, 7, -22.9, -15.25, 0.02121, 2, 4, 6.96, -10.91, 0.99704, 7, -29.63, -15.11, 0.00296, 1, 4, -4.48, -7.2, 1, 1, 4, -15.91, -3.5, 1, 1, 4, -21.43, 4.29, 1, 1, 7, 25.9, -0.53, 1, 2, 4, 31.99, -4.22, 0.80128, 7, -6.56, -3.32, 0.19872, 1, 4, 0.98, 1.89, 1, 1, 7, 9.92, 1.3, 1, 1, 4, 17.32, -0.55, 1 ], - "hull": 24, - "edges": [ 0, 2, 2, 4, 4, 6, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 38, 40, 40, 42, 42, 44, 44, 46, 46, 0, 10, 34, 30, 32, 32, 34, 10, 12, 12, 14, 6, 8, 8, 10, 34, 36, 36, 38, 8, 36 ], - "width": 71, - "height": 75 - } - }, - "L-leg": { - "leg": { - "type": "mesh", - "uvs": [ 1, 0.23129, 1, 0.29498, 1, 0.37025, 1, 0.44552, 1, 0.50921, 1, 0.65976, 1, 0.71766, 1, 0.87399, 0.73924, 1, 0.22971, 1, 0, 0.89715, 0, 0.64818, 0.01978, 0.59915, 0.08517, 0.43712, 0.10542, 0.38694, 0.13057, 0.32459, 0.15317, 0.26859, 0.178, 0.20707, 0.26155, 0, 1, 0, 0.61186, 0.12128, 0.51632, 0.54396 ], - "triangles": [ 21, 13, 4, 21, 4, 5, 12, 13, 21, 12, 21, 5, 12, 5, 6, 11, 12, 6, 9, 10, 11, 11, 6, 9, 6, 8, 9, 7, 8, 6, 20, 18, 19, 20, 19, 0, 17, 18, 20, 17, 20, 0, 17, 0, 1, 16, 17, 1, 16, 1, 2, 15, 16, 2, 15, 2, 3, 14, 15, 3, 14, 3, 4, 13, 14, 4 ], - "vertices": [ 1, 5, 11.02, 15.15, 1, 1, 5, 17.32, 14.75, 1, 2, 5, 24.75, 14.29, 0.95577, 6, -14.29, 14.6, 0.04423, 2, 5, 32.19, 13.83, 0.71874, 6, -6.84, 14.96, 0.28126, 2, 5, 38.49, 13.44, 0.37177, 6, -0.55, 15.26, 0.62823, 2, 5, 53.36, 12.51, 0.00736, 6, 14.34, 15.96, 0.99264, 1, 6, 20.07, 16.24, 1, 1, 6, 35.53, 16.97, 1, 1, 6, 48.43, 8.19, 1, 1, 6, 49.31, -10.13, 1, 1, 6, 39.53, -18.88, 1, 2, 5, 49.98, -23.35, 0.00313, 6, 14.91, -20.05, 0.99687, 2, 5, 45.18, -22.34, 0.02543, 6, 10.03, -19.57, 0.97457, 2, 5, 29.32, -18.99, 0.4709, 6, -6.11, -17.98, 0.5291, 2, 5, 24.4, -17.96, 0.69968, 6, -11.11, -17.49, 0.30032, 2, 5, 18.3, -16.67, 0.89625, 6, -17.32, -16.88, 0.10375, 2, 5, 12.82, -15.51, 0.9779, 6, -22.89, -16.33, 0.0221, 1, 5, 6.79, -14.24, 1, 1, 5, -13.48, -9.97, 1, 1, 5, -11.83, 16.57, 1, 1, 5, -0.72, 1.88, 1, 1, 6, 3.72, -1.97, 1 ], - "hull": 20, - "edges": [ 36, 38, 20, 22, 18, 20, 16, 18, 16, 14, 22, 24, 24, 10, 10, 12, 12, 14, 12, 22, 24, 26, 10, 8, 26, 8, 8, 6, 26, 28, 6, 28, 28, 30, 6, 4, 30, 4, 4, 2, 30, 32, 2, 32, 32, 34, 34, 36, 2, 0, 0, 38, 34, 0 ], - "width": 36, - "height": 99 - } - }, - "R-arm": { - "arm": { - "type": "mesh", - "uvs": [ 1, 0.16418, 0.90368, 0.30178, 0.80735, 0.43938, 0.75345, 0.50664, 0.71536, 0.55417, 0.66561, 0.61626, 0.63234, 0.65778, 0.59417, 0.7054, 0.45366, 0.8527, 0.31316, 1, 0.15658, 1, 0, 1, 0, 0.71458, 0.13235, 0.59074, 0.26471, 0.4669, 0.34675, 0.39836, 0.39153, 0.36096, 0.43008, 0.32876, 0.4689, 0.29633, 0.52302, 0.25113, 0.59417, 0.1917, 0.72983, 0.09585, 0.86549, 0, 1, 0, 0.15703, 0.83582, 0.46722, 0.51561, 0.78995, 0.22527, 0.34029, 0.70958, 0.62889, 0.3843 ], - "triangles": [ 10, 24, 9, 9, 27, 8, 9, 24, 27, 10, 11, 24, 11, 12, 24, 8, 27, 7, 12, 13, 24, 24, 13, 27, 13, 14, 27, 27, 25, 7, 25, 14, 15, 25, 27, 14, 7, 25, 6, 22, 23, 0, 26, 22, 0, 1, 26, 0, 6, 25, 5, 18, 4, 17, 28, 4, 18, 4, 28, 3, 15, 16, 25, 16, 17, 25, 25, 17, 5, 17, 4, 5, 3, 28, 2, 28, 26, 2, 2, 26, 1, 18, 19, 28, 19, 20, 28, 28, 20, 26, 20, 21, 26, 26, 21, 22 ], - "vertices": [ 1, 8, -6.97, 5.03, 1, 1, 8, 5.06, 7.93, 1, 1, 8, 17.1, 10.83, 1, 2, 8, 23.34, 11.91, 0.99563, 11, -17.75, 12.49, 0.00437, 2, 8, 27.74, 12.68, 0.95467, 11, -13.31, 13.04, 0.04533, 2, 8, 33.5, 13.69, 0.75827, 11, -7.51, 13.77, 0.24173, 2, 8, 37.35, 14.36, 0.53963, 11, -3.63, 14.26, 0.46037, 2, 8, 41.77, 15.13, 0.29363, 11, 0.82, 14.82, 0.70637, 2, 8, 56.6, 16.42, 4.0E-4, 11, 15.69, 15.41, 0.9996, 1, 11, 30.56, 16, 1, 1, 11, 38.34, 8.05, 1, 1, 11, 46.11, 0.1, 1, 1, 11, 30.8, -14.86, 1, 2, 8, 59.92, -13.5, 4.8E-4, 11, 17.59, -14.64, 0.99952, 2, 8, 46.72, -13.9, 0.17385, 11, 4.38, -14.41, 0.82615, 2, 8, 38.95, -13.7, 0.5683, 11, -3.37, -13.84, 0.4317, 2, 8, 34.71, -13.59, 0.79613, 11, -7.6, -13.53, 0.20387, 2, 8, 31.06, -13.49, 0.92362, 11, -11.24, -13.26, 0.07638, 2, 8, 27.39, -13.4, 0.98278, 11, -14.9, -12.99, 0.01722, 1, 8, 22.26, -13.26, 1, 1, 8, 15.53, -13.09, 1, 1, 8, 3.58, -11.79, 1, 1, 8, -8.37, -10.49, 1, 1, 8, -15.36, -3.99, 1, 1, 11, 29.51, -0.54, 1, 2, 8, 38.68, -1.43, 0.57762, 11, -3.06, -1.58, 0.42238, 1, 8, 7.07, -1.77, 1, 1, 11, 13.64, 2.15, 1, 1, 8, 23.56, -0.83, 1 ], - "hull": 24, - "edges": [ 0, 2, 2, 4, 4, 6, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 38, 40, 40, 42, 42, 44, 44, 46, 46, 0, 10, 34, 30, 32, 32, 34, 10, 12, 12, 14, 6, 8, 8, 10, 34, 36, 36, 38, 8, 36 ], - "width": 71, - "height": 75 - } - }, - "R-leg": { - "leg": { - "type": "mesh", - "uvs": [ 1, 0.23129, 1, 0.29498, 1, 0.37025, 1, 0.44552, 1, 0.50921, 1, 0.65976, 1, 0.71766, 1, 0.87399, 0.73924, 1, 0.22971, 1, 0, 0.89715, 0, 0.64818, 0.01978, 0.59915, 0.08517, 0.43712, 0.10542, 0.38694, 0.13057, 0.32459, 0.15317, 0.26859, 0.178, 0.20707, 0.26155, 0, 1, 0, 0.61186, 0.12128, 0.51632, 0.54396 ], - "triangles": [ 21, 13, 4, 21, 4, 5, 12, 13, 21, 12, 21, 5, 12, 5, 6, 11, 12, 6, 9, 10, 11, 11, 6, 9, 6, 8, 9, 7, 8, 6, 20, 18, 19, 20, 19, 0, 17, 18, 20, 17, 20, 0, 17, 0, 1, 16, 17, 1, 16, 1, 2, 15, 16, 2, 15, 2, 3, 14, 15, 3, 14, 3, 4, 13, 14, 4 ], - "vertices": [ 1, 9, 7.41, 14.89, 1, 2, 9, 13.71, 15.24, 0.99432, 10, -23.16, 14.24, 0.00568, 2, 9, 21.15, 15.65, 0.91831, 10, -15.74, 14.89, 0.08169, 2, 9, 28.59, 16.06, 0.65731, 10, -8.32, 15.53, 0.34269, 2, 9, 34.88, 16.4, 0.33128, 10, -2.03, 16.08, 0.66872, 2, 9, 49.77, 17.22, 0.00401, 10, 12.81, 17.36, 0.99599, 1, 10, 18.52, 17.86, 1, 1, 10, 33.94, 19.2, 1, 1, 10, 47.18, 10.92, 1, 1, 10, 48.77, -7.35, 1, 1, 10, 39.34, -16.47, 1, 2, 9, 50.6, -18.79, 0.01347, 10, 14.78, -18.6, 0.98653, 2, 9, 45.72, -18.34, 0.05687, 10, 9.88, -18.31, 0.94313, 2, 9, 29.57, -16.87, 0.66681, 10, -6.3, -17.35, 0.33319, 2, 9, 24.57, -16.42, 0.86313, 10, -11.31, -17.05, 0.13687, 2, 9, 18.36, -15.85, 0.97673, 10, -17.54, -16.68, 0.02327, 2, 9, 12.77, -15.35, 0.99935, 10, -23.13, -16.35, 6.5E-4, 1, 9, 6.64, -14.79, 1, 2, 9, -13.99, -12.91, 0.99999, 10, -49.96, -14.76, 1.0E-5, 1, 9, -15.45, 13.63, 1, 1, 9, -2.7, 0.34, 1, 2, 9, 39.28, -0.79, 0.02735, 10, 2.9, -0.97, 0.97265 ], - "hull": 20, - "edges": [ 36, 38, 20, 22, 18, 20, 16, 18, 16, 14, 22, 24, 24, 10, 10, 12, 12, 14, 12, 22, 24, 26, 10, 8, 26, 8, 8, 6, 26, 28, 6, 28, 28, 30, 6, 4, 30, 4, 4, 2, 30, 32, 2, 32, 32, 34, 34, 36, 2, 0, 0, 38, 34, 0 ], - "width": 36, - "height": 99 - } - }, - "torso": { - "torso": { - "type": "mesh", - "uvs": [ 0.87097, 0.13351, 1, 0.26703, 1, 0.45027, 1, 0.63351, 1, 0.81676, 1, 1, 0.75, 1, 0.5, 1, 0.25, 1, 0, 1, 0, 0.72402, 0, 0.44805, 0.09823, 0.22402, 0.19646, 0, 0.4692, 0, 0.74195, 0, 0.58869, 0.13132, 0.401, 0.46063, 0.8354, 0.50156, 0.42394, 0.2675, 0.36228, 0.63166, 0.58839, 0.76773, 0.71972, 0.25773, 0.84058, 0.76485, 0.57726, 0.50305, 0.24069, 0.44016, 0.19158, 0.8008, 0.29695, 0.12289, 0.37843, 0.84006, 0.71037, 0.63433, 0.15889, 0.60896 ], - "triangles": [ 8, 26, 28, 8, 28, 7, 9, 26, 8, 9, 10, 26, 23, 4, 5, 6, 23, 5, 7, 21, 6, 6, 21, 23, 23, 3, 4, 7, 28, 21, 26, 20, 28, 28, 20, 21, 10, 30, 26, 26, 30, 20, 20, 24, 21, 21, 29, 23, 21, 24, 29, 29, 18, 23, 23, 18, 3, 10, 11, 30, 29, 24, 18, 18, 2, 3, 30, 25, 20, 20, 17, 24, 20, 25, 17, 30, 11, 25, 2, 18, 1, 11, 12, 25, 22, 19, 16, 22, 0, 1, 19, 14, 16, 19, 27, 14, 22, 15, 0, 22, 16, 15, 12, 13, 27, 16, 14, 15, 27, 13, 14, 22, 24, 19, 1, 18, 22, 25, 27, 19, 25, 12, 27, 17, 19, 24, 24, 22, 18, 17, 25, 19 ], - "vertices": [ 1, 3, 31.69, -23.15, 1, 2, 3, 19.07, -31.25, 0.60494, 2, 57.15, -30.53, 0.39506, 2, 3, 1.66, -31.39, 0.39506, 2, 39.74, -30.66, 0.60494, 2, 3, -15.75, -31.53, 0.20988, 2, 22.33, -30.8, 0.79012, 1, 5, -7.76, 14.89, 1, 1, 5, 9.48, 12.45, 1, 1, 5, 7.3, -2.9, 1, 2, 5, 5.13, -18.25, 0.488, 9, 5.77, 18.5, 0.512, 2, 5, 2.96, -33.59, 0.16267, 9, 6.62, 3.03, 0.83733, 3, 3, -51.05, 30.2, 0.06996, 2, -12.97, 30.92, 0.26337, 9, 7.46, -12.45, 0.66667, 1, 9, -18.72, -13.88, 1, 2, 3, 1.38, 30.61, 0.39506, 2, 39.46, 31.34, 0.60494, 2, 3, 22.71, 24.69, 0.60494, 2, 60.79, 25.41, 0.39506, 1, 3, 44.04, 18.76, 1, 1, 3, 44.18, 1.86, 1, 1, 3, 44.31, -15.05, 1, 1, 3, 31.76, -5.65, 1, 2, 3, 0.38, 5.74, 0.448, 2, 38.46, 6.47, 0.552, 2, 3, -3.29, -21.22, 0.448, 2, 34.79, -20.5, 0.552, 1, 3, 18.74, 4.46, 1, 1, 2, 22.2, 8.74, 1, 2, 2, 9.38, -5.38, 0.52, 5, -15.95, -9.73, 0.48, 1, 3, 19.82, -13.87, 1, 2, 2, 9.78, -21.01, 0.52, 5, -14.03, 5.79, 0.48, 2, 3, -3.56, -5.22, 0.448, 2, 34.52, -4.49, 0.552, 2, 3, 2.25, 15.69, 0.448, 2, 40.33, 16.42, 0.552, 2, 2, 6.04, 19.2, 0.584, 9, -12.08, -1.62, 0.416, 1, 3, 32.42, 12.44, 1, 2, 2, 2.41, 7.58, 0.584, 9, -8.99, 10.15, 0.416, 1, 2, 22.11, -12.84, 1, 1, 2, 24.25, 21.37, 1 ], - "hull": 16, - "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 0 ], - "width": 62, - "height": 95 - } - } - } - } -], -"animations": { - "animation": { - "bones": { - "abdomen": { - "rotate": [ - { - "curve": [ 0.075, 0, 0.112, 6.52 ] - }, - { "time": 0.3, "value": 6.52 }, - { "time": 1.3333 } - ] - }, - "chest": { - "rotate": [ - { - "curve": [ 0.092, 0, 0.137, 13.73 ] - }, - { - "time": 0.3667, - "value": 13.73, - "curve": [ 0.469, 13.73, 0.562, 13.32 ] - }, - { - "time": 0.6667, - "value": 12.78, - "curve": [ 0.77, 12.78, 0.842, 9.11 ] - }, - { - "time": 0.9, - "value": 9.11, - "curve": [ 1.092, 9.11, 1.225, 0 ] - }, - { "time": 1.3333 } - ] - }, - "head": { - "rotate": [ - { - "curve": [ 0.035, 0, 0.061, -5.44 ] - }, - { - "time": 0.1, - "value": -10.88, - "curve": [ 0.183, -10.88, 0.35, 6.77 ] - }, - { - "time": 0.4333, - "value": 6.77, - "curve": [ 1.157, 6.77, 0.966, 0.14 ] - }, - { "time": 1.3333 } - ] - }, - "R-arm": { - "rotate": [ - { - "curve": [ 0.042, 0, 0.125, -26.35 ] - }, - { - "time": 0.1667, - "value": -26.35, - "curve": [ 0.233, -26.35, 0.367, -6.09 ] - }, - { - "time": 0.4333, - "value": -6.09, - "curve": [ 0.658, -6.09, 1.108, 0 ] - }, - { "time": 1.3333 } - ] - }, - "L-arm": { - "rotate": [ - { - "curve": [ 0.083, 0, 0.125, 53.01 ] - }, - { - "time": 0.3333, - "value": 53.01, - "curve": [ 0.477, 52.83, 0.538, 35.12 ] - }, - { - "time": 0.6, - "value": 35.12, - "curve": [ 0.682, 35.12, 0.754, 56.78 ] - }, - { - "time": 0.8333, - "value": 56.78, - "curve": [ 1.128, 56.78, 1.181, 0 ] - }, - { "time": 1.3333 } - ] - }, - "R-forearm": { - "rotate": [ - { - "curve": [ 0.116, 0, 0.203, 4.89 ] - }, - { - "time": 0.3333, - "value": 9.78, - "curve": [ 0.583, 9.78, 0.804, 0 ] - }, - { "time": 1.3333 } - ] - }, - "L-forearm": { - "rotate": [ - { - "value": 14.9, - "curve": [ 0.143, -80.79, 0.229, 32.08 ] - }, - { - "time": 0.4333, - "value": 32.08, - "curve": [ 0.562, 32.08, 0.497, -11.74 ] - }, - { - "time": 0.6333, - "value": -11.74, - "curve": [ 0.814, -11.74, 0.749, 58 ] - }, - { - "time": 0.9333, - "value": 58, - "curve": [ 1.033, 58, 1.185, 14.9 ] - }, - { "time": 1.3333, "value": 14.9 } - ] - }, - "scalp": { - "rotate": [ - { - "value": -7.01, - "curve": [ 0.095, -7.01, 0.171, -0.43 ] - }, - { - "time": 0.2667, - "value": 7.61, - "curve": [ 0.35, 4.26, 0.458, 0 ] - }, - { "time": 0.6667 }, - { "time": 1.3333, "value": -7.01 } - ] - }, - "hair1": { - "rotate": [ - { - "value": -8.8, - "curve": [ 0.067, -8.8, 0.1, -16.02 ] - }, - { - "time": 0.2667, - "value": -16.02, - "curve": [ 0.333, -16.02, 0.41, 29.39 ] - }, - { - "time": 0.5333, - "value": 29.39, - "curve": [ 0.733, 29.39, 0.885, -8.8 ] - }, - { "time": 1.3333, "value": -8.8 } - ] - }, - "hair2": { - "rotate": [ - { - "value": 4.65, - "curve": [ 0.141, 4.65, 0.125, -17.96 ] - }, - { - "time": 0.3333, - "value": -17.96, - "curve": [ 0.408, -17.96, 0.494, 6.63 ] - }, - { - "time": 0.6333, - "value": 6.63, - "curve": [ 0.808, 6.63, 0.941, 4.65 ] - }, - { "time": 1.3333, "value": 4.65 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/spine-godot/example-v4/assets/raptor/light-sprite.png b/spine-godot/example-v4/assets/raptor/light-sprite.png index b5b04d795..2ed7797c4 100644 Binary files a/spine-godot/example-v4/assets/raptor/light-sprite.png and b/spine-godot/example-v4/assets/raptor/light-sprite.png differ diff --git a/spine-godot/example-v4/assets/raptor/raptor-pro.skel b/spine-godot/example-v4/assets/raptor/raptor-pro.skel index 32ab530d7..26900a1b8 100644 Binary files a/spine-godot/example-v4/assets/raptor/raptor-pro.skel and b/spine-godot/example-v4/assets/raptor/raptor-pro.skel differ diff --git a/spine-godot/example-v4/assets/raptor/raptor.atlas b/spine-godot/example-v4/assets/raptor/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/spine-godot/example-v4/assets/raptor/raptor.atlas +++ b/spine-godot/example-v4/assets/raptor/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-godot/example-v4/assets/raptor/raptor.png b/spine-godot/example-v4/assets/raptor/raptor.png index 474f6316b..f8bed53d2 100644 Binary files a/spine-godot/example-v4/assets/raptor/raptor.png and b/spine-godot/example-v4/assets/raptor/raptor.png differ diff --git a/spine-godot/example-v4/assets/spineboy/spineboy-pro.skel b/spine-godot/example-v4/assets/spineboy/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-godot/example-v4/assets/spineboy/spineboy-pro.skel and b/spine-godot/example-v4/assets/spineboy/spineboy-pro.skel differ diff --git a/spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json b/spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json index b4dd8b40f..b82754e49 100644 --- a/spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json +++ b/spine-godot/example-v4/assets/spineboy/spineboy-pro.spine-json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-godot/example-v4/assets/spineboy/spineboy.atlas b/spine-godot/example-v4/assets/spineboy/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-godot/example-v4/assets/spineboy/spineboy.atlas +++ b/spine-godot/example-v4/assets/spineboy/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-godot/example-v4/assets/spineboy/spineboy.png b/spine-godot/example-v4/assets/spineboy/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-godot/example-v4/assets/spineboy/spineboy.png and b/spine-godot/example-v4/assets/spineboy/spineboy.png differ diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json b/spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json index 9f27b879a..c9fbbd628 100644 --- a/spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json +++ b/spine-godot/example/assets/mix-and-match/mix-and-match-pro.spine-json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match.atlas b/spine-godot/example/assets/mix-and-match/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-godot/example/assets/mix-and-match/mix-and-match.atlas +++ b/spine-godot/example/assets/mix-and-match/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match.png b/spine-godot/example/assets/mix-and-match/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-godot/example/assets/mix-and-match/mix-and-match.png and b/spine-godot/example/assets/mix-and-match/mix-and-match.png differ diff --git a/spine-godot/example/assets/raptor/light-sprite.png b/spine-godot/example/assets/raptor/light-sprite.png index b5b04d795..2ed7797c4 100644 Binary files a/spine-godot/example/assets/raptor/light-sprite.png and b/spine-godot/example/assets/raptor/light-sprite.png differ diff --git a/spine-godot/example/assets/raptor/raptor-pro.skel b/spine-godot/example/assets/raptor/raptor-pro.skel index 32ab530d7..26900a1b8 100644 Binary files a/spine-godot/example/assets/raptor/raptor-pro.skel and b/spine-godot/example/assets/raptor/raptor-pro.skel differ diff --git a/spine-godot/example/assets/raptor/raptor.atlas b/spine-godot/example/assets/raptor/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/spine-godot/example/assets/raptor/raptor.atlas +++ b/spine-godot/example/assets/raptor/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-godot/example/assets/raptor/raptor.png b/spine-godot/example/assets/raptor/raptor.png index 474f6316b..f8bed53d2 100644 Binary files a/spine-godot/example/assets/raptor/raptor.png and b/spine-godot/example/assets/raptor/raptor.png differ diff --git a/spine-godot/example/assets/spineboy/spineboy-pro.skel b/spine-godot/example/assets/spineboy/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-godot/example/assets/spineboy/spineboy-pro.skel and b/spine-godot/example/assets/spineboy/spineboy-pro.skel differ diff --git a/spine-godot/example/assets/spineboy/spineboy-pro.spine-json b/spine-godot/example/assets/spineboy/spineboy-pro.spine-json index b4dd8b40f..b82754e49 100644 --- a/spine-godot/example/assets/spineboy/spineboy-pro.spine-json +++ b/spine-godot/example/assets/spineboy/spineboy-pro.spine-json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-godot/example/assets/spineboy/spineboy.atlas b/spine-godot/example/assets/spineboy/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-godot/example/assets/spineboy/spineboy.atlas +++ b/spine-godot/example/assets/spineboy/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-godot/example/assets/spineboy/spineboy.png b/spine-godot/example/assets/spineboy/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-godot/example/assets/spineboy/spineboy.png and b/spine-godot/example/assets/spineboy/spineboy.png differ diff --git a/spine-haxe/example/assets/coin-pro.json b/spine-haxe/example/assets/coin-pro.json index 03fd5fe07..9d51d1f55 100644 --- a/spine-haxe/example/assets/coin-pro.json +++ b/spine-haxe/example/assets/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.17", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-haxe/example/assets/coin-pro.skel b/spine-haxe/example/assets/coin-pro.skel index eda3d9961..7cf937338 100644 Binary files a/spine-haxe/example/assets/coin-pro.skel and b/spine-haxe/example/assets/coin-pro.skel differ diff --git a/spine-haxe/example/assets/coin.atlas b/spine-haxe/example/assets/coin.atlas index 0ff436cff..369cf6779 100644 --- a/spine-haxe/example/assets/coin.atlas +++ b/spine-haxe/example/assets/coin.atlas @@ -2,17 +2,17 @@ coin.png size: 1024, 1024 filter: Linear, Linear coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-haxe/example/assets/coin.png b/spine-haxe/example/assets/coin.png index 2298d1349..190d853ad 100644 Binary files a/spine-haxe/example/assets/coin.png and b/spine-haxe/example/assets/coin.png differ diff --git a/spine-haxe/example/assets/dragon-ess.json b/spine-haxe/example/assets/dragon-ess.json index 274ef6306..3d45816d7 100644 --- a/spine-haxe/example/assets/dragon-ess.json +++ b/spine-haxe/example/assets/dragon-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "aPoA1GjXkVI", - "spine": "4.1.17", + "hash": "XM8KoDHOBqA", + "spine": "4.2.09-beta", "x": -366.31, "y": -327.81, "width": 660.39, diff --git a/spine-haxe/example/assets/dragon-ess.skel b/spine-haxe/example/assets/dragon-ess.skel index 2fd796500..3bfb31358 100644 Binary files a/spine-haxe/example/assets/dragon-ess.skel and b/spine-haxe/example/assets/dragon-ess.skel differ diff --git a/spine-haxe/example/assets/dragon-pma.png b/spine-haxe/example/assets/dragon-pma.png new file mode 100644 index 000000000..f2bb4c6dd Binary files /dev/null and b/spine-haxe/example/assets/dragon-pma.png differ diff --git a/spine-haxe/example/assets/dragon-pma_2.png b/spine-haxe/example/assets/dragon-pma_2.png new file mode 100644 index 000000000..c1d14d282 Binary files /dev/null and b/spine-haxe/example/assets/dragon-pma_2.png differ diff --git a/spine-haxe/example/assets/dragon-pma_3.png b/spine-haxe/example/assets/dragon-pma_3.png new file mode 100644 index 000000000..05f7d73fc Binary files /dev/null and b/spine-haxe/example/assets/dragon-pma_3.png differ diff --git a/spine-haxe/example/assets/dragon-pma_4.png b/spine-haxe/example/assets/dragon-pma_4.png new file mode 100644 index 000000000..7de20b2c0 Binary files /dev/null and b/spine-haxe/example/assets/dragon-pma_4.png differ diff --git a/spine-haxe/example/assets/dragon-pma_5.png b/spine-haxe/example/assets/dragon-pma_5.png new file mode 100644 index 000000000..fa0f5075b Binary files /dev/null and b/spine-haxe/example/assets/dragon-pma_5.png differ diff --git a/spine-haxe/example/assets/dragon.atlas b/spine-haxe/example/assets/dragon.atlas index bca5b1e1b..47b3f3b2a 100644 --- a/spine-haxe/example/assets/dragon.atlas +++ b/spine-haxe/example/assets/dragon.atlas @@ -1,123 +1,112 @@ dragon.png size: 1024, 1024 filter: Linear, Linear -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon_2.png size: 1024, 1024 filter: Linear, Linear -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon_3.png size: 1024, 1024 filter: Linear, Linear -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon_4.png size: 1024, 1024 filter: Linear, Linear -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon_5.png size: 1024, 1024 filter: Linear, Linear -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon_6.png - size: 1024, 1024 - filter: Linear, Linear -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/spine-haxe/example/assets/dragon.png b/spine-haxe/example/assets/dragon.png index f39141c47..3bca338cd 100644 Binary files a/spine-haxe/example/assets/dragon.png and b/spine-haxe/example/assets/dragon.png differ diff --git a/spine-haxe/example/assets/dragon_2.png b/spine-haxe/example/assets/dragon_2.png index 09429b5f8..3dbe2a5a0 100644 Binary files a/spine-haxe/example/assets/dragon_2.png and b/spine-haxe/example/assets/dragon_2.png differ diff --git a/spine-haxe/example/assets/dragon_3.png b/spine-haxe/example/assets/dragon_3.png index 1a0e35759..df2896d51 100644 Binary files a/spine-haxe/example/assets/dragon_3.png and b/spine-haxe/example/assets/dragon_3.png differ diff --git a/spine-haxe/example/assets/dragon_4.png b/spine-haxe/example/assets/dragon_4.png index 80239b8d4..270b0959d 100644 Binary files a/spine-haxe/example/assets/dragon_4.png and b/spine-haxe/example/assets/dragon_4.png differ diff --git a/spine-haxe/example/assets/dragon_5.png b/spine-haxe/example/assets/dragon_5.png index 5a98f7efa..4e9f7a843 100644 Binary files a/spine-haxe/example/assets/dragon_5.png and b/spine-haxe/example/assets/dragon_5.png differ diff --git a/spine-haxe/example/assets/dragon_6.png b/spine-haxe/example/assets/dragon_6.png deleted file mode 100644 index f40aed7c7..000000000 Binary files a/spine-haxe/example/assets/dragon_6.png and /dev/null differ diff --git a/spine-haxe/example/assets/goblins-pro.json b/spine-haxe/example/assets/goblins-pro.json index 4819a6573..62cd1cf7f 100644 --- a/spine-haxe/example/assets/goblins-pro.json +++ b/spine-haxe/example/assets/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.17", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-haxe/example/assets/goblins-pro.skel b/spine-haxe/example/assets/goblins-pro.skel index 82135aa72..8e1a73328 100644 Binary files a/spine-haxe/example/assets/goblins-pro.skel and b/spine-haxe/example/assets/goblins-pro.skel differ diff --git a/spine-haxe/example/assets/goblins.atlas b/spine-haxe/example/assets/goblins.atlas index b40ca29fc..06022ce54 100644 --- a/spine-haxe/example/assets/goblins.atlas +++ b/spine-haxe/example/assets/goblins.atlas @@ -2,95 +2,100 @@ goblins.png size: 1024, 128 filter: Linear, Linear dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-haxe/example/assets/goblins.png b/spine-haxe/example/assets/goblins.png index 2fab39406..6ac8d5454 100644 Binary files a/spine-haxe/example/assets/goblins.png and b/spine-haxe/example/assets/goblins.png differ diff --git a/spine-haxe/example/assets/mix-and-match-pro.json b/spine-haxe/example/assets/mix-and-match-pro.json index 1cf000ddd..c9fbbd628 100644 --- a/spine-haxe/example/assets/mix-and-match-pro.json +++ b/spine-haxe/example/assets/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "wi43rlDXH1o", - "spine": "4.1.17", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-control", "bag-strap-back", "bag-strap-front", "bag-back-down", "bag", "bag-flap", "bag-back-front" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-down-back", "cape-back-rotator", "cape-blue-middle-back", "cape-blue-control", "cape-blue-up-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-blue-down", "cape-blue-up", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-back-rotator", "cape-red-back-inside", "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-foot-front", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-down-back", "dress-control-foot-back", "dress-control-leg-up-back", "dress-control-middle", "sleeve-control-front", "sleeve-control-back" ], - "transform": [ "leg-down-back", "leg-down-front", "leg-up", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-back", "skirt-control", "skirt-control-back-down", "skirt-control-front", "skirt-control-front-down", "skirt-control-middle", "skirt-control-up" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "backpack-control", "pompom-control", "hat-control", "zip-boy", "backpack", "hat" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "hat-base", "hair-strand-back-3", "bag-control", "hair-strand-front-2", "pompom-control", "hair-holder-front", "hair-strand-front-1", "zip-girl", "bag-strap-back", "hair-strand-front-4", "bag-strap-front", "hair-holder-back", "bag-back-down", "bag", "hair-strand-back-1", "hat-control", "hair-strand-front-3", "bag-flap", "hat", "hair-strand-back-2", "scarf-back", "bag-back-front" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "dress-control-foot-front", "cape-blue-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-blue-middle-back", "cape-blue-control", "cape-blue-up-back", "dress-control-foot-back", "dress-control-leg-down-back", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-up-front", "cape-blue-down", "cape-blue-up", "dress-control-middle", "cape-front-rotator", "sleeve-control-front", "cape-blue-down-front", "cape-blue-down-middle", "sleeve-control-back" ], - "transform": [ "leg-down-back", "leg-down-front", "leg-up", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-back-rotator", "skirt-rotation-front", "cape-red-back-inside", "cape-red-front-inside", "skirt-control-back", "cape-red-front-outside", "skirt-control", "skirt-control-front", "skirt-control-back-down", "cape-front-rotator", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "skirt-control-up", "skirt-rotation-back" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-3", "hair-strand-front-2", "hair-holder-front", "hair-strand-front-1", "hair-strand-front-4", "hair-holder-back", "hair-strand-back-1", "hair-strand-front-3", "hair-strand-back-2", "scarf-back" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-haxe/example/assets/mix-and-match-pro.skel b/spine-haxe/example/assets/mix-and-match-pro.skel index e57bc08a0..90d19987e 100644 Binary files a/spine-haxe/example/assets/mix-and-match-pro.skel and b/spine-haxe/example/assets/mix-and-match-pro.skel differ diff --git a/spine-haxe/example/assets/mix-and-match.atlas b/spine-haxe/example/assets/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-haxe/example/assets/mix-and-match.atlas +++ b/spine-haxe/example/assets/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-haxe/example/assets/mix-and-match.png b/spine-haxe/example/assets/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-haxe/example/assets/mix-and-match.png and b/spine-haxe/example/assets/mix-and-match.png differ diff --git a/spine-haxe/example/assets/owl-pro.json b/spine-haxe/example/assets/owl-pro.json index 5bb3e0d96..1e6733aba 100644 --- a/spine-haxe/example/assets/owl-pro.json +++ b/spine-haxe/example/assets/owl-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "Xf8aPQe0Mh0", - "spine": "4.1.17", + "hash": "WhZADUSP9U4", + "spine": "4.2.09-beta", "x": -644, "y": -274, "width": 1350.84, @@ -21,8 +21,16 @@ "color": "1a8600ff" }, { "name": "branch-2", "parent": "branch-1", "length": 391.45, "rotation": -30.2, "x": 487.04, "color": "1a8600ff" }, - { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff" }, - { "name": "body-top-control", "parent": "owl-base", "rotation": 92.53, "x": -3.85, "y": 227.57, "color": "1697ffff" }, + { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff", "icon": "diamond" }, + { + "name": "body-top-control", + "parent": "owl-base", + "rotation": 92.53, + "x": -3.85, + "y": 227.57, + "color": "1697ffff", + "icon": "triangle" + }, { "name": "branch-3", "parent": "branch-2", "length": 231.51, "rotation": 30.15, "x": 391.45, "color": "1a8600ff" }, { "name": "branch-4", "parent": "branch-3", "length": 158.83, "rotation": 38.9, "x": 231.51, "color": "1a8600ff" }, { "name": "branch-5", "parent": "branch-4", "length": 82.96, "rotation": -26.21, "x": 158.83, "color": "1a8600ff" }, @@ -35,9 +43,17 @@ "y": -20.15, "color": "1a8600ff" }, - { "name": "head", "parent": "body-top-control", "rotation": -90, "x": 51, "y": 0.33, "color": "1697ffff" }, - { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff" }, - { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff" }, + { + "name": "head", + "parent": "body-top-control", + "rotation": -90, + "x": 51, + "y": 0.33, + "color": "1697ffff", + "icon": "square" + }, + { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff", "icon": "arrows" }, + { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff", "icon": "arrows" }, { "name": "leaf-1", "parent": "branch-1", diff --git a/spine-haxe/example/assets/owl-pro.skel b/spine-haxe/example/assets/owl-pro.skel index d313366c7..67a85a25a 100644 Binary files a/spine-haxe/example/assets/owl-pro.skel and b/spine-haxe/example/assets/owl-pro.skel differ diff --git a/spine-haxe/example/assets/owl.atlas b/spine-haxe/example/assets/owl.atlas index 1b1d4b8b1..439d0d3d6 100644 --- a/spine-haxe/example/assets/owl.atlas +++ b/spine-haxe/example/assets/owl.atlas @@ -3,71 +3,64 @@ owl.png filter: Linear, Linear scale: 0.5 L_eye-closed - bounds: 512, 5, 90, 86 - rotate: 90 + bounds: 508, 115, 90, 86 L_eye-iris - bounds: 600, 10, 90, 86 - rotate: 90 + bounds: 826, 183, 90, 86 L_eye-light - bounds: 688, 4, 21, 20 - rotate: 90 + bounds: 1001, 488, 21, 20 L_eye-pupil - bounds: 856, 13, 63, 60 - rotate: 90 + bounds: 752, 154, 63, 60 L_foot - bounds: 834, 78, 64, 48 - rotate: 90 + bounds: 817, 133, 64, 48 L_wing - bounds: 349, 4, 81, 110 - rotate: 90 + bounds: 342, 91, 81, 110 R_eye-closed - bounds: 637, 119, 90, 86 - rotate: 90 + bounds: 508, 27, 90, 86 R_eye-iris - bounds: 688, 27, 90, 86 + bounds: 600, 111, 90, 86 rotate: 90 R_eye-light - bounds: 710, 4, 21, 20 - rotate: 90 + bounds: 1001, 466, 21, 20 R_eye-pupil - bounds: 884, 80, 63, 60 + bounds: 691, 72, 63, 60 rotate: 90 R_foot - bounds: 845, 145, 64, 48 - rotate: 90 + bounds: 814, 83, 64, 48 R_wing - bounds: 421, 93, 81, 110 + bounds: 425, 91, 81, 110 beak - bounds: 776, 2, 39, 41 + bounds: 883, 140, 39, 41 beak-down - bounds: 817, 3, 37, 40 -body - bounds: 2, 7, 248, 196 -feather-1 - bounds: 918, 18, 59, 60 -feather-2 - bounds: 781, 144, 62, 65 -feather-3 - bounds: 776, 45, 56, 76 -head-base - bounds: 621, 211, 299, 237 + bounds: 753, 53, 37, 40 rotate: 90 +body + bounds: 2, 5, 248, 196 +feather-1 + bounds: 753, 92, 59, 60 +feather-2 + bounds: 688, 137, 62, 65 +feather-3 + bounds: 600, 2, 56, 76 + rotate: 90 +head-base + bounds: 621, 271, 299, 237 leaf-1 - bounds: 559, 102, 76, 101 + bounds: 922, 273, 76, 101 leaf-2 - bounds: 252, 4, 65, 95 + bounds: 621, 204, 65, 95 rotate: 90 leaf-3 - bounds: 252, 71, 132, 77 + bounds: 922, 376, 132, 77 rotate: 90 leaf-4 - bounds: 461, 2, 89, 49 - rotate: 90 + bounds: 600, 60, 89, 49 leaf-5 - bounds: 504, 97, 53, 106 + bounds: 718, 216, 53, 106 + rotate: 90 leaf-6 - bounds: 331, 87, 88, 116 + bounds: 252, 85, 88, 116 leaf-7 - bounds: 725, 123, 54, 86 + bounds: 252, 29, 54, 86 + rotate: 90 wood - bounds: 2, 205, 617, 305 + bounds: 2, 203, 617, 305 diff --git a/spine-haxe/example/assets/owl.png b/spine-haxe/example/assets/owl.png index a375217a7..168467c23 100644 Binary files a/spine-haxe/example/assets/owl.png and b/spine-haxe/example/assets/owl.png differ diff --git a/spine-haxe/example/assets/raptor-pro.json b/spine-haxe/example/assets/raptor-pro.json index 5439b9138..afd89f343 100644 --- a/spine-haxe/example/assets/raptor-pro.json +++ b/spine-haxe/example/assets/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.17", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-haxe/example/assets/raptor-pro.skel b/spine-haxe/example/assets/raptor-pro.skel index e35ec23d5..26900a1b8 100644 Binary files a/spine-haxe/example/assets/raptor-pro.skel and b/spine-haxe/example/assets/raptor-pro.skel differ diff --git a/spine-haxe/example/assets/raptor.atlas b/spine-haxe/example/assets/raptor.atlas index 89cf60341..a0723d67a 100644 --- a/spine-haxe/example/assets/raptor.atlas +++ b/spine-haxe/example/assets/raptor.atlas @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-haxe/example/assets/raptor.png b/spine-haxe/example/assets/raptor.png index a67b73a21..f8bed53d2 100644 Binary files a/spine-haxe/example/assets/raptor.png and b/spine-haxe/example/assets/raptor.png differ diff --git a/spine-haxe/example/assets/spineboy-pro.json b/spine-haxe/example/assets/spineboy-pro.json index 78ba1dc0f..b82754e49 100644 --- a/spine-haxe/example/assets/spineboy-pro.json +++ b/spine-haxe/example/assets/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.17", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-haxe/example/assets/spineboy-pro.skel b/spine-haxe/example/assets/spineboy-pro.skel index c14f30405..2dd1473d6 100644 Binary files a/spine-haxe/example/assets/spineboy-pro.skel and b/spine-haxe/example/assets/spineboy-pro.skel differ diff --git a/spine-haxe/example/assets/spineboy.atlas b/spine-haxe/example/assets/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-haxe/example/assets/spineboy.atlas +++ b/spine-haxe/example/assets/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-haxe/example/assets/spineboy.png b/spine-haxe/example/assets/spineboy.png index 074f1e351..0ea9737f3 100644 Binary files a/spine-haxe/example/assets/spineboy.png and b/spine-haxe/example/assets/spineboy.png differ diff --git a/spine-haxe/example/assets/stretchyman-pro.json b/spine-haxe/example/assets/stretchyman-pro.json index a7825e2dc..810313f42 100644 --- a/spine-haxe/example/assets/stretchyman-pro.json +++ b/spine-haxe/example/assets/stretchyman-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "8oGZUTwZfVI", - "spine": "4.1.20", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.09-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -577,7 +577,7 @@ "hip": { "translate": [ {}, - { "time": 1, "y": -1.98 }, + { "time": 1, "y": -4.42 }, { "time": 2 } ] } diff --git a/spine-haxe/example/assets/stretchyman-pro.skel b/spine-haxe/example/assets/stretchyman-pro.skel index 815094d5e..8f76baf37 100644 Binary files a/spine-haxe/example/assets/stretchyman-pro.skel and b/spine-haxe/example/assets/stretchyman-pro.skel differ diff --git a/spine-haxe/example/assets/tank-pro.json b/spine-haxe/example/assets/tank-pro.json index 223e04572..a858278b4 100644 --- a/spine-haxe/example/assets/tank-pro.json +++ b/spine-haxe/example/assets/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.17", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/spine-haxe/example/assets/tank-pro.skel b/spine-haxe/example/assets/tank-pro.skel index 7b1f71bf2..163e64629 100644 Binary files a/spine-haxe/example/assets/tank-pro.skel and b/spine-haxe/example/assets/tank-pro.skel differ diff --git a/spine-haxe/example/assets/tank.atlas b/spine-haxe/example/assets/tank.atlas index 295fb0d22..fdc5a755b 100644 --- a/spine-haxe/example/assets/tank.atlas +++ b/spine-haxe/example/assets/tank.atlas @@ -3,54 +3,61 @@ tank.png filter: Linear, Linear scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-haxe/example/assets/tank.png b/spine-haxe/example/assets/tank.png index a50ffc8e4..e0e7f1bfe 100644 Binary files a/spine-haxe/example/assets/tank.png and b/spine-haxe/example/assets/tank.png differ diff --git a/spine-haxe/example/assets/vine-pro.json b/spine-haxe/example/assets/vine-pro.json index d0930c9ca..4af855ccf 100644 --- a/spine-haxe/example/assets/vine-pro.json +++ b/spine-haxe/example/assets/vine-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "J/Kz2d3OlD0", - "spine": "4.1.17", + "hash": "umDSKvQSk4I", + "spine": "4.2.09-beta", "x": -87.7, "y": -1.71, "width": 227.65, diff --git a/spine-haxe/example/assets/vine-pro.skel b/spine-haxe/example/assets/vine-pro.skel index 0cb9578f7..961ccc37e 100644 Binary files a/spine-haxe/example/assets/vine-pro.skel and b/spine-haxe/example/assets/vine-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.atlas b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.atlas index 290e1858d..ca11e4493 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.atlas +++ b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.atlas @@ -3,17 +3,17 @@ coin-pma.png filter: Linear, Linear pma: true coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.png b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.png index 126200dee..65870eaed 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.png and b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pma.png differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json index 1f26f47b6..9d51d1f55 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json +++ b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.23-beta", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel index 1d51ea693..7cf937338 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel and b/spine-libgdx/spine-libgdx-tests/assets/coin/coin-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json index 41b85033c..006f225bd 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json +++ b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "djttFmlR6Co", - "spine": "4.1.23-beta", + "hash": "J/xnqOZtLkc", + "spine": "4.2.09-beta", "x": -92.53, "y": -5.3, "width": 234.03, diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel index 20e597547..3d793d6c8 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel and b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.atlas b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.atlas index 758c7fdf8..eed0924e9 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.atlas +++ b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.atlas @@ -3,95 +3,100 @@ goblins-pma.png filter: Linear, Linear pma: true dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.png b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.png index f0a5b6ce3..a6688e2cc 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.png and b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pma.png differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json index 6caf03bb0..62cd1cf7f 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json +++ b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel index 6e667d282..8e1a73328 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel and b/spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.atlas b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.atlas index c2eb27f20..b4cc35fa9 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.atlas +++ b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.atlas @@ -4,360 +4,356 @@ mix-and-match-pma.png pma: true scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.png b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.png index 1c7c748eb..0f60ebf9a 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.png and b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pma.png differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json index 9f27b879a..c9fbbd628 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json +++ b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel index 4cca62bce..90d19987e 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel and b/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/mix-and-match-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.atlas b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.atlas index 5b4981c80..456015eaf 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.atlas +++ b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.atlas @@ -4,98 +4,91 @@ raptor-pma.png pma: true scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.png b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.png index 6d0349772..2f3c0edd2 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.png and b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pma.png differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json +++ b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel index 32ab530d7..26900a1b8 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel and b/spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json index f573ad18c..c450e78e7 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "F9MaKeu7FF4", - "spine": "4.1.17", + "hash": "mMISi/xy5RY", + "spine": "4.2.09-beta", "x": -88.95, "y": -2.26, "width": 161.04, diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json index 4ddc83542..7987236a0 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "SmUDxzck41o", - "spine": "4.1.23-beta", + "hash": "5GZvPpyyFDA", + "spine": "4.2.09-beta", "x": -221.27, "y": -8.57, "width": 470.72, diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel index 90e15ec5e..b99096b38 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel and b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-ess.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.atlas b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.atlas index 9c8bd8e81..ad3d77b11 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.atlas +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.atlas @@ -4,99 +4,92 @@ spineboy-pma.png pma: true scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.png b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.png index b78b76f45..711fd836e 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.png and b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pma.png differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel and b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-pro.skel differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.atlas b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.atlas deleted file mode 100644 index ce32001a8..000000000 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.atlas +++ /dev/null @@ -1,60 +0,0 @@ -spineboy-run.png - size: 1181, 687 - filter: Linear, Linear - pma: true -spineboy-pro-run - index: 8 - bounds: 2, 371, 303, 314 - offsets: 11, 22, 316, 341 - origin: 142, 3 -spineboy-pro-run - index: 9 - bounds: 2, 44, 278, 325 - offsets: 30, 2, 316, 341 - origin: 142, 3 -spineboy-pro-run - index: 0 - bounds: 307, 439, 246, 320 - offsets: 67, 1, 316, 341 - rotate: 90 - origin: 142, 3 -spineboy-pro-run - index: 3 - bounds: 629, 443, 242, 320 - offsets: 12, 20, 316, 341 - rotate: 90 - origin: 142, 3 -spineboy-pro-run - index: 7 - bounds: 951, 389, 228, 296 - offsets: 36, 33, 316, 341 - origin: 142, 3 -spineboy-pro-run - index: 4 - bounds: 307, 195, 242, 320 - offsets: 2, 4, 316, 341 - rotate: 90 - origin: 142, 3 -spineboy-pro-run - index: 5 - bounds: 629, 200, 241, 316 - offsets: 8, 3, 316, 341 - rotate: 90 - origin: 142, 3 -spineboy-pro-run - index: 1 - bounds: 282, 2, 191, 318 - offsets: 70, 3, 316, 341 - rotate: 90 - origin: 142, 3 -spineboy-pro-run - index: 2 - bounds: 947, 81, 226, 306 - offsets: 34, 26, 316, 341 - origin: 142, 3 -spineboy-pro-run - index: 6 - bounds: 629, 4, 194, 316 - offsets: 68, 4, 316, 341 - rotate: 90 - origin: 142, 3 diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.png b/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.png deleted file mode 100644 index e28e0c6ba..000000000 Binary files a/spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy-run.png and /dev/null differ diff --git a/spine-monogame/spine-monogame-example/data/coin-pro.json b/spine-monogame/spine-monogame-example/data/coin-pro.json index 1f26f47b6..9d51d1f55 100644 --- a/spine-monogame/spine-monogame-example/data/coin-pro.json +++ b/spine-monogame/spine-monogame-example/data/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.23-beta", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-monogame/spine-monogame-example/data/coin-pro.skel b/spine-monogame/spine-monogame-example/data/coin-pro.skel index 1d51ea693..7cf937338 100644 Binary files a/spine-monogame/spine-monogame-example/data/coin-pro.skel and b/spine-monogame/spine-monogame-example/data/coin-pro.skel differ diff --git a/spine-monogame/spine-monogame-example/data/coin.atlas b/spine-monogame/spine-monogame-example/data/coin.atlas index 0ff436cff..369cf6779 100644 --- a/spine-monogame/spine-monogame-example/data/coin.atlas +++ b/spine-monogame/spine-monogame-example/data/coin.atlas @@ -2,17 +2,17 @@ coin.png size: 1024, 1024 filter: Linear, Linear coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-monogame/spine-monogame-example/data/coin.png b/spine-monogame/spine-monogame-example/data/coin.png index 5221caea1..190d853ad 100644 Binary files a/spine-monogame/spine-monogame-example/data/coin.png and b/spine-monogame/spine-monogame-example/data/coin.png differ diff --git a/spine-monogame/spine-monogame-example/data/mix-and-match-pro.json b/spine-monogame/spine-monogame-example/data/mix-and-match-pro.json index 9f27b879a..c9fbbd628 100644 --- a/spine-monogame/spine-monogame-example/data/mix-and-match-pro.json +++ b/spine-monogame/spine-monogame-example/data/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-monogame/spine-monogame-example/data/mix-and-match.atlas b/spine-monogame/spine-monogame-example/data/mix-and-match.atlas index 3cab05d5e..b8047722c 100644 --- a/spine-monogame/spine-monogame-example/data/mix-and-match.atlas +++ b/spine-monogame/spine-monogame-example/data/mix-and-match.atlas @@ -3,360 +3,356 @@ mix-and-match.png filter: Linear, Linear scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-monogame/spine-monogame-example/data/mix-and-match.png b/spine-monogame/spine-monogame-example/data/mix-and-match.png index 441cd2a81..634a1e230 100644 Binary files a/spine-monogame/spine-monogame-example/data/mix-and-match.png and b/spine-monogame/spine-monogame-example/data/mix-and-match.png differ diff --git a/spine-monogame/spine-monogame-example/data/raptor-pro.json b/spine-monogame/spine-monogame-example/data/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-monogame/spine-monogame-example/data/raptor-pro.json +++ b/spine-monogame/spine-monogame-example/data/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-monogame/spine-monogame-example/data/spineboy-pro.skel b/spine-monogame/spine-monogame-example/data/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-monogame/spine-monogame-example/data/spineboy-pro.skel and b/spine-monogame/spine-monogame-example/data/spineboy-pro.skel differ diff --git a/spine-monogame/spine-monogame-example/data/spineboy.atlas b/spine-monogame/spine-monogame-example/data/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-monogame/spine-monogame-example/data/spineboy.atlas +++ b/spine-monogame/spine-monogame-example/data/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-monogame/spine-monogame-example/data/spineboy.png b/spine-monogame/spine-monogame-example/data/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-monogame/spine-monogame-example/data/spineboy.png and b/spine-monogame/spine-monogame-example/data/spineboy.png differ diff --git a/spine-monogame/spine-monogame-example/data/tank-pro.json b/spine-monogame/spine-monogame-example/data/tank-pro.json index dfc32cab5..a858278b4 100644 --- a/spine-monogame/spine-monogame-example/data/tank-pro.json +++ b/spine-monogame/spine-monogame-example/data/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.23-beta", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/spine-monogame/spine-monogame-example/data/tank.atlas b/spine-monogame/spine-monogame-example/data/tank.atlas index 295fb0d22..fdc5a755b 100644 --- a/spine-monogame/spine-monogame-example/data/tank.atlas +++ b/spine-monogame/spine-monogame-example/data/tank.atlas @@ -3,54 +3,61 @@ tank.png filter: Linear, Linear scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-monogame/spine-monogame-example/data/tank.png b/spine-monogame/spine-monogame-example/data/tank.png index 2227d210a..e0e7f1bfe 100644 Binary files a/spine-monogame/spine-monogame-example/data/tank.png and b/spine-monogame/spine-monogame-example/data/tank.png differ diff --git a/spine-sdl/data/spineboy-pro.json b/spine-sdl/data/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-sdl/data/spineboy-pro.json +++ b/spine-sdl/data/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-sdl/data/spineboy.atlas b/spine-sdl/data/spineboy.atlas index b07ccc3bf..eca542b71 100644 --- a/spine-sdl/data/spineboy.atlas +++ b/spine-sdl/data/spineboy.atlas @@ -3,99 +3,92 @@ spineboy.png filter: Linear, Linear scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-sdl/data/spineboy.png b/spine-sdl/data/spineboy.png index d1c3ac1be..0ea9737f3 100644 Binary files a/spine-sdl/data/spineboy.png and b/spine-sdl/data/spineboy.png differ diff --git a/spine-sfml/c/data/coin-pma.atlas b/spine-sfml/c/data/coin-pma.atlas index 290e1858d..ca11e4493 100644 --- a/spine-sfml/c/data/coin-pma.atlas +++ b/spine-sfml/c/data/coin-pma.atlas @@ -3,17 +3,17 @@ coin-pma.png filter: Linear, Linear pma: true coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-sfml/c/data/coin-pma.png b/spine-sfml/c/data/coin-pma.png index 126200dee..65870eaed 100644 Binary files a/spine-sfml/c/data/coin-pma.png and b/spine-sfml/c/data/coin-pma.png differ diff --git a/spine-sfml/c/data/coin-pro.json b/spine-sfml/c/data/coin-pro.json index 1f26f47b6..9d51d1f55 100644 --- a/spine-sfml/c/data/coin-pro.json +++ b/spine-sfml/c/data/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.23-beta", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-sfml/c/data/coin-pro.skel b/spine-sfml/c/data/coin-pro.skel index 1d51ea693..7cf937338 100644 Binary files a/spine-sfml/c/data/coin-pro.skel and b/spine-sfml/c/data/coin-pro.skel differ diff --git a/spine-sfml/c/data/dragon-ess.json b/spine-sfml/c/data/dragon-ess.json index 7c16610d7..3d45816d7 100644 --- a/spine-sfml/c/data/dragon-ess.json +++ b/spine-sfml/c/data/dragon-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "aPoA1GjXkVI", - "spine": "4.1.23-beta", + "hash": "XM8KoDHOBqA", + "spine": "4.2.09-beta", "x": -366.31, "y": -327.81, "width": 660.39, diff --git a/spine-sfml/c/data/dragon-ess.skel b/spine-sfml/c/data/dragon-ess.skel index 27e251df1..3bfb31358 100644 Binary files a/spine-sfml/c/data/dragon-ess.skel and b/spine-sfml/c/data/dragon-ess.skel differ diff --git a/spine-sfml/c/data/dragon-pma.atlas b/spine-sfml/c/data/dragon-pma.atlas index 10acc3e16..bb91276ed 100644 --- a/spine-sfml/c/data/dragon-pma.atlas +++ b/spine-sfml/c/data/dragon-pma.atlas @@ -2,128 +2,116 @@ dragon-pma.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon-pma_2.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon-pma_3.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon-pma_4.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon-pma_5.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon-pma_6.png - size: 1024, 1024 - filter: Linear, Linear - pma: true -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/spine-sfml/c/data/dragon-pma.png b/spine-sfml/c/data/dragon-pma.png index bc49bf978..f2bb4c6dd 100644 Binary files a/spine-sfml/c/data/dragon-pma.png and b/spine-sfml/c/data/dragon-pma.png differ diff --git a/spine-sfml/c/data/dragon-pma_2.png b/spine-sfml/c/data/dragon-pma_2.png index 084bc5e93..c1d14d282 100644 Binary files a/spine-sfml/c/data/dragon-pma_2.png and b/spine-sfml/c/data/dragon-pma_2.png differ diff --git a/spine-sfml/c/data/dragon-pma_3.png b/spine-sfml/c/data/dragon-pma_3.png index 17276d4e6..05f7d73fc 100644 Binary files a/spine-sfml/c/data/dragon-pma_3.png and b/spine-sfml/c/data/dragon-pma_3.png differ diff --git a/spine-sfml/c/data/dragon-pma_4.png b/spine-sfml/c/data/dragon-pma_4.png index f0b9d721b..7de20b2c0 100644 Binary files a/spine-sfml/c/data/dragon-pma_4.png and b/spine-sfml/c/data/dragon-pma_4.png differ diff --git a/spine-sfml/c/data/dragon-pma_5.png b/spine-sfml/c/data/dragon-pma_5.png index f98942cba..fa0f5075b 100644 Binary files a/spine-sfml/c/data/dragon-pma_5.png and b/spine-sfml/c/data/dragon-pma_5.png differ diff --git a/spine-sfml/c/data/dragon-pma_6.png b/spine-sfml/c/data/dragon-pma_6.png deleted file mode 100644 index ebbfe9285..000000000 Binary files a/spine-sfml/c/data/dragon-pma_6.png and /dev/null differ diff --git a/spine-sfml/c/data/goblins-pma.atlas b/spine-sfml/c/data/goblins-pma.atlas index 758c7fdf8..eed0924e9 100644 --- a/spine-sfml/c/data/goblins-pma.atlas +++ b/spine-sfml/c/data/goblins-pma.atlas @@ -3,95 +3,100 @@ goblins-pma.png filter: Linear, Linear pma: true dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-sfml/c/data/goblins-pma.png b/spine-sfml/c/data/goblins-pma.png index f0a5b6ce3..a6688e2cc 100644 Binary files a/spine-sfml/c/data/goblins-pma.png and b/spine-sfml/c/data/goblins-pma.png differ diff --git a/spine-sfml/c/data/goblins-pro.json b/spine-sfml/c/data/goblins-pro.json index 6caf03bb0..62cd1cf7f 100644 --- a/spine-sfml/c/data/goblins-pro.json +++ b/spine-sfml/c/data/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-sfml/c/data/goblins-pro.skel b/spine-sfml/c/data/goblins-pro.skel index 6e667d282..8e1a73328 100644 Binary files a/spine-sfml/c/data/goblins-pro.skel and b/spine-sfml/c/data/goblins-pro.skel differ diff --git a/spine-sfml/c/data/mix-and-match-pma.atlas b/spine-sfml/c/data/mix-and-match-pma.atlas index c2eb27f20..b4cc35fa9 100644 --- a/spine-sfml/c/data/mix-and-match-pma.atlas +++ b/spine-sfml/c/data/mix-and-match-pma.atlas @@ -4,360 +4,356 @@ mix-and-match-pma.png pma: true scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-sfml/c/data/mix-and-match-pma.png b/spine-sfml/c/data/mix-and-match-pma.png index 1c7c748eb..0f60ebf9a 100644 Binary files a/spine-sfml/c/data/mix-and-match-pma.png and b/spine-sfml/c/data/mix-and-match-pma.png differ diff --git a/spine-sfml/c/data/mix-and-match-pro.json b/spine-sfml/c/data/mix-and-match-pro.json index 9f27b879a..c9fbbd628 100644 --- a/spine-sfml/c/data/mix-and-match-pro.json +++ b/spine-sfml/c/data/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-sfml/c/data/mix-and-match-pro.skel b/spine-sfml/c/data/mix-and-match-pro.skel index 4cca62bce..90d19987e 100644 Binary files a/spine-sfml/c/data/mix-and-match-pro.skel and b/spine-sfml/c/data/mix-and-match-pro.skel differ diff --git a/spine-sfml/c/data/owl-pma.atlas b/spine-sfml/c/data/owl-pma.atlas index 686314430..35485dbe8 100644 --- a/spine-sfml/c/data/owl-pma.atlas +++ b/spine-sfml/c/data/owl-pma.atlas @@ -4,71 +4,64 @@ owl-pma.png pma: true scale: 0.5 L_eye-closed - bounds: 512, 5, 90, 86 - rotate: 90 + bounds: 508, 115, 90, 86 L_eye-iris - bounds: 600, 10, 90, 86 - rotate: 90 + bounds: 826, 183, 90, 86 L_eye-light - bounds: 688, 4, 21, 20 - rotate: 90 + bounds: 1001, 488, 21, 20 L_eye-pupil - bounds: 856, 13, 63, 60 - rotate: 90 + bounds: 752, 154, 63, 60 L_foot - bounds: 834, 78, 64, 48 - rotate: 90 + bounds: 817, 133, 64, 48 L_wing - bounds: 349, 4, 81, 110 - rotate: 90 + bounds: 342, 91, 81, 110 R_eye-closed - bounds: 637, 119, 90, 86 - rotate: 90 + bounds: 508, 27, 90, 86 R_eye-iris - bounds: 688, 27, 90, 86 + bounds: 600, 111, 90, 86 rotate: 90 R_eye-light - bounds: 710, 4, 21, 20 - rotate: 90 + bounds: 1001, 466, 21, 20 R_eye-pupil - bounds: 884, 80, 63, 60 + bounds: 691, 72, 63, 60 rotate: 90 R_foot - bounds: 845, 145, 64, 48 - rotate: 90 + bounds: 814, 83, 64, 48 R_wing - bounds: 421, 93, 81, 110 + bounds: 425, 91, 81, 110 beak - bounds: 776, 2, 39, 41 + bounds: 883, 140, 39, 41 beak-down - bounds: 817, 3, 37, 40 -body - bounds: 2, 7, 248, 196 -feather-1 - bounds: 918, 18, 59, 60 -feather-2 - bounds: 781, 144, 62, 65 -feather-3 - bounds: 776, 45, 56, 76 -head-base - bounds: 621, 211, 299, 237 + bounds: 753, 53, 37, 40 rotate: 90 +body + bounds: 2, 5, 248, 196 +feather-1 + bounds: 753, 92, 59, 60 +feather-2 + bounds: 688, 137, 62, 65 +feather-3 + bounds: 600, 2, 56, 76 + rotate: 90 +head-base + bounds: 621, 271, 299, 237 leaf-1 - bounds: 559, 102, 76, 101 + bounds: 922, 273, 76, 101 leaf-2 - bounds: 252, 4, 65, 95 + bounds: 621, 204, 65, 95 rotate: 90 leaf-3 - bounds: 252, 71, 132, 77 + bounds: 922, 376, 132, 77 rotate: 90 leaf-4 - bounds: 461, 2, 89, 49 - rotate: 90 + bounds: 600, 60, 89, 49 leaf-5 - bounds: 504, 97, 53, 106 + bounds: 718, 216, 53, 106 + rotate: 90 leaf-6 - bounds: 331, 87, 88, 116 + bounds: 252, 85, 88, 116 leaf-7 - bounds: 725, 123, 54, 86 + bounds: 252, 29, 54, 86 + rotate: 90 wood - bounds: 2, 205, 617, 305 + bounds: 2, 203, 617, 305 diff --git a/spine-sfml/c/data/owl-pma.png b/spine-sfml/c/data/owl-pma.png index 38b7f9f6b..2c9f188de 100644 Binary files a/spine-sfml/c/data/owl-pma.png and b/spine-sfml/c/data/owl-pma.png differ diff --git a/spine-sfml/c/data/owl-pro.json b/spine-sfml/c/data/owl-pro.json index 9c6fd8aa7..1e6733aba 100644 --- a/spine-sfml/c/data/owl-pro.json +++ b/spine-sfml/c/data/owl-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "HtoSOJus9ic", - "spine": "4.1.23-beta", + "hash": "WhZADUSP9U4", + "spine": "4.2.09-beta", "x": -644, "y": -274, "width": 1350.84, @@ -21,8 +21,16 @@ "color": "1a8600ff" }, { "name": "branch-2", "parent": "branch-1", "length": 391.45, "rotation": -30.2, "x": 487.04, "color": "1a8600ff" }, - { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff" }, - { "name": "body-top-control", "parent": "owl-base", "rotation": 92.53, "x": -3.85, "y": 227.57, "color": "1697ffff" }, + { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff", "icon": "diamond" }, + { + "name": "body-top-control", + "parent": "owl-base", + "rotation": 92.53, + "x": -3.85, + "y": 227.57, + "color": "1697ffff", + "icon": "triangle" + }, { "name": "branch-3", "parent": "branch-2", "length": 231.51, "rotation": 30.15, "x": 391.45, "color": "1a8600ff" }, { "name": "branch-4", "parent": "branch-3", "length": 158.83, "rotation": 38.9, "x": 231.51, "color": "1a8600ff" }, { "name": "branch-5", "parent": "branch-4", "length": 82.96, "rotation": -26.21, "x": 158.83, "color": "1a8600ff" }, @@ -35,9 +43,17 @@ "y": -20.15, "color": "1a8600ff" }, - { "name": "head", "parent": "body-top-control", "rotation": -90, "x": 51, "y": 0.33, "color": "1697ffff" }, - { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff" }, - { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff" }, + { + "name": "head", + "parent": "body-top-control", + "rotation": -90, + "x": 51, + "y": 0.33, + "color": "1697ffff", + "icon": "square" + }, + { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff", "icon": "arrows" }, + { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff", "icon": "arrows" }, { "name": "leaf-1", "parent": "branch-1", @@ -143,7 +159,7 @@ "beak": { "type": "mesh", "uvs": [ 0, 0.48125, 0.23847, 0.67437, 0.38855, 1, 0.52195, 1, 0.67759, 1, 0.76097, 0.66393, 1, 0.44993, 1, 0.20983, 0.73317, 0, 0.34964, 0, 0, 0.20983, 0.44969, 0.27769, 0.50528, 0.66915 ], - "triangles": [ 5, 4, 12, 2, 12, 3, 4, 3, 12, 2, 1, 12, 12, 1, 11, 1, 0, 11, 12, 11, 5, 5, 11, 6, 0, 10, 11, 6, 11, 7, 11, 8, 7, 10, 9, 11, 11, 9, 8 ], + "triangles": [ 11, 9, 8, 10, 9, 11, 11, 8, 7, 6, 11, 7, 0, 10, 11, 5, 11, 6, 12, 11, 5, 1, 0, 11, 12, 1, 11, 2, 1, 12, 4, 3, 12, 2, 12, 3, 5, 4, 12 ], "vertices": [ 2, 10, -41, -66.77, 0.45, 9, -41, 59.89, 0.55, 2, 10, -22.64, -82.61, 0.65, 9, -22.64, 44.05, 0.35, 2, 10, -11.08, -109.31, 0.83, 9, -11.08, 17.35, 0.17, 1, 10, -0.81, -109.31, 1, 2, 10, 11.17, -109.31, 0.83, 9, 11.17, 17.35, 0.17, 2, 10, 17.59, -81.75, 0.78, 9, 17.59, 44.91, 0.22, 2, 10, 36, -64.2, 0.45, 9, 36, 62.46, 0.55, 2, 10, 36, -44.51, 0.45, 9, 36, 82.15, 0.55, 2, 10, 15.45, -27.31, 0.45, 9, 15.45, 99.35, 0.55, 2, 10, -14.08, -27.31, 0.45, 9, -14.08, 99.35, 0.55, 2, 10, -41, -44.51, 0.45, 9, -41, 82.15, 0.55, 1, 10, -6.37, -50.08, 1, 1, 10, -2.09, -82.18, 1 ], "hull": 11, "edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20, 4, 6, 6, 8 ], @@ -155,7 +171,7 @@ "beak-down": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 9, 33, 17.35, 0.43, 10, 33, -109.31, 0.57, 2, 9, -40, 17.35, 0.43, 10, -40, -109.31, 0.57, 2, 9, -40, 96.35, 0.43, 10, -40, -30.31, 0.57, 2, 9, 33, 96.35, 0.43, 10, 33, -30.31, 0.57 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -167,7 +183,7 @@ "body": { "type": "mesh", "uvs": [ 0.32567, 1, 0.69603, 1, 0.86396, 0.83947, 1, 0.63572, 1, 0.36212, 0.92608, 0.17292, 0.70524, 0, 0.26586, 0, 0.09793, 0.1671, 0, 0.3301, 0, 0.6561, 0.12784, 0.85111, 0.4982, 0.37085, 0.489, 0.78417, 0.22215, 0.75797, 0.22905, 0.38249, 0.4959, 0.12053, 0.75355, 0.76961, 0.74434, 0.37376, 0.72134, 0.14672, 0.24516, 0.14381 ], - "triangles": [ 18, 19, 5, 15, 8, 20, 18, 5, 4, 9, 8, 15, 15, 20, 12, 12, 16, 19, 20, 16, 12, 12, 19, 18, 10, 9, 15, 12, 14, 15, 17, 12, 18, 16, 7, 6, 20, 7, 16, 16, 6, 19, 5, 19, 6, 20, 8, 7, 18, 4, 3, 13, 14, 12, 17, 18, 3, 2, 17, 3, 11, 10, 14, 0, 14, 13, 11, 14, 0, 1, 13, 17, 1, 17, 2, 0, 13, 1, 17, 13, 12, 14, 10, 15 ], + "triangles": [ 18, 4, 3, 20, 8, 7, 5, 19, 6, 16, 6, 19, 20, 7, 16, 16, 7, 6, 17, 12, 18, 12, 14, 15, 10, 9, 15, 12, 19, 18, 20, 16, 12, 12, 16, 19, 15, 20, 12, 9, 8, 15, 18, 5, 4, 15, 8, 20, 18, 19, 5, 14, 10, 15, 17, 13, 12, 0, 13, 1, 1, 17, 2, 1, 13, 17, 11, 14, 0, 0, 14, 13, 11, 10, 14, 2, 17, 3, 17, 18, 3, 13, 14, 12 ], "vertices": [ 2, 3, -77, -83.78, 0.9818, 4, -307.82, 86.8, 0.0182, 2, 3, 106.53, -75.68, 0.9604, 4, -307.82, -96.91, 0.0396, 1, 3, 186.97, -9.15, 1, 2, 3, 250.85, 73.62, 0.58, 4, -165.02, -247.67, 0.42, 2, 3, 246.13, 180.77, 0.244, 4, -57.77, -247.67, 0.756, 1, 4, 16.4, -211.01, 1, 1, 4, 84.18, -101.47, 1, 1, 4, 84.18, 116.46, 1, 1, 4, 18.68, 199.75, 1, 2, 3, -249.94, 171.45, 0.36505, 4, -45.22, 248.33, 0.63495, 2, 3, -244.31, 43.78, 0.62057, 4, -173.01, 248.33, 0.37943, 1, 3, -177.6, -29.8, 1, 2, 3, -2.37, 166.38, 0.1, 4, -61.19, 1.22, 0.9, 2, 3, 0.21, 4.31, 0.75, 4, -223.21, 5.78, 0.25, 1, 3, -132.47, 8.74, 1, 2, 3, -135.54, 155.94, 0.14, 4, -65.76, 134.72, 0.86, 1, 4, 36.93, 2.36, 1, 1, 3, 131.04, 15.8, 1, 2, 3, 119.65, 170.62, 0.21, 4, -62.33, -120.87, 0.79, 1, 4, 26.67, -109.46, 1, 1, 4, 27.81, 126.73, 1 ], "hull": 12, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 0, 22, 38, 32, 32, 40 ], @@ -188,7 +204,7 @@ "head-base": { "type": "mesh", "uvs": [ 0, 0.62821, 0.10827, 0.80875, 0.2669, 0.96522, 0.4026, 1, 0.60901, 1, 0.77147, 0.96522, 0.92054, 0.84004, 1, 0.63303, 1, 0.52952, 1, 0.37787, 0.97662, 0.33564, 0.88805, 0.17566, 0.78293, 0.03123, 0.73324, 0, 0.67782, 0, 0.64724, 0.08901, 0.57461, 0.17085, 0.50772, 0.17807, 0.42936, 0.16604, 0.34717, 0.09141, 0.3166, 0, 0.2669, 0, 0.24779, 0.06975, 0.12547, 0.16122, 0.0108, 0.36824, 0.23632, 0.34657, 0.79058, 0.34657, 0.79822, 0.74135, 0.23632, 0.74616, 0.50389, 0.77986, 0.50581, 0.31528, 0.50198, 0.90263, 0.39113, 0.88097, 0.6008, 0.8906, 0.42745, 0.77264, 0.57461, 0.76542, 0.50389, 0.83282, 0.46185, 0.40435, 0.56123, 0.39953, 0.5039, 0.54396, 0.65106, 0.27917, 0.38922, 0.29362, 0.3338, 0.26232, 0.7084, 0.21418, 0.72942, 0.09623, 0.29175, 0.16363, 0.40642, 0.23825, 0.50963, 0.24066, 0.6071, 0.24547, 0.67591, 0.14678, 0.34717, 0.17085, 0.88996, 0.53433, 0.86703, 0.66673, 0.85747, 0.41397, 0.12738, 0.54637, 0.14841, 0.41638, 0.16943, 0.69321, 0.34909, 0.34176, 0.65679, 0.35139, 0.60328, 0.33213, 0.42171, 0.33213, 0.29939, 0.56803, 0.71795, 0.556, 0.44847, 0.68839, 0.57461, 0.69321, 0.82689, 0.27917, 0.91099, 0.39712, 0.93965, 0.53193, 0.91863, 0.71006, 0.19045, 0.26714, 0.09298, 0.39472, 0.07387, 0.56803, 0.1465, 0.73894, 0.20574, 0.83282, 0.28028, 0.86893, 0.79822, 0.85449, 0.69119, 0.87134, 0.85747, 0.78227 ], - "triangles": [ 3, 31, 4, 31, 33, 4, 4, 76, 5, 4, 33, 76, 3, 2, 32, 2, 74, 32, 3, 32, 31, 5, 75, 6, 5, 76, 75, 1, 73, 2, 2, 73, 74, 33, 35, 76, 32, 74, 34, 75, 76, 27, 73, 28, 74, 75, 77, 6, 76, 35, 27, 75, 27, 77, 77, 68, 6, 6, 68, 7, 1, 72, 73, 73, 72, 28, 1, 0, 72, 77, 52, 68, 77, 27, 52, 72, 56, 28, 28, 56, 61, 27, 62, 52, 72, 0, 56, 68, 52, 7, 67, 7, 52, 0, 71, 56, 71, 54, 56, 56, 54, 61, 61, 37, 39, 37, 61, 57, 37, 57, 60, 52, 51, 67, 52, 62, 51, 67, 8, 7, 0, 24, 71, 54, 55, 61, 55, 25, 61, 61, 25, 57, 71, 70, 54, 71, 24, 70, 62, 53, 51, 62, 26, 53, 62, 58, 26, 54, 70, 55, 38, 59, 58, 39, 37, 38, 67, 51, 66, 51, 53, 66, 67, 66, 8, 66, 9, 8, 25, 55, 69, 66, 53, 65, 37, 30, 38, 37, 60, 30, 38, 30, 59, 53, 26, 65, 66, 10, 9, 66, 65, 10, 55, 70, 69, 70, 24, 69, 24, 23, 69, 59, 40, 58, 58, 40, 26, 40, 43, 26, 26, 43, 65, 25, 42, 57, 25, 69, 42, 57, 41, 60, 57, 42, 41, 65, 11, 10, 59, 30, 48, 59, 48, 40, 48, 30, 47, 30, 60, 46, 60, 41, 46, 30, 46, 47, 47, 18, 17, 18, 47, 46, 41, 42, 46, 65, 43, 11, 40, 48, 43, 69, 45, 42, 69, 23, 45, 42, 50, 46, 42, 45, 50, 47, 16, 48, 48, 49, 43, 48, 16, 49, 47, 17, 16, 46, 50, 18, 43, 44, 11, 43, 49, 44, 44, 12, 11, 16, 15, 49, 18, 50, 19, 50, 45, 19, 23, 22, 45, 19, 45, 20, 21, 45, 22, 20, 45, 21, 49, 15, 44, 15, 14, 44, 44, 13, 12, 44, 14, 13, 31, 36, 33, 31, 32, 36, 36, 35, 33, 32, 34, 36, 74, 28, 34, 34, 29, 36, 36, 29, 35, 64, 35, 29, 29, 34, 63, 34, 28, 63, 29, 63, 64, 35, 64, 27, 28, 61, 63, 64, 62, 27, 63, 39, 64, 64, 39, 62, 63, 61, 39, 39, 38, 62, 38, 58, 62 ], + "triangles": [ 44, 14, 13, 44, 13, 12, 15, 14, 44, 49, 15, 44, 20, 45, 21, 21, 45, 22, 19, 45, 20, 23, 22, 45, 50, 45, 19, 18, 50, 19, 16, 15, 49, 44, 12, 11, 43, 49, 44, 43, 44, 11, 46, 50, 18, 47, 17, 16, 48, 16, 49, 48, 49, 43, 47, 16, 48, 42, 45, 50, 42, 50, 46, 69, 23, 45, 69, 45, 42, 40, 48, 43, 65, 43, 11, 41, 42, 46, 18, 47, 46, 47, 18, 17, 30, 46, 47, 60, 41, 46, 30, 60, 46, 48, 30, 47, 59, 48, 40, 59, 30, 48, 65, 11, 10, 57, 42, 41, 57, 41, 60, 25, 69, 42, 25, 42, 57, 26, 43, 65, 40, 43, 26, 58, 40, 26, 59, 40, 58, 24, 23, 69, 70, 24, 69, 55, 70, 69, 66, 65, 10, 66, 10, 9, 53, 26, 65, 38, 30, 59, 37, 60, 30, 37, 30, 38, 66, 53, 65, 25, 55, 69, 66, 9, 8, 67, 66, 8, 51, 53, 66, 67, 51, 66, 39, 37, 38, 38, 59, 58, 54, 70, 55, 62, 58, 26, 62, 26, 53, 62, 53, 51, 71, 24, 70, 71, 70, 54, 61, 25, 57, 55, 25, 61, 54, 55, 61, 0, 24, 71, 67, 8, 7, 52, 62, 51, 52, 51, 67, 37, 57, 60, 37, 61, 57, 61, 37, 39, 56, 54, 61, 71, 54, 56, 0, 71, 56, 67, 7, 52, 68, 52, 7, 72, 0, 56, 27, 62, 52, 28, 56, 61, 72, 56, 28, 77, 27, 52, 77, 52, 68, 1, 0, 72, 73, 72, 28, 1, 72, 73, 6, 68, 7, 77, 68, 6, 75, 27, 77, 76, 35, 27, 75, 77, 6, 73, 28, 74, 75, 76, 27, 32, 74, 34, 33, 35, 76, 2, 73, 74, 1, 73, 2, 5, 76, 75, 5, 75, 6, 3, 32, 31, 2, 74, 32, 3, 2, 32, 4, 33, 76, 4, 76, 5, 31, 33, 4, 3, 31, 4, 38, 58, 62, 39, 38, 62, 63, 61, 39, 64, 39, 62, 63, 39, 64, 64, 62, 27, 28, 61, 63, 35, 64, 27, 29, 63, 64, 34, 28, 63, 29, 34, 63, 64, 35, 29, 36, 29, 35, 34, 29, 36, 74, 28, 34, 32, 34, 36, 36, 35, 33, 31, 32, 36, 31, 36, 33 ], "vertices": [ 3, 10, -304, -69.08, 0.01459, 11, -304, -69.08, 0.26323, 9, -302.26, 46.41, 0.72217, 3, 10, -239.36, -154.66, 0.00559, 11, -239.36, -154.66, 0.05203, 9, -237.62, -39.17, 0.94238, 3, 10, -144.66, -228.82, 0.145, 11, -144.66, -228.82, 0.04545, 9, -142.92, -113.33, 0.80955, 3, 10, -63.65, -245.31, 0.2095, 11, -63.65, -245.31, 0.00316, 9, -61.91, -129.82, 0.78734, 2, 10, 59.58, -245.31, 0.17617, 9, 61.32, -129.82, 0.82383, 3, 10, 156.57, -228.82, 0.08728, 11, 156.57, -228.82, 0.05645, 9, 158.3, -113.33, 0.85627, 3, 10, 245.56, -169.49, 0.06344, 11, 245.56, -169.49, 0.11037, 9, 247.3, -54, 0.82619, 3, 10, 293, -71.36, 0.00633, 11, 293, -71.36, 0.10522, 9, 294.74, 44.12, 0.88845, 3, 10, 293, -22.3, 0.01595, 11, 293, -22.3, 0.14723, 9, 294.74, 93.19, 0.83682, 3, 10, 293, 49.58, 0.00982, 11, 293, 49.58, 0.29562, 9, 294.74, 165.07, 0.69456, 3, 10, 279.04, 69.6, 0.01809, 11, 279.04, 69.6, 0.25265, 9, 280.78, 185.09, 0.72927, 3, 10, 226.17, 145.43, 0.00461, 11, 226.17, 145.43, 0.21686, 9, 227.9, 260.91, 0.77853, 2, 11, 163.41, 213.89, 0.19851, 9, 165.15, 329.37, 0.80149, 2, 11, 133.75, 228.69, 0.27166, 9, 135.48, 344.18, 0.72834, 2, 11, 100.66, 228.69, 0.27166, 9, 102.39, 344.18, 0.72834, 2, 11, 82.4, 186.5, 0.27166, 9, 84.14, 301.99, 0.72834, 2, 11, 39.04, 147.71, 0.09155, 9, 40.78, 263.2, 0.90845, 2, 11, -0.89, 144.29, 0.05807, 9, 0.85, 259.77, 0.94193, 2, 11, -47.67, 149.99, 0.07863, 9, -45.94, 265.48, 0.92137, 2, 11, -96.74, 185.36, 0.26398, 9, -95, 300.85, 0.73602, 2, 11, -114.99, 228.69, 0.27166, 9, -113.25, 344.18, 0.72834, 2, 11, -144.66, 228.69, 0.27166, 9, -142.92, 344.18, 0.72834, 2, 11, -156.07, 195.63, 0.27166, 9, -154.33, 311.12, 0.72834, 2, 11, -229.09, 152.27, 0.15795, 9, -227.35, 267.76, 0.84205, 2, 11, -297.55, 54.15, 0.23165, 9, -295.81, 169.63, 0.76835, 2, 10, -162.91, 64.42, 0.23917, 9, -161.18, 179.9, 0.76083, 2, 10, 167.98, 64.42, 0.36537, 9, 169.71, 179.9, 0.63463, 2, 10, 172.54, -122.71, 0.43659, 9, 174.28, -7.22, 0.56341, 2, 10, -162.91, -124.99, 0.47535, 9, -161.18, -9.5, 0.52465, 2, 10, -3.17, -140.96, 0.72626, 9, -1.44, -25.48, 0.27374, 2, 10, -2.03, 79.25, 0.25249, 9, -0.3, 194.74, 0.74751, 2, 10, -4.32, -199.16, 0.4798, 9, -2.58, -83.67, 0.5202, 2, 10, -70.49, -188.89, 0.42536, 9, -68.76, -73.4, 0.57464, 2, 10, 54.68, -193.45, 0.42901, 9, 56.42, -77.96, 0.57099, 2, 10, -48.81, -137.54, 0.69524, 9, -47.08, -22.05, 0.30476, 2, 10, 39.04, -134.12, 0.68899, 9, 40.78, -18.63, 0.31101, 2, 10, -3.17, -166.07, 0.60466, 9, -1.44, -50.58, 0.39534, 2, 10, -28.28, 37.03, 0.40749, 9, -26.54, 152.52, 0.59251, 2, 10, 31.06, 39.31, 0.48302, 9, 32.79, 154.8, 0.51698, 2, 10, -3.17, -29.15, 0.53404, 9, -1.44, 86.34, 0.46596, 2, 10, 84.68, 96.36, 0.19082, 9, 86.42, 211.85, 0.80918, 2, 10, -71.63, 89.52, 0.17688, 9, -69.9, 205.01, 0.82312, 2, 10, -104.72, 104.35, 0.08016, 9, -102.99, 219.84, 0.91984, 3, 10, 118.91, 127.17, 0.03256, 11, 118.91, 127.17, 0.0011, 9, 120.65, 242.66, 0.96634, 2, 11, 131.46, 183.08, 0.23984, 9, 133.2, 298.57, 0.76016, 2, 11, -129.83, 151.13, 0.08046, 9, -128.09, 266.62, 0.91954, 2, 10, -61.37, 115.76, 0.04075, 9, -59.63, 231.25, 0.95925, 2, 10, 0.25, 114.62, 0.06407, 9, 1.99, 230.11, 0.93593, 2, 10, 58.44, 112.34, 0.07435, 9, 60.18, 227.83, 0.92565, 2, 11, 99.52, 159.12, 0.15345, 9, 101.25, 274.61, 0.84655, 2, 11, -96.74, 147.71, 0.06159, 9, -95, 263.2, 0.93841, 2, 10, 227.31, -24.58, 0.25194, 9, 229.05, 90.91, 0.74806, 2, 10, 213.62, -87.34, 0.30876, 9, 215.35, 28.15, 0.69124, 2, 10, 207.91, 32.47, 0.31184, 9, 209.65, 147.96, 0.68816, 3, 10, -227.95, -30.29, 0.26918, 11, -227.95, -30.29, 0.05011, 9, -226.21, 85.2, 0.6807, 3, 10, -215.4, 31.33, 0.24851, 11, -215.4, 31.33, 0.02152, 9, -213.66, 146.81, 0.72997, 2, 10, -202.85, -99.89, 0.2927, 9, -201.11, 15.6, 0.7073, 2, 10, -95.6, 66.7, 0.27831, 9, -93.86, 182.19, 0.72169, 2, 10, 88.11, 62.13, 0.4333, 9, 89.84, 177.62, 0.5667, 2, 10, 56.16, 71.26, 0.36297, 9, 57.9, 186.75, 0.63703, 2, 10, -52.24, 71.26, 0.28083, 9, -50.5, 186.75, 0.71917, 2, 10, -125.26, -40.56, 0.46719, 9, -123.52, 74.93, 0.53281, 2, 10, 124.62, -34.85, 0.68177, 9, 126.36, 80.64, 0.31823, 2, 10, -36.26, -97.61, 0.80548, 9, -34.53, 17.88, 0.19452, 2, 10, 39.04, -99.89, 0.77666, 9, 40.78, 15.6, 0.22334, 3, 10, 189.65, 96.36, 0.11792, 11, 189.65, 96.36, 3.0E-5, 9, 191.39, 211.85, 0.88205, 3, 10, 239.86, 40.45, 0.1113, 11, 239.86, 40.45, 0.02801, 9, 241.6, 155.94, 0.86068, 3, 10, 256.97, -23.44, 0.07223, 11, 256.97, -23.44, 0.0013, 9, 258.71, 92.05, 0.92647, 2, 10, 244.42, -107.88, 0.12196, 9, 246.16, 7.61, 0.87804, 2, 10, -190.3, 102.07, 0.02441, 9, -188.56, 217.56, 0.97559, 3, 10, -248.49, 41.6, 0.09967, 11, -248.49, 41.6, 0.07803, 9, -246.75, 157.08, 0.8223, 3, 10, -259.9, -40.56, 0.14162, 11, -259.9, -40.56, 0.05098, 9, -258.16, 74.93, 0.8074, 2, 10, -216.54, -121.57, 0.14701, 9, -214.8, -6.08, 0.85299, 2, 10, -181.17, -166.07, 0.19633, 9, -179.43, -50.58, 0.80367, 2, 10, -136.67, -183.18, 0.35738, 9, -134.93, -67.69, 0.64262, 3, 10, 172.54, -176.34, 0.23906, 11, 172.54, -176.34, 0.00239, 9, 174.28, -60.85, 0.75855, 2, 10, 108.64, -184.32, 0.37393, 9, 110.38, -68.83, 0.62607, 2, 10, 207.91, -142.11, 0.22094, 9, 209.65, -26.62, 0.77906 ], "hull": 25, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 0, 48, 90, 42, 14, 16, 16, 18, 18, 20, 20, 22 ], @@ -221,7 +237,7 @@ "L_eye-closed": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 9, 212, 3.35, 0.5, 10, 212, -123.31, 0.5, 2, 9, 33, 3.35, 0.5, 10, 33, -123.31, 0.5, 2, 9, 33, 174.35, 0.5, 10, 33, 47.69, 0.5, 2, 9, 212, 174.35, 0.5, 10, 212, 47.69, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -233,7 +249,7 @@ "L_eye-iris": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 9, 212, 3.35, 0.5, 10, 212, -123.31, 0.5, 2, 9, 33, 3.35, 0.5, 10, 33, -123.31, 0.5, 2, 9, 33, 174.35, 0.5, 10, 33, 47.69, 0.5, 2, 9, 212, 174.35, 0.5, 10, 212, 47.69, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -245,7 +261,7 @@ "L_eye-light": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 10, 146, -27.31, 0.75, 9, 146, 99.35, 0.25, 2, 10, 104, -27.31, 0.75, 9, 104, 99.35, 0.25, 2, 10, 104, 11.69, 0.75, 9, 104, 138.35, 0.25, 2, 10, 146, 11.69, 0.75, 9, 146, 138.35, 0.25 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -284,7 +300,7 @@ "R_eye-closed": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 10, -34, -123.31, 0.5, 9, -34, 3.35, 0.5, 2, 10, -213, -123.31, 0.5, 9, -213, 3.35, 0.5, 2, 10, -213, 47.69, 0.5, 9, -213, 174.35, 0.5, 2, 10, -34, 47.69, 0.5, 9, -34, 174.35, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -296,7 +312,7 @@ "R_eye-iris": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 10, -34, -123.31, 0.5, 9, -34, 3.35, 0.5, 2, 10, -213, -123.31, 0.5, 9, -213, 3.35, 0.5, 2, 10, -213, 47.69, 0.5, 9, -213, 174.35, 0.5, 2, 10, -34, 47.69, 0.5, 9, -34, 174.35, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -308,7 +324,7 @@ "R_eye-light": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 10, -105, -27.31, 0.75, 9, -105, 99.35, 0.25, 2, 10, -147, -27.31, 0.75, 9, -147, 99.35, 0.25, 2, 10, -147, 11.69, 0.75, 9, -147, 138.35, 0.25, 2, 10, -105, 11.69, 0.75, 9, -105, 138.35, 0.25 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -347,7 +363,7 @@ "wood": { "type": "mesh", "uvs": [ 0.11021, 1, 0.15566, 0.95336, 0.21123, 0.8928, 0.22028, 0.83577, 0.28362, 0.72988, 0.35481, 0.68032, 0.39623, 0.67196, 0.46043, 0.59021, 0.69783, 0.62777, 0.7172, 0.63585, 0.73175, 0.62498, 0.7584, 0.58795, 0.83734, 0.52487, 0.88376, 0.45904, 0.89542, 0.44525, 0.902, 0.42073, 0.93407, 0.35365, 0.93428, 0.24657, 0.95942, 0.18869, 1, 0.10133, 1, 0.04501, 0.97874, 0.0803, 0.96743, 0.09908, 0.91739, 0.18018, 0.90399, 0.28117, 0.87848, 0.08782, 0.85736, 0.10809, 0.89108, 0.29728, 0.89525, 0.3207, 0.88552, 0.37054, 0.87781, 0.40495, 0.86852, 0.42127, 0.84031, 0.43039, 0.72738, 0.5583, 0.71396, 0.5716, 0.69722, 0.56699, 0.44709, 0.50234, 0.35592, 0.55641, 0.26039, 0.63925, 0.18238, 0.78349, 0.08762, 0.77081, 0, 0.88984, 0, 1, 0.40039, 0.56993, 0.71762, 0.60099, 0.88511, 0.42365, 0.89924, 0.29751, 0.93733, 0.18329, 0.98584, 0.10003 ], - "triangles": [ 24, 26, 25, 27, 26, 24, 19, 48, 21, 22, 21, 48, 19, 21, 20, 47, 23, 22, 18, 47, 22, 48, 18, 22, 19, 18, 48, 46, 27, 24, 28, 27, 46, 17, 23, 47, 17, 47, 18, 24, 23, 17, 16, 24, 17, 46, 24, 16, 28, 46, 16, 29, 28, 16, 15, 29, 16, 45, 30, 29, 29, 15, 45, 14, 45, 15, 45, 31, 30, 13, 31, 45, 13, 45, 14, 32, 31, 13, 12, 32, 13, 12, 33, 32, 11, 33, 12, 33, 11, 44, 33, 44, 34, 10, 44, 11, 10, 9, 44, 7, 36, 35, 43, 36, 7, 44, 8, 35, 44, 35, 34, 9, 8, 44, 7, 35, 8, 6, 43, 7, 43, 37, 36, 43, 5, 37, 5, 38, 37, 43, 6, 5, 4, 38, 5, 4, 39, 38, 3, 39, 4, 2, 39, 3, 2, 1, 40, 2, 40, 39, 41, 40, 1, 0, 42, 41, 1, 0, 41 ], + "triangles": [ 27, 26, 24, 24, 26, 25, 19, 18, 48, 48, 18, 22, 18, 47, 22, 47, 23, 22, 19, 21, 20, 22, 21, 48, 19, 48, 21, 14, 45, 15, 29, 15, 45, 45, 30, 29, 15, 29, 16, 29, 28, 16, 28, 46, 16, 46, 24, 16, 16, 24, 17, 24, 23, 17, 17, 47, 18, 17, 23, 47, 28, 27, 46, 46, 27, 24, 10, 9, 44, 10, 44, 11, 33, 44, 34, 33, 11, 44, 11, 33, 12, 12, 33, 32, 12, 32, 13, 32, 31, 13, 13, 45, 14, 13, 31, 45, 45, 31, 30, 6, 43, 7, 7, 35, 8, 9, 8, 44, 44, 35, 34, 44, 8, 35, 43, 36, 7, 7, 36, 35, 1, 0, 41, 0, 42, 41, 41, 40, 1, 2, 40, 39, 2, 1, 40, 2, 39, 3, 3, 39, 4, 4, 39, 38, 4, 38, 5, 43, 6, 5, 5, 38, 37, 43, 5, 37, 43, 37, 36 ], "vertices": [ 1, 1, 46.94, -64.01, 1, 1, 1, 109.8, -64.9, 1, 1, 1, 187.66, -64.09, 1, 1, 1, 213.68, -38.52, 1, 1, 1, 312.85, -17.71, 1, 1, 1, 404.67, -31.78, 1, 2, 1, 452.3, -51.01, 0.87274, 2, -4.36, -61.57, 0.12726, 2, 1, 545.58, -43.72, 1.0E-5, 2, 72.59, -8.34, 0.99999, 1, 2, 366.26, -18.28, 1, 2, 2, 390.36, -22.14, 0.6578, 5, -12.06, -18.6, 0.3422, 2, 2, 408.01, -14.74, 0.23428, 5, 6.92, -21.06, 0.76572, 1, 5, 46.51, -16.33, 1, 1, 5, 150.63, -27.46, 1, 2, 5, 219.97, -18.5, 0.91238, 6, -20.61, -7.15, 0.08762, 2, 5, 236.6, -17.73, 0.53313, 6, -7.17, -17, 0.46687, 3, 5, 250.73, -8.27, 0.14373, 6, 9.76, -18.5, 0.85627, 7, -125.56, -82.45, 0, 3, 1, 1130.1, -187.59, 0, 6, 62.99, -38.53, 0.99998, 7, -68.96, -76.91, 2.0E-5, 3, 1, 1160.61, -129.96, 0, 6, 122.91, -12.79, 0.99739, 7, -26.57, -27.34, 0.00261, 3, 1, 1204.46, -113.15, 0, 6, 167.6, -27.21, 0.08864, 7, 19.88, -20.53, 0.91136, 1, 7, 92.49, -12.37, 1, 2, 1, 1267.69, -76.61, 0, 7, 89.58, 1.28, 1, 2, 6, 237.64, -22.79, 2.0E-5, 7, 80.77, 14.37, 0.99998, 2, 6, 221.59, -14.54, 1.8E-4, 7, 62.73, 14.68, 0.99982, 2, 6, 151.7, 22.42, 0.82914, 7, -16.3, 16.96, 0.17086, 1, 6, 88.7, 13.1, 1, 1, 8, 126.5, -18.92, 1, 1, 8, 123.36, 9.75, 1, 2, 1, 1099.06, -132.55, 0, 8, 0.87, 8.12, 1, 1, 6, 62.32, 13.4, 1, 3, 1, 1072.27, -168.88, 0, 6, 29.7, 12.32, 0.99766, 8, -39.05, 29.19, 0.00234, 3, 1, 1054.11, -183.01, 0, 5, 228.74, 14.09, 0.34735, 6, 6.69, 12.71, 0.65265, 3, 1, 1039.34, -186.49, 0, 5, 213.97, 10.6, 0.97536, 6, -7, 19.26, 0.02464, 2, 1, 1005.93, -175.25, 0, 5, 180.55, 21.82, 1, 3, 1, 846.33, -179.5, 0, 2, 400.82, 25.59, 0.04218, 5, 20.96, 17.42, 0.95782, 3, 1, 827.91, -178.99, 0, 2, 384.64, 16.77, 0.61297, 5, 2.54, 17.93, 0.38703, 3, 1, 810.92, -166.91, 0, 2, 363.88, 18.67, 0.98073, 5, -14.46, 29.99, 0.01927, 1, 2, 53.78, 44.39, 1, 2, 1, 440.93, 34.41, 1, 7, -692.85, 290.52, 0, 1, 1, 313.11, 44.48, 1, 1, 1, 187.05, 11.39, 1, 1, 1, 87.08, 72.55, 1, 1, 1, -42.34, 58.57, 1, 1, 1, -73.5, -0.85, 1, 2, 1, 485.71, 1.63, 0.55579, 2, -1.97, 0.73, 0.44421, 2, 2, 389.94, -0.91, 0.56026, 5, -1.76, -0.03, 0.43974, 2, 5, 231.44, -0.18, 0.48669, 6, -0.17, -0.09, 0.51331, 1, 6, 77.24, 14.52, 1, 3, 1, 1181.84, -97.57, 0, 6, 159.76, -0.89, 0.45723, 7, 1.23, -0.39, 0.54277, 1, 7, 79.68, -0.46, 1 ], "hull": 43, "edges": [ 0, 2, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 38, 40, 44, 46, 46, 48, 48, 50, 50, 52, 72, 74, 74, 76, 76, 78, 78, 80, 80, 82, 82, 84, 0, 84, 68, 70, 70, 72, 66, 68, 88, 66, 18, 20, 20, 22, 88, 20, 16, 18, 88, 16, 88, 18, 24, 26, 26, 28, 90, 26, 28, 30, 30, 32, 90, 30, 60, 62, 90, 62, 56, 58, 58, 60, 90, 58, 94, 46, 94, 34, 36, 94, 36, 38, 32, 34, 34, 36, 52, 54, 54, 56, 62, 64, 64, 66, 14, 16, 2, 4, 40, 42, 42, 44, 96, 42 ], diff --git a/spine-sfml/c/data/owl-pro.skel b/spine-sfml/c/data/owl-pro.skel index cce0669df..67a85a25a 100644 Binary files a/spine-sfml/c/data/owl-pro.skel and b/spine-sfml/c/data/owl-pro.skel differ diff --git a/spine-sfml/c/data/raptor-pma.atlas b/spine-sfml/c/data/raptor-pma.atlas index 5b4981c80..456015eaf 100644 --- a/spine-sfml/c/data/raptor-pma.atlas +++ b/spine-sfml/c/data/raptor-pma.atlas @@ -4,98 +4,91 @@ raptor-pma.png pma: true scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-sfml/c/data/raptor-pma.png b/spine-sfml/c/data/raptor-pma.png index 6d0349772..2f3c0edd2 100644 Binary files a/spine-sfml/c/data/raptor-pma.png and b/spine-sfml/c/data/raptor-pma.png differ diff --git a/spine-sfml/c/data/raptor-pro.json b/spine-sfml/c/data/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-sfml/c/data/raptor-pro.json +++ b/spine-sfml/c/data/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-sfml/c/data/raptor-pro.skel b/spine-sfml/c/data/raptor-pro.skel index 32ab530d7..26900a1b8 100644 Binary files a/spine-sfml/c/data/raptor-pro.skel and b/spine-sfml/c/data/raptor-pro.skel differ diff --git a/spine-sfml/c/data/spineboy-pma.atlas b/spine-sfml/c/data/spineboy-pma.atlas index 9c8bd8e81..ad3d77b11 100644 --- a/spine-sfml/c/data/spineboy-pma.atlas +++ b/spine-sfml/c/data/spineboy-pma.atlas @@ -4,99 +4,92 @@ spineboy-pma.png pma: true scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-sfml/c/data/spineboy-pma.png b/spine-sfml/c/data/spineboy-pma.png index b78b76f45..711fd836e 100644 Binary files a/spine-sfml/c/data/spineboy-pma.png and b/spine-sfml/c/data/spineboy-pma.png differ diff --git a/spine-sfml/c/data/spineboy-pro.json b/spine-sfml/c/data/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-sfml/c/data/spineboy-pro.json +++ b/spine-sfml/c/data/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-sfml/c/data/spineboy-pro.skel b/spine-sfml/c/data/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-sfml/c/data/spineboy-pro.skel and b/spine-sfml/c/data/spineboy-pro.skel differ diff --git a/spine-sfml/c/data/stretchyman-pma.atlas b/spine-sfml/c/data/stretchyman-pma.atlas index a14dabf35..d8b4a4077 100644 --- a/spine-sfml/c/data/stretchyman-pma.atlas +++ b/spine-sfml/c/data/stretchyman-pma.atlas @@ -3,14 +3,17 @@ stretchyman-pma.png filter: Linear, Linear pma: true back-arm - bounds: 149, 45, 72, 202 + bounds: 679, 173, 72, 202 + rotate: 90 back-leg - bounds: 312, 4, 100, 318 + bounds: 2, 2, 100, 318 rotate: 90 body - bounds: 223, 106, 141, 452 + bounds: 2, 104, 141, 452 rotate: 90 front-arm - bounds: 2, 26, 145, 221 + bounds: 456, 100, 145, 221 + rotate: 90 head - bounds: 223, 2, 87, 102 + bounds: 322, 15, 87, 102 + rotate: 90 diff --git a/spine-sfml/c/data/stretchyman-pma.png b/spine-sfml/c/data/stretchyman-pma.png index 073483d09..78e8b4503 100644 Binary files a/spine-sfml/c/data/stretchyman-pma.png and b/spine-sfml/c/data/stretchyman-pma.png differ diff --git a/spine-sfml/c/data/stretchyman-pro.json b/spine-sfml/c/data/stretchyman-pro.json index 006f2d5a8..810313f42 100644 --- a/spine-sfml/c/data/stretchyman-pro.json +++ b/spine-sfml/c/data/stretchyman-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.09-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { diff --git a/spine-sfml/c/data/stretchyman-pro.skel b/spine-sfml/c/data/stretchyman-pro.skel index 4d97e24f1..8f76baf37 100644 Binary files a/spine-sfml/c/data/stretchyman-pro.skel and b/spine-sfml/c/data/stretchyman-pro.skel differ diff --git a/spine-sfml/c/data/tank-pma.atlas b/spine-sfml/c/data/tank-pma.atlas index a84ddf165..32525f6b6 100644 --- a/spine-sfml/c/data/tank-pma.atlas +++ b/spine-sfml/c/data/tank-pma.atlas @@ -4,54 +4,61 @@ tank-pma.png pma: true scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-sfml/c/data/tank-pma.png b/spine-sfml/c/data/tank-pma.png index 15f7b6d78..e84347737 100644 Binary files a/spine-sfml/c/data/tank-pma.png and b/spine-sfml/c/data/tank-pma.png differ diff --git a/spine-sfml/c/data/tank-pro.json b/spine-sfml/c/data/tank-pro.json index dfc32cab5..a858278b4 100644 --- a/spine-sfml/c/data/tank-pro.json +++ b/spine-sfml/c/data/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.23-beta", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/spine-sfml/c/data/tank-pro.skel b/spine-sfml/c/data/tank-pro.skel index 3f7020c06..163e64629 100644 Binary files a/spine-sfml/c/data/tank-pro.skel and b/spine-sfml/c/data/tank-pro.skel differ diff --git a/spine-sfml/c/data/vine-pro.json b/spine-sfml/c/data/vine-pro.json index 236e31872..4af855ccf 100644 --- a/spine-sfml/c/data/vine-pro.json +++ b/spine-sfml/c/data/vine-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "J/Kz2d3OlD0", - "spine": "4.1.23-beta", + "hash": "umDSKvQSk4I", + "spine": "4.2.09-beta", "x": -87.7, "y": -1.71, "width": 227.65, diff --git a/spine-sfml/c/data/vine-pro.skel b/spine-sfml/c/data/vine-pro.skel index 19f974275..961ccc37e 100644 Binary files a/spine-sfml/c/data/vine-pro.skel and b/spine-sfml/c/data/vine-pro.skel differ diff --git a/spine-sfml/cpp/data/coin-pma.atlas b/spine-sfml/cpp/data/coin-pma.atlas index 290e1858d..ca11e4493 100644 --- a/spine-sfml/cpp/data/coin-pma.atlas +++ b/spine-sfml/cpp/data/coin-pma.atlas @@ -3,17 +3,17 @@ coin-pma.png filter: Linear, Linear pma: true coin-front-logo - bounds: 2, 570, 305, 302 + bounds: 2, 609, 305, 302 coin-front-shine-logo - bounds: 2, 286, 282, 282 + bounds: 309, 629, 282, 282 coin-front-shine-spineboy - bounds: 305, 283, 282, 282 + bounds: 2, 21, 282, 282 coin-front-spineboy - bounds: 309, 567, 305, 302 - rotate: 90 + bounds: 2, 305, 305, 302 coin-side-round - bounds: 2, 2, 144, 282 + bounds: 309, 345, 144, 282 coin-side-straight - bounds: 286, 286, 17, 282 + bounds: 2, 2, 17, 282 + rotate: 90 shine - bounds: 148, 39, 72, 245 + bounds: 593, 666, 72, 245 diff --git a/spine-sfml/cpp/data/coin-pma.png b/spine-sfml/cpp/data/coin-pma.png index 126200dee..65870eaed 100644 Binary files a/spine-sfml/cpp/data/coin-pma.png and b/spine-sfml/cpp/data/coin-pma.png differ diff --git a/spine-sfml/cpp/data/coin-pro.json b/spine-sfml/cpp/data/coin-pro.json index 1f26f47b6..9d51d1f55 100644 --- a/spine-sfml/cpp/data/coin-pro.json +++ b/spine-sfml/cpp/data/coin-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "oo0dBSCqNHM", - "spine": "4.1.23-beta", + "hash": "y1EvE3V28p8", + "spine": "4.2.09-beta", "x": -152.5, "y": -151, "width": 305, diff --git a/spine-sfml/cpp/data/coin-pro.skel b/spine-sfml/cpp/data/coin-pro.skel index 1d51ea693..7cf937338 100644 Binary files a/spine-sfml/cpp/data/coin-pro.skel and b/spine-sfml/cpp/data/coin-pro.skel differ diff --git a/spine-sfml/cpp/data/dragon-ess.json b/spine-sfml/cpp/data/dragon-ess.json index 7c16610d7..3d45816d7 100644 --- a/spine-sfml/cpp/data/dragon-ess.json +++ b/spine-sfml/cpp/data/dragon-ess.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "aPoA1GjXkVI", - "spine": "4.1.23-beta", + "hash": "XM8KoDHOBqA", + "spine": "4.2.09-beta", "x": -366.31, "y": -327.81, "width": 660.39, diff --git a/spine-sfml/cpp/data/dragon-ess.skel b/spine-sfml/cpp/data/dragon-ess.skel index 27e251df1..3bfb31358 100644 Binary files a/spine-sfml/cpp/data/dragon-ess.skel and b/spine-sfml/cpp/data/dragon-ess.skel differ diff --git a/spine-sfml/cpp/data/dragon-pma.atlas b/spine-sfml/cpp/data/dragon-pma.atlas index 10acc3e16..bb91276ed 100644 --- a/spine-sfml/cpp/data/dragon-pma.atlas +++ b/spine-sfml/cpp/data/dragon-pma.atlas @@ -2,128 +2,116 @@ dragon-pma.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 + bounds: 942, 250, 84, 57 + rotate: 90 left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 - rotate: 90 + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + 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 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon-pma_2.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon-pma_3.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing07 - bounds: 2, 694, 264, 589 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 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: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 dragon-pma_4.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing02 - bounds: 2, 369, 365, 643 -right-wing03 - bounds: 369, 369, 365, 643 -right-wing04 - bounds: 2, 2, 365, 643 +left-wing04 + bounds: 2, 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 dragon-pma_5.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 - rotate: 90 - -dragon-pma_6.png - size: 1024, 1024 - filter: Linear, Linear - pma: true -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 diff --git a/spine-sfml/cpp/data/dragon-pma.png b/spine-sfml/cpp/data/dragon-pma.png index bc49bf978..f2bb4c6dd 100644 Binary files a/spine-sfml/cpp/data/dragon-pma.png and b/spine-sfml/cpp/data/dragon-pma.png differ diff --git a/spine-sfml/cpp/data/dragon-pma_2.png b/spine-sfml/cpp/data/dragon-pma_2.png index 084bc5e93..c1d14d282 100644 Binary files a/spine-sfml/cpp/data/dragon-pma_2.png and b/spine-sfml/cpp/data/dragon-pma_2.png differ diff --git a/spine-sfml/cpp/data/dragon-pma_3.png b/spine-sfml/cpp/data/dragon-pma_3.png index 17276d4e6..05f7d73fc 100644 Binary files a/spine-sfml/cpp/data/dragon-pma_3.png and b/spine-sfml/cpp/data/dragon-pma_3.png differ diff --git a/spine-sfml/cpp/data/dragon-pma_4.png b/spine-sfml/cpp/data/dragon-pma_4.png index f0b9d721b..7de20b2c0 100644 Binary files a/spine-sfml/cpp/data/dragon-pma_4.png and b/spine-sfml/cpp/data/dragon-pma_4.png differ diff --git a/spine-sfml/cpp/data/dragon-pma_5.png b/spine-sfml/cpp/data/dragon-pma_5.png index f98942cba..fa0f5075b 100644 Binary files a/spine-sfml/cpp/data/dragon-pma_5.png and b/spine-sfml/cpp/data/dragon-pma_5.png differ diff --git a/spine-sfml/cpp/data/dragon-pma_6.png b/spine-sfml/cpp/data/dragon-pma_6.png deleted file mode 100644 index ebbfe9285..000000000 Binary files a/spine-sfml/cpp/data/dragon-pma_6.png and /dev/null differ diff --git a/spine-sfml/cpp/data/goblins-pma.atlas b/spine-sfml/cpp/data/goblins-pma.atlas index 758c7fdf8..eed0924e9 100644 --- a/spine-sfml/cpp/data/goblins-pma.atlas +++ b/spine-sfml/cpp/data/goblins-pma.atlas @@ -3,95 +3,100 @@ goblins-pma.png filter: Linear, Linear pma: true dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 -goblin/right-shoulder - bounds: 663, 14, 39, 45 -goblin/right-upper-leg - bounds: 675, 63, 34, 63 -goblin/torso - bounds: 181, 30, 68, 96 -goblin/undie-straps - bounds: 38, 2, 55, 19 -goblin/undies - bounds: 974, 97, 36, 29 -goblingirl/eyes-closed - bounds: 397, 30, 37, 21 -goblingirl/head - bounds: 30, 23, 103, 81 + bounds: 482, 90, 36, 76 rotate: 90 +goblin/right-shoulder + bounds: 602, 3, 39, 45 + rotate: 90 +goblin/right-upper-leg + bounds: 641, 57, 34, 63 + rotate: 90 +goblin/torso + bounds: 212, 34, 68, 96 + rotate: 90 +goblin/undie-straps + bounds: 380, 5, 55, 19 +goblin/undies + bounds: 174, 5, 36, 29 +goblingirl/eyes-closed + bounds: 269, 11, 37, 21 +goblingirl/head + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 -goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 -goblingirl/right-shoulder - bounds: 704, 16, 39, 45 -goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 -goblingirl/torso - bounds: 251, 30, 68, 96 -goblingirl/undie-straps - bounds: 95, 2, 55, 19 -goblingirl/undies - bounds: 974, 66, 36, 29 -shield - bounds: 432, 54, 70, 72 -spear - bounds: 233, 6, 22, 368 + bounds: 771, 20, 36, 37 + rotate: 90 +goblingirl/right-lower-leg + bounds: 560, 90, 36, 76 + rotate: 90 +goblingirl/right-shoulder + bounds: 649, 10, 39, 45 +goblingirl/right-upper-leg + bounds: 706, 57, 34, 63 + rotate: 90 +goblingirl/torso + bounds: 310, 2, 68, 96 +goblingirl/undie-straps + bounds: 212, 13, 55, 19 +goblingirl/undies + bounds: 810, 27, 36, 29 +shield + bounds: 380, 26, 70, 72 +spear + bounds: 2, 104, 22, 368 rotate: 90 diff --git a/spine-sfml/cpp/data/goblins-pma.png b/spine-sfml/cpp/data/goblins-pma.png index f0a5b6ce3..a6688e2cc 100644 Binary files a/spine-sfml/cpp/data/goblins-pma.png and b/spine-sfml/cpp/data/goblins-pma.png differ diff --git a/spine-sfml/cpp/data/goblins-pro.json b/spine-sfml/cpp/data/goblins-pro.json index 6caf03bb0..62cd1cf7f 100644 --- a/spine-sfml/cpp/data/goblins-pro.json +++ b/spine-sfml/cpp/data/goblins-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.09-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-sfml/cpp/data/goblins-pro.skel b/spine-sfml/cpp/data/goblins-pro.skel index 6e667d282..8e1a73328 100644 Binary files a/spine-sfml/cpp/data/goblins-pro.skel and b/spine-sfml/cpp/data/goblins-pro.skel differ diff --git a/spine-sfml/cpp/data/mix-and-match-pma.atlas b/spine-sfml/cpp/data/mix-and-match-pma.atlas index c2eb27f20..b4cc35fa9 100644 --- a/spine-sfml/cpp/data/mix-and-match-pma.atlas +++ b/spine-sfml/cpp/data/mix-and-match-pma.atlas @@ -4,360 +4,356 @@ mix-and-match-pma.png pma: true scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 -girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 -girl-spring-dress/neck - bounds: 138, 70, 20, 32 -girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 + bounds: 248, 2, 36, 71 rotate: 90 +girl-spring-dress/leg-front + bounds: 831, 381, 30, 158 + rotate: 90 +girl-spring-dress/neck + bounds: 85, 70, 20, 32 +girl-spring-dress/shoulder-ribbon + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 -girl/hair-head-side-back - bounds: 561, 77, 30, 52 -girl/hair-head-side-front - bounds: 757, 419, 41, 42 + bounds: 415, 171, 70, 65 rotate: 90 +girl/hair-head-side-back + bounds: 991, 381, 30, 52 +girl/hair-head-side-front + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 + bounds: 831, 349, 30, 158 + rotate: 90 girl/pompom - bounds: 757, 462, 48, 43 - rotate: 90 + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 diff --git a/spine-sfml/cpp/data/mix-and-match-pma.png b/spine-sfml/cpp/data/mix-and-match-pma.png index 1c7c748eb..0f60ebf9a 100644 Binary files a/spine-sfml/cpp/data/mix-and-match-pma.png and b/spine-sfml/cpp/data/mix-and-match-pma.png differ diff --git a/spine-sfml/cpp/data/mix-and-match-pro.json b/spine-sfml/cpp/data/mix-and-match-pro.json index 9f27b879a..c9fbbd628 100644 --- a/spine-sfml/cpp/data/mix-and-match-pro.json +++ b/spine-sfml/cpp/data/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "gdqIJqjhGoQ", + "spine": "4.2.09-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1188,7 +1392,7 @@ }, { "name": "accessories/backpack", - "bones": [ "backpack-control", "backpack" ], + "bones": [ "backpack", "backpack-control" ], "attachments": { "backpack": { "backpack": { @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-front", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-flap", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-blue-down-back", "cape-blue-up-back", "cape-blue-up-front", "cape-blue-middle-back", "cape-back-rotator", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "cape-blue-down", "cape-blue-up", "cape-blue-control" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-back-outside", "cape-red-back-inside", "cape-red-front-inside", "cape-back-rotator", "cape-front-rotator", "cape-red-front-outside" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat-base", "pompom-control", "hat-control", "hat" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-leg-up-back", "dress-control-foot-back", "dress-control-middle" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "skirt-control-front", "skirt-control", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "hat-base", "backpack", "pompom-control", "hat-control", "backpack-control", "zip-boy", "hat" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-strap-front", "bag-back-front", "hat-base", "hair-strand-front-1", "bag-back-down", "zip-girl", "bag-strap-back", "hair-strand-back-1", "pompom-control", "hair-holder-front", "hair-strand-front-2", "hat-control", "bag", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "bag-flap", "hair-strand-back-2", "hat", "scarf-back", "hair-strand-back-3", "bag-control" ], + "transform": [ "hat-control", "leg-up-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-middle", "cape-blue-down-back", "cape-blue-up-back", "sleeve-control-back", "sleeve-control-front", "dress-control-foot-front", "cape-blue-up-front", "cape-blue-middle-back", "dress-control-leg-down-back", "dress-control-leg-down-front", "cape-back-rotator", "dress-control-leg-up-front", "cape-front-rotator", "cape-blue-down-front", "cape-blue-down-middle", "cape-blue-middle-front", "dress-control-leg-up-back", "cape-blue-down", "dress-control-foot-back", "cape-blue-control", "cape-blue-up" ], + "transform": [ "leg-down-front", "leg-up", "leg-down-down", "leg-up-back", "leg-down-back", "leg-down-back-up" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "skirt-control-back-down", "skirt-control-front-down", "skirt-control-middle", "cape-red-back-outside", "cape-red-front-inside", "cape-red-back-inside", "cape-back-rotator", "cape-front-rotator", "skirt-control-front", "skirt-control", "skirt-rotation-front", "cape-red-front-outside", "skirt-control-back", "skirt-control-up", "skirt-rotation-back" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-1", "hair-strand-back-1", "hair-holder-front", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-4", "hair-strand-back-2", "scarf-back", "hair-strand-back-3" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-sfml/cpp/data/mix-and-match-pro.skel b/spine-sfml/cpp/data/mix-and-match-pro.skel index 4cca62bce..90d19987e 100644 Binary files a/spine-sfml/cpp/data/mix-and-match-pro.skel and b/spine-sfml/cpp/data/mix-and-match-pro.skel differ diff --git a/spine-sfml/cpp/data/owl-pma.atlas b/spine-sfml/cpp/data/owl-pma.atlas index 686314430..35485dbe8 100644 --- a/spine-sfml/cpp/data/owl-pma.atlas +++ b/spine-sfml/cpp/data/owl-pma.atlas @@ -4,71 +4,64 @@ owl-pma.png pma: true scale: 0.5 L_eye-closed - bounds: 512, 5, 90, 86 - rotate: 90 + bounds: 508, 115, 90, 86 L_eye-iris - bounds: 600, 10, 90, 86 - rotate: 90 + bounds: 826, 183, 90, 86 L_eye-light - bounds: 688, 4, 21, 20 - rotate: 90 + bounds: 1001, 488, 21, 20 L_eye-pupil - bounds: 856, 13, 63, 60 - rotate: 90 + bounds: 752, 154, 63, 60 L_foot - bounds: 834, 78, 64, 48 - rotate: 90 + bounds: 817, 133, 64, 48 L_wing - bounds: 349, 4, 81, 110 - rotate: 90 + bounds: 342, 91, 81, 110 R_eye-closed - bounds: 637, 119, 90, 86 - rotate: 90 + bounds: 508, 27, 90, 86 R_eye-iris - bounds: 688, 27, 90, 86 + bounds: 600, 111, 90, 86 rotate: 90 R_eye-light - bounds: 710, 4, 21, 20 - rotate: 90 + bounds: 1001, 466, 21, 20 R_eye-pupil - bounds: 884, 80, 63, 60 + bounds: 691, 72, 63, 60 rotate: 90 R_foot - bounds: 845, 145, 64, 48 - rotate: 90 + bounds: 814, 83, 64, 48 R_wing - bounds: 421, 93, 81, 110 + bounds: 425, 91, 81, 110 beak - bounds: 776, 2, 39, 41 + bounds: 883, 140, 39, 41 beak-down - bounds: 817, 3, 37, 40 -body - bounds: 2, 7, 248, 196 -feather-1 - bounds: 918, 18, 59, 60 -feather-2 - bounds: 781, 144, 62, 65 -feather-3 - bounds: 776, 45, 56, 76 -head-base - bounds: 621, 211, 299, 237 + bounds: 753, 53, 37, 40 rotate: 90 +body + bounds: 2, 5, 248, 196 +feather-1 + bounds: 753, 92, 59, 60 +feather-2 + bounds: 688, 137, 62, 65 +feather-3 + bounds: 600, 2, 56, 76 + rotate: 90 +head-base + bounds: 621, 271, 299, 237 leaf-1 - bounds: 559, 102, 76, 101 + bounds: 922, 273, 76, 101 leaf-2 - bounds: 252, 4, 65, 95 + bounds: 621, 204, 65, 95 rotate: 90 leaf-3 - bounds: 252, 71, 132, 77 + bounds: 922, 376, 132, 77 rotate: 90 leaf-4 - bounds: 461, 2, 89, 49 - rotate: 90 + bounds: 600, 60, 89, 49 leaf-5 - bounds: 504, 97, 53, 106 + bounds: 718, 216, 53, 106 + rotate: 90 leaf-6 - bounds: 331, 87, 88, 116 + bounds: 252, 85, 88, 116 leaf-7 - bounds: 725, 123, 54, 86 + bounds: 252, 29, 54, 86 + rotate: 90 wood - bounds: 2, 205, 617, 305 + bounds: 2, 203, 617, 305 diff --git a/spine-sfml/cpp/data/owl-pma.png b/spine-sfml/cpp/data/owl-pma.png index 38b7f9f6b..2c9f188de 100644 Binary files a/spine-sfml/cpp/data/owl-pma.png and b/spine-sfml/cpp/data/owl-pma.png differ diff --git a/spine-sfml/cpp/data/owl-pro.json b/spine-sfml/cpp/data/owl-pro.json index 9c6fd8aa7..1e6733aba 100644 --- a/spine-sfml/cpp/data/owl-pro.json +++ b/spine-sfml/cpp/data/owl-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "HtoSOJus9ic", - "spine": "4.1.23-beta", + "hash": "WhZADUSP9U4", + "spine": "4.2.09-beta", "x": -644, "y": -274, "width": 1350.84, @@ -21,8 +21,16 @@ "color": "1a8600ff" }, { "name": "branch-2", "parent": "branch-1", "length": 391.45, "rotation": -30.2, "x": 487.04, "color": "1a8600ff" }, - { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff" }, - { "name": "body-top-control", "parent": "owl-base", "rotation": 92.53, "x": -3.85, "y": 227.57, "color": "1697ffff" }, + { "name": "owl-base", "parent": "branch-2", "x": 139.77, "y": 56.43, "color": "1697ffff", "icon": "diamond" }, + { + "name": "body-top-control", + "parent": "owl-base", + "rotation": 92.53, + "x": -3.85, + "y": 227.57, + "color": "1697ffff", + "icon": "triangle" + }, { "name": "branch-3", "parent": "branch-2", "length": 231.51, "rotation": 30.15, "x": 391.45, "color": "1a8600ff" }, { "name": "branch-4", "parent": "branch-3", "length": 158.83, "rotation": 38.9, "x": 231.51, "color": "1a8600ff" }, { "name": "branch-5", "parent": "branch-4", "length": 82.96, "rotation": -26.21, "x": 158.83, "color": "1a8600ff" }, @@ -35,9 +43,17 @@ "y": -20.15, "color": "1a8600ff" }, - { "name": "head", "parent": "body-top-control", "rotation": -90, "x": 51, "y": 0.33, "color": "1697ffff" }, - { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff" }, - { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff" }, + { + "name": "head", + "parent": "body-top-control", + "rotation": -90, + "x": 51, + "y": 0.33, + "color": "1697ffff", + "icon": "square" + }, + { "name": "control", "parent": "head", "y": 126.66, "color": "1697ffff", "icon": "arrows" }, + { "name": "control-back", "parent": "head", "x": 1.74, "y": 75.81, "color": "b500afff", "icon": "arrows" }, { "name": "leaf-1", "parent": "branch-1", @@ -143,7 +159,7 @@ "beak": { "type": "mesh", "uvs": [ 0, 0.48125, 0.23847, 0.67437, 0.38855, 1, 0.52195, 1, 0.67759, 1, 0.76097, 0.66393, 1, 0.44993, 1, 0.20983, 0.73317, 0, 0.34964, 0, 0, 0.20983, 0.44969, 0.27769, 0.50528, 0.66915 ], - "triangles": [ 5, 4, 12, 2, 12, 3, 4, 3, 12, 2, 1, 12, 12, 1, 11, 1, 0, 11, 12, 11, 5, 5, 11, 6, 0, 10, 11, 6, 11, 7, 11, 8, 7, 10, 9, 11, 11, 9, 8 ], + "triangles": [ 11, 9, 8, 10, 9, 11, 11, 8, 7, 6, 11, 7, 0, 10, 11, 5, 11, 6, 12, 11, 5, 1, 0, 11, 12, 1, 11, 2, 1, 12, 4, 3, 12, 2, 12, 3, 5, 4, 12 ], "vertices": [ 2, 10, -41, -66.77, 0.45, 9, -41, 59.89, 0.55, 2, 10, -22.64, -82.61, 0.65, 9, -22.64, 44.05, 0.35, 2, 10, -11.08, -109.31, 0.83, 9, -11.08, 17.35, 0.17, 1, 10, -0.81, -109.31, 1, 2, 10, 11.17, -109.31, 0.83, 9, 11.17, 17.35, 0.17, 2, 10, 17.59, -81.75, 0.78, 9, 17.59, 44.91, 0.22, 2, 10, 36, -64.2, 0.45, 9, 36, 62.46, 0.55, 2, 10, 36, -44.51, 0.45, 9, 36, 82.15, 0.55, 2, 10, 15.45, -27.31, 0.45, 9, 15.45, 99.35, 0.55, 2, 10, -14.08, -27.31, 0.45, 9, -14.08, 99.35, 0.55, 2, 10, -41, -44.51, 0.45, 9, -41, 82.15, 0.55, 1, 10, -6.37, -50.08, 1, 1, 10, -2.09, -82.18, 1 ], "hull": 11, "edges": [ 0, 2, 2, 4, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 0, 20, 4, 6, 6, 8 ], @@ -155,7 +171,7 @@ "beak-down": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 9, 33, 17.35, 0.43, 10, 33, -109.31, 0.57, 2, 9, -40, 17.35, 0.43, 10, -40, -109.31, 0.57, 2, 9, -40, 96.35, 0.43, 10, -40, -30.31, 0.57, 2, 9, 33, 96.35, 0.43, 10, 33, -30.31, 0.57 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -167,7 +183,7 @@ "body": { "type": "mesh", "uvs": [ 0.32567, 1, 0.69603, 1, 0.86396, 0.83947, 1, 0.63572, 1, 0.36212, 0.92608, 0.17292, 0.70524, 0, 0.26586, 0, 0.09793, 0.1671, 0, 0.3301, 0, 0.6561, 0.12784, 0.85111, 0.4982, 0.37085, 0.489, 0.78417, 0.22215, 0.75797, 0.22905, 0.38249, 0.4959, 0.12053, 0.75355, 0.76961, 0.74434, 0.37376, 0.72134, 0.14672, 0.24516, 0.14381 ], - "triangles": [ 18, 19, 5, 15, 8, 20, 18, 5, 4, 9, 8, 15, 15, 20, 12, 12, 16, 19, 20, 16, 12, 12, 19, 18, 10, 9, 15, 12, 14, 15, 17, 12, 18, 16, 7, 6, 20, 7, 16, 16, 6, 19, 5, 19, 6, 20, 8, 7, 18, 4, 3, 13, 14, 12, 17, 18, 3, 2, 17, 3, 11, 10, 14, 0, 14, 13, 11, 14, 0, 1, 13, 17, 1, 17, 2, 0, 13, 1, 17, 13, 12, 14, 10, 15 ], + "triangles": [ 18, 4, 3, 20, 8, 7, 5, 19, 6, 16, 6, 19, 20, 7, 16, 16, 7, 6, 17, 12, 18, 12, 14, 15, 10, 9, 15, 12, 19, 18, 20, 16, 12, 12, 16, 19, 15, 20, 12, 9, 8, 15, 18, 5, 4, 15, 8, 20, 18, 19, 5, 14, 10, 15, 17, 13, 12, 0, 13, 1, 1, 17, 2, 1, 13, 17, 11, 14, 0, 0, 14, 13, 11, 10, 14, 2, 17, 3, 17, 18, 3, 13, 14, 12 ], "vertices": [ 2, 3, -77, -83.78, 0.9818, 4, -307.82, 86.8, 0.0182, 2, 3, 106.53, -75.68, 0.9604, 4, -307.82, -96.91, 0.0396, 1, 3, 186.97, -9.15, 1, 2, 3, 250.85, 73.62, 0.58, 4, -165.02, -247.67, 0.42, 2, 3, 246.13, 180.77, 0.244, 4, -57.77, -247.67, 0.756, 1, 4, 16.4, -211.01, 1, 1, 4, 84.18, -101.47, 1, 1, 4, 84.18, 116.46, 1, 1, 4, 18.68, 199.75, 1, 2, 3, -249.94, 171.45, 0.36505, 4, -45.22, 248.33, 0.63495, 2, 3, -244.31, 43.78, 0.62057, 4, -173.01, 248.33, 0.37943, 1, 3, -177.6, -29.8, 1, 2, 3, -2.37, 166.38, 0.1, 4, -61.19, 1.22, 0.9, 2, 3, 0.21, 4.31, 0.75, 4, -223.21, 5.78, 0.25, 1, 3, -132.47, 8.74, 1, 2, 3, -135.54, 155.94, 0.14, 4, -65.76, 134.72, 0.86, 1, 4, 36.93, 2.36, 1, 1, 3, 131.04, 15.8, 1, 2, 3, 119.65, 170.62, 0.21, 4, -62.33, -120.87, 0.79, 1, 4, 26.67, -109.46, 1, 1, 4, 27.81, 126.73, 1 ], "hull": 12, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 0, 22, 38, 32, 32, 40 ], @@ -188,7 +204,7 @@ "head-base": { "type": "mesh", "uvs": [ 0, 0.62821, 0.10827, 0.80875, 0.2669, 0.96522, 0.4026, 1, 0.60901, 1, 0.77147, 0.96522, 0.92054, 0.84004, 1, 0.63303, 1, 0.52952, 1, 0.37787, 0.97662, 0.33564, 0.88805, 0.17566, 0.78293, 0.03123, 0.73324, 0, 0.67782, 0, 0.64724, 0.08901, 0.57461, 0.17085, 0.50772, 0.17807, 0.42936, 0.16604, 0.34717, 0.09141, 0.3166, 0, 0.2669, 0, 0.24779, 0.06975, 0.12547, 0.16122, 0.0108, 0.36824, 0.23632, 0.34657, 0.79058, 0.34657, 0.79822, 0.74135, 0.23632, 0.74616, 0.50389, 0.77986, 0.50581, 0.31528, 0.50198, 0.90263, 0.39113, 0.88097, 0.6008, 0.8906, 0.42745, 0.77264, 0.57461, 0.76542, 0.50389, 0.83282, 0.46185, 0.40435, 0.56123, 0.39953, 0.5039, 0.54396, 0.65106, 0.27917, 0.38922, 0.29362, 0.3338, 0.26232, 0.7084, 0.21418, 0.72942, 0.09623, 0.29175, 0.16363, 0.40642, 0.23825, 0.50963, 0.24066, 0.6071, 0.24547, 0.67591, 0.14678, 0.34717, 0.17085, 0.88996, 0.53433, 0.86703, 0.66673, 0.85747, 0.41397, 0.12738, 0.54637, 0.14841, 0.41638, 0.16943, 0.69321, 0.34909, 0.34176, 0.65679, 0.35139, 0.60328, 0.33213, 0.42171, 0.33213, 0.29939, 0.56803, 0.71795, 0.556, 0.44847, 0.68839, 0.57461, 0.69321, 0.82689, 0.27917, 0.91099, 0.39712, 0.93965, 0.53193, 0.91863, 0.71006, 0.19045, 0.26714, 0.09298, 0.39472, 0.07387, 0.56803, 0.1465, 0.73894, 0.20574, 0.83282, 0.28028, 0.86893, 0.79822, 0.85449, 0.69119, 0.87134, 0.85747, 0.78227 ], - "triangles": [ 3, 31, 4, 31, 33, 4, 4, 76, 5, 4, 33, 76, 3, 2, 32, 2, 74, 32, 3, 32, 31, 5, 75, 6, 5, 76, 75, 1, 73, 2, 2, 73, 74, 33, 35, 76, 32, 74, 34, 75, 76, 27, 73, 28, 74, 75, 77, 6, 76, 35, 27, 75, 27, 77, 77, 68, 6, 6, 68, 7, 1, 72, 73, 73, 72, 28, 1, 0, 72, 77, 52, 68, 77, 27, 52, 72, 56, 28, 28, 56, 61, 27, 62, 52, 72, 0, 56, 68, 52, 7, 67, 7, 52, 0, 71, 56, 71, 54, 56, 56, 54, 61, 61, 37, 39, 37, 61, 57, 37, 57, 60, 52, 51, 67, 52, 62, 51, 67, 8, 7, 0, 24, 71, 54, 55, 61, 55, 25, 61, 61, 25, 57, 71, 70, 54, 71, 24, 70, 62, 53, 51, 62, 26, 53, 62, 58, 26, 54, 70, 55, 38, 59, 58, 39, 37, 38, 67, 51, 66, 51, 53, 66, 67, 66, 8, 66, 9, 8, 25, 55, 69, 66, 53, 65, 37, 30, 38, 37, 60, 30, 38, 30, 59, 53, 26, 65, 66, 10, 9, 66, 65, 10, 55, 70, 69, 70, 24, 69, 24, 23, 69, 59, 40, 58, 58, 40, 26, 40, 43, 26, 26, 43, 65, 25, 42, 57, 25, 69, 42, 57, 41, 60, 57, 42, 41, 65, 11, 10, 59, 30, 48, 59, 48, 40, 48, 30, 47, 30, 60, 46, 60, 41, 46, 30, 46, 47, 47, 18, 17, 18, 47, 46, 41, 42, 46, 65, 43, 11, 40, 48, 43, 69, 45, 42, 69, 23, 45, 42, 50, 46, 42, 45, 50, 47, 16, 48, 48, 49, 43, 48, 16, 49, 47, 17, 16, 46, 50, 18, 43, 44, 11, 43, 49, 44, 44, 12, 11, 16, 15, 49, 18, 50, 19, 50, 45, 19, 23, 22, 45, 19, 45, 20, 21, 45, 22, 20, 45, 21, 49, 15, 44, 15, 14, 44, 44, 13, 12, 44, 14, 13, 31, 36, 33, 31, 32, 36, 36, 35, 33, 32, 34, 36, 74, 28, 34, 34, 29, 36, 36, 29, 35, 64, 35, 29, 29, 34, 63, 34, 28, 63, 29, 63, 64, 35, 64, 27, 28, 61, 63, 64, 62, 27, 63, 39, 64, 64, 39, 62, 63, 61, 39, 39, 38, 62, 38, 58, 62 ], + "triangles": [ 44, 14, 13, 44, 13, 12, 15, 14, 44, 49, 15, 44, 20, 45, 21, 21, 45, 22, 19, 45, 20, 23, 22, 45, 50, 45, 19, 18, 50, 19, 16, 15, 49, 44, 12, 11, 43, 49, 44, 43, 44, 11, 46, 50, 18, 47, 17, 16, 48, 16, 49, 48, 49, 43, 47, 16, 48, 42, 45, 50, 42, 50, 46, 69, 23, 45, 69, 45, 42, 40, 48, 43, 65, 43, 11, 41, 42, 46, 18, 47, 46, 47, 18, 17, 30, 46, 47, 60, 41, 46, 30, 60, 46, 48, 30, 47, 59, 48, 40, 59, 30, 48, 65, 11, 10, 57, 42, 41, 57, 41, 60, 25, 69, 42, 25, 42, 57, 26, 43, 65, 40, 43, 26, 58, 40, 26, 59, 40, 58, 24, 23, 69, 70, 24, 69, 55, 70, 69, 66, 65, 10, 66, 10, 9, 53, 26, 65, 38, 30, 59, 37, 60, 30, 37, 30, 38, 66, 53, 65, 25, 55, 69, 66, 9, 8, 67, 66, 8, 51, 53, 66, 67, 51, 66, 39, 37, 38, 38, 59, 58, 54, 70, 55, 62, 58, 26, 62, 26, 53, 62, 53, 51, 71, 24, 70, 71, 70, 54, 61, 25, 57, 55, 25, 61, 54, 55, 61, 0, 24, 71, 67, 8, 7, 52, 62, 51, 52, 51, 67, 37, 57, 60, 37, 61, 57, 61, 37, 39, 56, 54, 61, 71, 54, 56, 0, 71, 56, 67, 7, 52, 68, 52, 7, 72, 0, 56, 27, 62, 52, 28, 56, 61, 72, 56, 28, 77, 27, 52, 77, 52, 68, 1, 0, 72, 73, 72, 28, 1, 72, 73, 6, 68, 7, 77, 68, 6, 75, 27, 77, 76, 35, 27, 75, 77, 6, 73, 28, 74, 75, 76, 27, 32, 74, 34, 33, 35, 76, 2, 73, 74, 1, 73, 2, 5, 76, 75, 5, 75, 6, 3, 32, 31, 2, 74, 32, 3, 2, 32, 4, 33, 76, 4, 76, 5, 31, 33, 4, 3, 31, 4, 38, 58, 62, 39, 38, 62, 63, 61, 39, 64, 39, 62, 63, 39, 64, 64, 62, 27, 28, 61, 63, 35, 64, 27, 29, 63, 64, 34, 28, 63, 29, 34, 63, 64, 35, 29, 36, 29, 35, 34, 29, 36, 74, 28, 34, 32, 34, 36, 36, 35, 33, 31, 32, 36, 31, 36, 33 ], "vertices": [ 3, 10, -304, -69.08, 0.01459, 11, -304, -69.08, 0.26323, 9, -302.26, 46.41, 0.72217, 3, 10, -239.36, -154.66, 0.00559, 11, -239.36, -154.66, 0.05203, 9, -237.62, -39.17, 0.94238, 3, 10, -144.66, -228.82, 0.145, 11, -144.66, -228.82, 0.04545, 9, -142.92, -113.33, 0.80955, 3, 10, -63.65, -245.31, 0.2095, 11, -63.65, -245.31, 0.00316, 9, -61.91, -129.82, 0.78734, 2, 10, 59.58, -245.31, 0.17617, 9, 61.32, -129.82, 0.82383, 3, 10, 156.57, -228.82, 0.08728, 11, 156.57, -228.82, 0.05645, 9, 158.3, -113.33, 0.85627, 3, 10, 245.56, -169.49, 0.06344, 11, 245.56, -169.49, 0.11037, 9, 247.3, -54, 0.82619, 3, 10, 293, -71.36, 0.00633, 11, 293, -71.36, 0.10522, 9, 294.74, 44.12, 0.88845, 3, 10, 293, -22.3, 0.01595, 11, 293, -22.3, 0.14723, 9, 294.74, 93.19, 0.83682, 3, 10, 293, 49.58, 0.00982, 11, 293, 49.58, 0.29562, 9, 294.74, 165.07, 0.69456, 3, 10, 279.04, 69.6, 0.01809, 11, 279.04, 69.6, 0.25265, 9, 280.78, 185.09, 0.72927, 3, 10, 226.17, 145.43, 0.00461, 11, 226.17, 145.43, 0.21686, 9, 227.9, 260.91, 0.77853, 2, 11, 163.41, 213.89, 0.19851, 9, 165.15, 329.37, 0.80149, 2, 11, 133.75, 228.69, 0.27166, 9, 135.48, 344.18, 0.72834, 2, 11, 100.66, 228.69, 0.27166, 9, 102.39, 344.18, 0.72834, 2, 11, 82.4, 186.5, 0.27166, 9, 84.14, 301.99, 0.72834, 2, 11, 39.04, 147.71, 0.09155, 9, 40.78, 263.2, 0.90845, 2, 11, -0.89, 144.29, 0.05807, 9, 0.85, 259.77, 0.94193, 2, 11, -47.67, 149.99, 0.07863, 9, -45.94, 265.48, 0.92137, 2, 11, -96.74, 185.36, 0.26398, 9, -95, 300.85, 0.73602, 2, 11, -114.99, 228.69, 0.27166, 9, -113.25, 344.18, 0.72834, 2, 11, -144.66, 228.69, 0.27166, 9, -142.92, 344.18, 0.72834, 2, 11, -156.07, 195.63, 0.27166, 9, -154.33, 311.12, 0.72834, 2, 11, -229.09, 152.27, 0.15795, 9, -227.35, 267.76, 0.84205, 2, 11, -297.55, 54.15, 0.23165, 9, -295.81, 169.63, 0.76835, 2, 10, -162.91, 64.42, 0.23917, 9, -161.18, 179.9, 0.76083, 2, 10, 167.98, 64.42, 0.36537, 9, 169.71, 179.9, 0.63463, 2, 10, 172.54, -122.71, 0.43659, 9, 174.28, -7.22, 0.56341, 2, 10, -162.91, -124.99, 0.47535, 9, -161.18, -9.5, 0.52465, 2, 10, -3.17, -140.96, 0.72626, 9, -1.44, -25.48, 0.27374, 2, 10, -2.03, 79.25, 0.25249, 9, -0.3, 194.74, 0.74751, 2, 10, -4.32, -199.16, 0.4798, 9, -2.58, -83.67, 0.5202, 2, 10, -70.49, -188.89, 0.42536, 9, -68.76, -73.4, 0.57464, 2, 10, 54.68, -193.45, 0.42901, 9, 56.42, -77.96, 0.57099, 2, 10, -48.81, -137.54, 0.69524, 9, -47.08, -22.05, 0.30476, 2, 10, 39.04, -134.12, 0.68899, 9, 40.78, -18.63, 0.31101, 2, 10, -3.17, -166.07, 0.60466, 9, -1.44, -50.58, 0.39534, 2, 10, -28.28, 37.03, 0.40749, 9, -26.54, 152.52, 0.59251, 2, 10, 31.06, 39.31, 0.48302, 9, 32.79, 154.8, 0.51698, 2, 10, -3.17, -29.15, 0.53404, 9, -1.44, 86.34, 0.46596, 2, 10, 84.68, 96.36, 0.19082, 9, 86.42, 211.85, 0.80918, 2, 10, -71.63, 89.52, 0.17688, 9, -69.9, 205.01, 0.82312, 2, 10, -104.72, 104.35, 0.08016, 9, -102.99, 219.84, 0.91984, 3, 10, 118.91, 127.17, 0.03256, 11, 118.91, 127.17, 0.0011, 9, 120.65, 242.66, 0.96634, 2, 11, 131.46, 183.08, 0.23984, 9, 133.2, 298.57, 0.76016, 2, 11, -129.83, 151.13, 0.08046, 9, -128.09, 266.62, 0.91954, 2, 10, -61.37, 115.76, 0.04075, 9, -59.63, 231.25, 0.95925, 2, 10, 0.25, 114.62, 0.06407, 9, 1.99, 230.11, 0.93593, 2, 10, 58.44, 112.34, 0.07435, 9, 60.18, 227.83, 0.92565, 2, 11, 99.52, 159.12, 0.15345, 9, 101.25, 274.61, 0.84655, 2, 11, -96.74, 147.71, 0.06159, 9, -95, 263.2, 0.93841, 2, 10, 227.31, -24.58, 0.25194, 9, 229.05, 90.91, 0.74806, 2, 10, 213.62, -87.34, 0.30876, 9, 215.35, 28.15, 0.69124, 2, 10, 207.91, 32.47, 0.31184, 9, 209.65, 147.96, 0.68816, 3, 10, -227.95, -30.29, 0.26918, 11, -227.95, -30.29, 0.05011, 9, -226.21, 85.2, 0.6807, 3, 10, -215.4, 31.33, 0.24851, 11, -215.4, 31.33, 0.02152, 9, -213.66, 146.81, 0.72997, 2, 10, -202.85, -99.89, 0.2927, 9, -201.11, 15.6, 0.7073, 2, 10, -95.6, 66.7, 0.27831, 9, -93.86, 182.19, 0.72169, 2, 10, 88.11, 62.13, 0.4333, 9, 89.84, 177.62, 0.5667, 2, 10, 56.16, 71.26, 0.36297, 9, 57.9, 186.75, 0.63703, 2, 10, -52.24, 71.26, 0.28083, 9, -50.5, 186.75, 0.71917, 2, 10, -125.26, -40.56, 0.46719, 9, -123.52, 74.93, 0.53281, 2, 10, 124.62, -34.85, 0.68177, 9, 126.36, 80.64, 0.31823, 2, 10, -36.26, -97.61, 0.80548, 9, -34.53, 17.88, 0.19452, 2, 10, 39.04, -99.89, 0.77666, 9, 40.78, 15.6, 0.22334, 3, 10, 189.65, 96.36, 0.11792, 11, 189.65, 96.36, 3.0E-5, 9, 191.39, 211.85, 0.88205, 3, 10, 239.86, 40.45, 0.1113, 11, 239.86, 40.45, 0.02801, 9, 241.6, 155.94, 0.86068, 3, 10, 256.97, -23.44, 0.07223, 11, 256.97, -23.44, 0.0013, 9, 258.71, 92.05, 0.92647, 2, 10, 244.42, -107.88, 0.12196, 9, 246.16, 7.61, 0.87804, 2, 10, -190.3, 102.07, 0.02441, 9, -188.56, 217.56, 0.97559, 3, 10, -248.49, 41.6, 0.09967, 11, -248.49, 41.6, 0.07803, 9, -246.75, 157.08, 0.8223, 3, 10, -259.9, -40.56, 0.14162, 11, -259.9, -40.56, 0.05098, 9, -258.16, 74.93, 0.8074, 2, 10, -216.54, -121.57, 0.14701, 9, -214.8, -6.08, 0.85299, 2, 10, -181.17, -166.07, 0.19633, 9, -179.43, -50.58, 0.80367, 2, 10, -136.67, -183.18, 0.35738, 9, -134.93, -67.69, 0.64262, 3, 10, 172.54, -176.34, 0.23906, 11, 172.54, -176.34, 0.00239, 9, 174.28, -60.85, 0.75855, 2, 10, 108.64, -184.32, 0.37393, 9, 110.38, -68.83, 0.62607, 2, 10, 207.91, -142.11, 0.22094, 9, 209.65, -26.62, 0.77906 ], "hull": 25, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 0, 48, 90, 42, 14, 16, 16, 18, 18, 20, 20, 22 ], @@ -221,7 +237,7 @@ "L_eye-closed": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 9, 212, 3.35, 0.5, 10, 212, -123.31, 0.5, 2, 9, 33, 3.35, 0.5, 10, 33, -123.31, 0.5, 2, 9, 33, 174.35, 0.5, 10, 33, 47.69, 0.5, 2, 9, 212, 174.35, 0.5, 10, 212, 47.69, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -233,7 +249,7 @@ "L_eye-iris": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 9, 212, 3.35, 0.5, 10, 212, -123.31, 0.5, 2, 9, 33, 3.35, 0.5, 10, 33, -123.31, 0.5, 2, 9, 33, 174.35, 0.5, 10, 33, 47.69, 0.5, 2, 9, 212, 174.35, 0.5, 10, 212, 47.69, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -245,7 +261,7 @@ "L_eye-light": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 10, 146, -27.31, 0.75, 9, 146, 99.35, 0.25, 2, 10, 104, -27.31, 0.75, 9, 104, 99.35, 0.25, 2, 10, 104, 11.69, 0.75, 9, 104, 138.35, 0.25, 2, 10, 146, 11.69, 0.75, 9, 146, 138.35, 0.25 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -284,7 +300,7 @@ "R_eye-closed": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 10, -34, -123.31, 0.5, 9, -34, 3.35, 0.5, 2, 10, -213, -123.31, 0.5, 9, -213, 3.35, 0.5, 2, 10, -213, 47.69, 0.5, 9, -213, 174.35, 0.5, 2, 10, -34, 47.69, 0.5, 9, -34, 174.35, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -296,7 +312,7 @@ "R_eye-iris": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 3, 0, 1, 2, 3 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], "vertices": [ 2, 10, -34, -123.31, 0.5, 9, -34, 3.35, 0.5, 2, 10, -213, -123.31, 0.5, 9, -213, 3.35, 0.5, 2, 10, -213, 47.69, 0.5, 9, -213, 174.35, 0.5, 2, 10, -34, 47.69, 0.5, 9, -34, 174.35, 0.5 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -308,7 +324,7 @@ "R_eye-light": { "type": "mesh", "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], - "triangles": [ 1, 2, 3, 1, 3, 0 ], + "triangles": [ 1, 3, 0, 1, 2, 3 ], "vertices": [ 2, 10, -105, -27.31, 0.75, 9, -105, 99.35, 0.25, 2, 10, -147, -27.31, 0.75, 9, -147, 99.35, 0.25, 2, 10, -147, 11.69, 0.75, 9, -147, 138.35, 0.25, 2, 10, -105, 11.69, 0.75, 9, -105, 138.35, 0.25 ], "hull": 4, "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], @@ -347,7 +363,7 @@ "wood": { "type": "mesh", "uvs": [ 0.11021, 1, 0.15566, 0.95336, 0.21123, 0.8928, 0.22028, 0.83577, 0.28362, 0.72988, 0.35481, 0.68032, 0.39623, 0.67196, 0.46043, 0.59021, 0.69783, 0.62777, 0.7172, 0.63585, 0.73175, 0.62498, 0.7584, 0.58795, 0.83734, 0.52487, 0.88376, 0.45904, 0.89542, 0.44525, 0.902, 0.42073, 0.93407, 0.35365, 0.93428, 0.24657, 0.95942, 0.18869, 1, 0.10133, 1, 0.04501, 0.97874, 0.0803, 0.96743, 0.09908, 0.91739, 0.18018, 0.90399, 0.28117, 0.87848, 0.08782, 0.85736, 0.10809, 0.89108, 0.29728, 0.89525, 0.3207, 0.88552, 0.37054, 0.87781, 0.40495, 0.86852, 0.42127, 0.84031, 0.43039, 0.72738, 0.5583, 0.71396, 0.5716, 0.69722, 0.56699, 0.44709, 0.50234, 0.35592, 0.55641, 0.26039, 0.63925, 0.18238, 0.78349, 0.08762, 0.77081, 0, 0.88984, 0, 1, 0.40039, 0.56993, 0.71762, 0.60099, 0.88511, 0.42365, 0.89924, 0.29751, 0.93733, 0.18329, 0.98584, 0.10003 ], - "triangles": [ 24, 26, 25, 27, 26, 24, 19, 48, 21, 22, 21, 48, 19, 21, 20, 47, 23, 22, 18, 47, 22, 48, 18, 22, 19, 18, 48, 46, 27, 24, 28, 27, 46, 17, 23, 47, 17, 47, 18, 24, 23, 17, 16, 24, 17, 46, 24, 16, 28, 46, 16, 29, 28, 16, 15, 29, 16, 45, 30, 29, 29, 15, 45, 14, 45, 15, 45, 31, 30, 13, 31, 45, 13, 45, 14, 32, 31, 13, 12, 32, 13, 12, 33, 32, 11, 33, 12, 33, 11, 44, 33, 44, 34, 10, 44, 11, 10, 9, 44, 7, 36, 35, 43, 36, 7, 44, 8, 35, 44, 35, 34, 9, 8, 44, 7, 35, 8, 6, 43, 7, 43, 37, 36, 43, 5, 37, 5, 38, 37, 43, 6, 5, 4, 38, 5, 4, 39, 38, 3, 39, 4, 2, 39, 3, 2, 1, 40, 2, 40, 39, 41, 40, 1, 0, 42, 41, 1, 0, 41 ], + "triangles": [ 27, 26, 24, 24, 26, 25, 19, 18, 48, 48, 18, 22, 18, 47, 22, 47, 23, 22, 19, 21, 20, 22, 21, 48, 19, 48, 21, 14, 45, 15, 29, 15, 45, 45, 30, 29, 15, 29, 16, 29, 28, 16, 28, 46, 16, 46, 24, 16, 16, 24, 17, 24, 23, 17, 17, 47, 18, 17, 23, 47, 28, 27, 46, 46, 27, 24, 10, 9, 44, 10, 44, 11, 33, 44, 34, 33, 11, 44, 11, 33, 12, 12, 33, 32, 12, 32, 13, 32, 31, 13, 13, 45, 14, 13, 31, 45, 45, 31, 30, 6, 43, 7, 7, 35, 8, 9, 8, 44, 44, 35, 34, 44, 8, 35, 43, 36, 7, 7, 36, 35, 1, 0, 41, 0, 42, 41, 41, 40, 1, 2, 40, 39, 2, 1, 40, 2, 39, 3, 3, 39, 4, 4, 39, 38, 4, 38, 5, 43, 6, 5, 5, 38, 37, 43, 5, 37, 43, 37, 36 ], "vertices": [ 1, 1, 46.94, -64.01, 1, 1, 1, 109.8, -64.9, 1, 1, 1, 187.66, -64.09, 1, 1, 1, 213.68, -38.52, 1, 1, 1, 312.85, -17.71, 1, 1, 1, 404.67, -31.78, 1, 2, 1, 452.3, -51.01, 0.87274, 2, -4.36, -61.57, 0.12726, 2, 1, 545.58, -43.72, 1.0E-5, 2, 72.59, -8.34, 0.99999, 1, 2, 366.26, -18.28, 1, 2, 2, 390.36, -22.14, 0.6578, 5, -12.06, -18.6, 0.3422, 2, 2, 408.01, -14.74, 0.23428, 5, 6.92, -21.06, 0.76572, 1, 5, 46.51, -16.33, 1, 1, 5, 150.63, -27.46, 1, 2, 5, 219.97, -18.5, 0.91238, 6, -20.61, -7.15, 0.08762, 2, 5, 236.6, -17.73, 0.53313, 6, -7.17, -17, 0.46687, 3, 5, 250.73, -8.27, 0.14373, 6, 9.76, -18.5, 0.85627, 7, -125.56, -82.45, 0, 3, 1, 1130.1, -187.59, 0, 6, 62.99, -38.53, 0.99998, 7, -68.96, -76.91, 2.0E-5, 3, 1, 1160.61, -129.96, 0, 6, 122.91, -12.79, 0.99739, 7, -26.57, -27.34, 0.00261, 3, 1, 1204.46, -113.15, 0, 6, 167.6, -27.21, 0.08864, 7, 19.88, -20.53, 0.91136, 1, 7, 92.49, -12.37, 1, 2, 1, 1267.69, -76.61, 0, 7, 89.58, 1.28, 1, 2, 6, 237.64, -22.79, 2.0E-5, 7, 80.77, 14.37, 0.99998, 2, 6, 221.59, -14.54, 1.8E-4, 7, 62.73, 14.68, 0.99982, 2, 6, 151.7, 22.42, 0.82914, 7, -16.3, 16.96, 0.17086, 1, 6, 88.7, 13.1, 1, 1, 8, 126.5, -18.92, 1, 1, 8, 123.36, 9.75, 1, 2, 1, 1099.06, -132.55, 0, 8, 0.87, 8.12, 1, 1, 6, 62.32, 13.4, 1, 3, 1, 1072.27, -168.88, 0, 6, 29.7, 12.32, 0.99766, 8, -39.05, 29.19, 0.00234, 3, 1, 1054.11, -183.01, 0, 5, 228.74, 14.09, 0.34735, 6, 6.69, 12.71, 0.65265, 3, 1, 1039.34, -186.49, 0, 5, 213.97, 10.6, 0.97536, 6, -7, 19.26, 0.02464, 2, 1, 1005.93, -175.25, 0, 5, 180.55, 21.82, 1, 3, 1, 846.33, -179.5, 0, 2, 400.82, 25.59, 0.04218, 5, 20.96, 17.42, 0.95782, 3, 1, 827.91, -178.99, 0, 2, 384.64, 16.77, 0.61297, 5, 2.54, 17.93, 0.38703, 3, 1, 810.92, -166.91, 0, 2, 363.88, 18.67, 0.98073, 5, -14.46, 29.99, 0.01927, 1, 2, 53.78, 44.39, 1, 2, 1, 440.93, 34.41, 1, 7, -692.85, 290.52, 0, 1, 1, 313.11, 44.48, 1, 1, 1, 187.05, 11.39, 1, 1, 1, 87.08, 72.55, 1, 1, 1, -42.34, 58.57, 1, 1, 1, -73.5, -0.85, 1, 2, 1, 485.71, 1.63, 0.55579, 2, -1.97, 0.73, 0.44421, 2, 2, 389.94, -0.91, 0.56026, 5, -1.76, -0.03, 0.43974, 2, 5, 231.44, -0.18, 0.48669, 6, -0.17, -0.09, 0.51331, 1, 6, 77.24, 14.52, 1, 3, 1, 1181.84, -97.57, 0, 6, 159.76, -0.89, 0.45723, 7, 1.23, -0.39, 0.54277, 1, 7, 79.68, -0.46, 1 ], "hull": 43, "edges": [ 0, 2, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 22, 24, 38, 40, 44, 46, 46, 48, 48, 50, 50, 52, 72, 74, 74, 76, 76, 78, 78, 80, 80, 82, 82, 84, 0, 84, 68, 70, 70, 72, 66, 68, 88, 66, 18, 20, 20, 22, 88, 20, 16, 18, 88, 16, 88, 18, 24, 26, 26, 28, 90, 26, 28, 30, 30, 32, 90, 30, 60, 62, 90, 62, 56, 58, 58, 60, 90, 58, 94, 46, 94, 34, 36, 94, 36, 38, 32, 34, 34, 36, 52, 54, 54, 56, 62, 64, 64, 66, 14, 16, 2, 4, 40, 42, 42, 44, 96, 42 ], diff --git a/spine-sfml/cpp/data/owl-pro.skel b/spine-sfml/cpp/data/owl-pro.skel index cce0669df..67a85a25a 100644 Binary files a/spine-sfml/cpp/data/owl-pro.skel and b/spine-sfml/cpp/data/owl-pro.skel differ diff --git a/spine-sfml/cpp/data/raptor-pma.atlas b/spine-sfml/cpp/data/raptor-pma.atlas index 5b4981c80..456015eaf 100644 --- a/spine-sfml/cpp/data/raptor-pma.atlas +++ b/spine-sfml/cpp/data/raptor-pma.atlas @@ -4,98 +4,91 @@ raptor-pma.png pma: true scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 -mouth-smile - bounds: 975, 140, 47, 30 -neck - bounds: 366, 282, 18, 21 -raptor-back-arm - bounds: 636, 97, 82, 86 + bounds: 920, 145, 47, 30 rotate: 90 +mouth-smile + bounds: 992, 257, 47, 30 + rotate: 90 +neck + bounds: 359, 114, 18, 21 +raptor-back-arm + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 + bounds: 653, 86, 54, 74 + rotate: 90 raptor-saddle-strap-front - bounds: 764, 182, 57, 95 - rotate: 90 + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-sfml/cpp/data/raptor-pma.png b/spine-sfml/cpp/data/raptor-pma.png index 6d0349772..2f3c0edd2 100644 Binary files a/spine-sfml/cpp/data/raptor-pma.png and b/spine-sfml/cpp/data/raptor-pma.png differ diff --git a/spine-sfml/cpp/data/raptor-pro.json b/spine-sfml/cpp/data/raptor-pro.json index bd04cccd4..afd89f343 100644 --- a/spine-sfml/cpp/data/raptor-pro.json +++ b/spine-sfml/cpp/data/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.09-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-sfml/cpp/data/raptor-pro.skel b/spine-sfml/cpp/data/raptor-pro.skel index 32ab530d7..26900a1b8 100644 Binary files a/spine-sfml/cpp/data/raptor-pro.skel and b/spine-sfml/cpp/data/raptor-pro.skel differ diff --git a/spine-sfml/cpp/data/spineboy-pma.atlas b/spine-sfml/cpp/data/spineboy-pma.atlas index 9c8bd8e81..ad3d77b11 100644 --- a/spine-sfml/cpp/data/spineboy-pma.atlas +++ b/spine-sfml/cpp/data/spineboy-pma.atlas @@ -4,99 +4,92 @@ spineboy-pma.png pma: true scale: 0.5 crosshair - bounds: 813, 160, 45, 45 + bounds: 352, 7, 45, 45 eye-indifferent - bounds: 569, 2, 47, 45 + bounds: 862, 105, 47, 45 eye-surprised - bounds: 643, 7, 47, 45 - rotate: 90 + bounds: 505, 79, 47, 45 front-bracer - bounds: 811, 51, 29, 40 + bounds: 826, 66, 29, 40 front-fist-closed - bounds: 807, 93, 38, 41 + bounds: 786, 65, 38, 41 front-fist-open - bounds: 815, 210, 43, 44 + bounds: 710, 51, 43, 44 + rotate: 90 front-foot - bounds: 706, 64, 63, 35 - rotate: 90 + bounds: 210, 6, 63, 35 front-shin - bounds: 80, 11, 41, 92 + bounds: 665, 128, 41, 92 + rotate: 90 front-thigh - bounds: 754, 12, 23, 56 + bounds: 2, 2, 23, 56 + rotate: 90 front-upper-arm - bounds: 618, 5, 23, 49 + bounds: 250, 205, 23, 49 goggles - bounds: 214, 20, 131, 83 + bounds: 665, 171, 131, 83 gun - bounds: 347, 14, 105, 102 - rotate: 90 + bounds: 798, 152, 105, 102 head - bounds: 80, 105, 136, 149 + bounds: 2, 27, 136, 149 hoverboard-board - bounds: 2, 8, 246, 76 - rotate: 90 + bounds: 2, 178, 246, 76 hoverboard-thruster - bounds: 478, 2, 30, 32 + bounds: 722, 96, 30, 32 + rotate: 90 hoverglow-small - bounds: 218, 117, 137, 38 - rotate: 90 + bounds: 275, 81, 137, 38 mouth-grind - bounds: 775, 80, 47, 30 - rotate: 90 + bounds: 614, 97, 47, 30 mouth-oooo - bounds: 779, 31, 47, 30 - rotate: 90 + bounds: 612, 65, 47, 30 mouth-smile - bounds: 783, 207, 47, 30 - rotate: 90 + bounds: 661, 64, 47, 30 muzzle-glow - bounds: 779, 4, 25, 25 + bounds: 382, 54, 25, 25 muzzle-ring - bounds: 451, 14, 25, 105 + bounds: 275, 54, 25, 105 + rotate: 90 muzzle01 - bounds: 664, 60, 67, 40 + bounds: 911, 95, 67, 40 rotate: 90 muzzle02 - bounds: 580, 56, 68, 42 - rotate: 90 + bounds: 792, 108, 68, 42 muzzle03 - bounds: 478, 36, 83, 53 + bounds: 956, 171, 83, 53 rotate: 90 muzzle04 - bounds: 533, 49, 75, 45 - rotate: 90 + bounds: 275, 7, 75, 45 muzzle05 - bounds: 624, 56, 68, 38 - rotate: 90 + bounds: 140, 3, 68, 38 neck - bounds: 806, 8, 18, 21 + bounds: 250, 182, 18, 21 portal-bg - bounds: 258, 121, 133, 133 + bounds: 140, 43, 133, 133 portal-flare1 - bounds: 690, 2, 56, 30 - rotate: 90 + bounds: 554, 65, 56, 30 portal-flare2 - bounds: 510, 3, 57, 31 + bounds: 759, 112, 57, 31 + rotate: 90 portal-flare3 - bounds: 722, 4, 58, 30 - rotate: 90 + bounds: 554, 97, 58, 30 portal-shade - bounds: 393, 121, 133, 133 + bounds: 275, 121, 133, 133 portal-streaks1 - bounds: 528, 126, 126, 128 + bounds: 410, 126, 126, 128 portal-streaks2 - bounds: 656, 129, 125, 125 + bounds: 538, 129, 125, 125 rear-bracer - bounds: 826, 13, 28, 36 + bounds: 857, 67, 28, 36 rear-foot - bounds: 743, 70, 57, 30 - rotate: 90 + bounds: 663, 96, 57, 30 rear-shin - bounds: 174, 14, 38, 89 + bounds: 414, 86, 38, 89 + rotate: 90 rear-thigh - bounds: 783, 158, 28, 47 + bounds: 756, 63, 28, 47 rear-upper-arm - bounds: 783, 136, 20, 44 + bounds: 60, 5, 20, 44 rotate: 90 torso - bounds: 123, 13, 49, 90 + bounds: 905, 164, 49, 90 diff --git a/spine-sfml/cpp/data/spineboy-pma.png b/spine-sfml/cpp/data/spineboy-pma.png index b78b76f45..711fd836e 100644 Binary files a/spine-sfml/cpp/data/spineboy-pma.png and b/spine-sfml/cpp/data/spineboy-pma.png differ diff --git a/spine-sfml/cpp/data/spineboy-pro.json b/spine-sfml/cpp/data/spineboy-pro.json index b4dd8b40f..b82754e49 100644 --- a/spine-sfml/cpp/data/spineboy-pro.json +++ b/spine-sfml/cpp/data/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "itfFESDjM1c", - "spine": "4.1.23-beta", + "hash": "NnC1Mwi9L3A", + "spine": "4.2.09-beta", "x": -188.63, "y": -7.94, "width": 418.45, @@ -12,7 +12,7 @@ "bones": [ { "name": "root", "rotation": 0.05 }, { "name": "hip", "parent": "root", "y": 247.27 }, - { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff" }, + { "name": "crosshair", "parent": "root", "x": 302.83, "y": 569.45, "color": "ff3f00ff", "icon": "circle" }, { "name": "aim-constraint-target", "parent": "hip", @@ -22,8 +22,8 @@ "y": 5.62, "color": "abe323ff" }, - { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff" }, - { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff" }, + { "name": "rear-foot-target", "parent": "root", "x": 61.91, "y": 0.42, "color": "ff3f00ff", "icon": "ik" }, + { "name": "rear-leg-target", "parent": "rear-foot-target", "x": -33.91, "y": 37.34, "color": "ff3f00ff", "icon": "ik" }, { "name": "rear-thigh", "parent": "hip", @@ -61,9 +61,17 @@ "transform": "noRotationOrReflection", "color": "ff000dff" }, - { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff" }, + { "name": "board-ik", "parent": "root", "x": -131.78, "y": 69.09, "color": "4c56ffff", "icon": "arrows" }, { "name": "clipping", "parent": "root" }, - { "name": "hoverboard-controller", "parent": "root", "rotation": -0.28, "x": -329.69, "y": 69.82, "color": "ff0004ff" }, + { + "name": "hoverboard-controller", + "parent": "root", + "rotation": -0.28, + "x": -329.69, + "y": 69.82, + "color": "ff0004ff", + "icon": "arrowsB" + }, { "name": "exhaust1", "parent": "hoverboard-controller", "rotation": 3.02, "x": -249.68, "y": 53.39 }, { "name": "exhaust2", "parent": "hoverboard-controller", "rotation": 26.34, "x": -191.6, "y": -22.92 }, { @@ -76,16 +84,16 @@ "scaleY": 0.7847 }, { "name": "portal-root", "parent": "root", "x": 12.9, "y": 328.54, "scaleX": 2.0334, "scaleY": 2.0334 }, - { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57 }, - { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57 }, + { "name": "flare1", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare10", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare2", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare3", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare4", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare5", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare6", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare7", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare8", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, + { "name": "flare9", "parent": "portal-root", "x": -6.34, "y": -161.57, "icon": "particles" }, { "name": "torso", "parent": "hip", @@ -117,8 +125,8 @@ "y": 0.2, "color": "00ff04ff" }, - { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff" }, + { "name": "front-foot-target", "parent": "root", "x": -13.53, "y": 0.04, "color": "ff3f00ff", "icon": "ik" }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -28.4, "y": 29.06, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-thigh", "parent": "hip", @@ -227,7 +235,15 @@ { "name": "hoverboard-thruster-rear", "parent": "hoverboard-controller", "rotation": -29.2, "x": -76.47, "y": -4.88, "transform": "noRotationOrReflection" }, { "name": "hoverglow-front", "parent": "hoverboard-thruster-front", "rotation": 0.17, "x": -1.78, "y": -37.79 }, { "name": "hoverglow-rear", "parent": "hoverboard-thruster-rear", "rotation": 0.17, "x": 1.06, "y": -35.66 }, - { "name": "muzzle", "parent": "rear-bracer", "rotation": 3.06, "x": 242.34, "y": 34.26, "color": "ffb900ff" }, + { + "name": "muzzle", + "parent": "rear-bracer", + "rotation": 3.06, + "x": 242.34, + "y": 34.26, + "color": "ffb900ff", + "icon": "muzzleFlash" + }, { "name": "muzzle-ring", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring2", "parent": "muzzle", "color": "ffb900ff" }, { "name": "muzzle-ring3", "parent": "muzzle", "color": "ffb900ff" }, @@ -246,7 +262,7 @@ "scaleY": 0.738, "color": "000effff" }, - { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff" } + { "name": "head-control", "parent": "head", "x": 110.21, "color": "00a220ff", "icon": "arrows" } ], "slots": [ { "name": "portal-bg", "bone": "portal" }, diff --git a/spine-sfml/cpp/data/spineboy-pro.skel b/spine-sfml/cpp/data/spineboy-pro.skel index 199839b49..2dd1473d6 100644 Binary files a/spine-sfml/cpp/data/spineboy-pro.skel and b/spine-sfml/cpp/data/spineboy-pro.skel differ diff --git a/spine-sfml/cpp/data/stretchyman-pma.atlas b/spine-sfml/cpp/data/stretchyman-pma.atlas index a14dabf35..d8b4a4077 100644 --- a/spine-sfml/cpp/data/stretchyman-pma.atlas +++ b/spine-sfml/cpp/data/stretchyman-pma.atlas @@ -3,14 +3,17 @@ stretchyman-pma.png filter: Linear, Linear pma: true back-arm - bounds: 149, 45, 72, 202 + bounds: 679, 173, 72, 202 + rotate: 90 back-leg - bounds: 312, 4, 100, 318 + bounds: 2, 2, 100, 318 rotate: 90 body - bounds: 223, 106, 141, 452 + bounds: 2, 104, 141, 452 rotate: 90 front-arm - bounds: 2, 26, 145, 221 + bounds: 456, 100, 145, 221 + rotate: 90 head - bounds: 223, 2, 87, 102 + bounds: 322, 15, 87, 102 + rotate: 90 diff --git a/spine-sfml/cpp/data/stretchyman-pma.png b/spine-sfml/cpp/data/stretchyman-pma.png index 073483d09..78e8b4503 100644 Binary files a/spine-sfml/cpp/data/stretchyman-pma.png and b/spine-sfml/cpp/data/stretchyman-pma.png differ diff --git a/spine-sfml/cpp/data/stretchyman-pro.json b/spine-sfml/cpp/data/stretchyman-pro.json index 006f2d5a8..810313f42 100644 --- a/spine-sfml/cpp/data/stretchyman-pro.json +++ b/spine-sfml/cpp/data/stretchyman-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.09-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { diff --git a/spine-sfml/cpp/data/stretchyman-pro.skel b/spine-sfml/cpp/data/stretchyman-pro.skel index 4d97e24f1..8f76baf37 100644 Binary files a/spine-sfml/cpp/data/stretchyman-pro.skel and b/spine-sfml/cpp/data/stretchyman-pro.skel differ diff --git a/spine-sfml/cpp/data/tank-pma.atlas b/spine-sfml/cpp/data/tank-pma.atlas index a84ddf165..32525f6b6 100644 --- a/spine-sfml/cpp/data/tank-pma.atlas +++ b/spine-sfml/cpp/data/tank-pma.atlas @@ -4,54 +4,61 @@ tank-pma.png pma: true scale: 0.5 antenna - bounds: 2, 712, 11, 152 + bounds: 650, 857, 11, 152 rotate: 90 cannon - bounds: 222, 694, 466, 29 + bounds: 434, 376, 466, 29 + rotate: 90 cannon-connector - bounds: 82, 654, 56, 68 + bounds: 349, 241, 56, 68 rotate: 90 ground - bounds: 2, 175, 512, 177 + bounds: 255, 330, 512, 177 + rotate: 90 guntower - bounds: 647, 347, 365, 145 + bounds: 650, 870, 365, 145 machinegun - bounds: 690, 694, 166, 29 + bounds: 255, 299, 166, 29 machinegun-mount - bounds: 858, 687, 36, 48 + bounds: 2, 2, 36, 48 rotate: 90 rock - bounds: 664, 607, 290, 64 -smoke-glow - bounds: 946, 673, 50, 50 -smoke-puff01-bg - bounds: 312, 630, 92, 62 -smoke-puff01-fg - bounds: 222, 633, 88, 59 -smoke-puff02-fg - bounds: 406, 630, 92, 62 -smoke-puff03-fg - bounds: 500, 630, 92, 62 -smoke-puff04-fg - bounds: 2, 662, 78, 48 -tank-bottom - bounds: 2, 354, 643, 138 -tank-bottom-shadow - bounds: 2, 2, 646, 171 -tank-top - bounds: 195, 494, 704, 111 -tread - bounds: 172, 708, 48, 15 -tread-inside - bounds: 156, 710, 13, 14 + bounds: 465, 552, 290, 64 rotate: 90 +smoke-glow + bounds: 531, 563, 50, 50 +smoke-puff01-bg + bounds: 465, 458, 92, 62 + rotate: 90 +smoke-puff01-fg + bounds: 115, 138, 88, 59 +smoke-puff02-fg + bounds: 255, 235, 92, 62 +smoke-puff03-fg + bounds: 531, 685, 92, 62 +smoke-puff04-fg + bounds: 465, 378, 78, 48 + rotate: 90 +tank-bottom + bounds: 115, 199, 643, 138 + rotate: 90 +tank-bottom-shadow + bounds: 2, 844, 646, 171 +tank-top + bounds: 2, 138, 704, 111 + rotate: 90 +tread + bounds: 626, 794, 48, 15 + rotate: 90 +tread-inside + bounds: 434, 360, 13, 14 wheel-big - bounds: 97, 540, 96, 96 + bounds: 2, 40, 96, 96 wheel-big-overlay - bounds: 2, 559, 93, 93 + bounds: 531, 749, 93, 93 wheel-mid - bounds: 594, 624, 68, 68 + bounds: 531, 615, 68, 68 wheel-mid-overlay - bounds: 152, 638, 68, 68 + bounds: 100, 68, 68, 68 wheel-small - bounds: 908, 687, 36, 36 + bounds: 205, 161, 36, 36 diff --git a/spine-sfml/cpp/data/tank-pma.png b/spine-sfml/cpp/data/tank-pma.png index 15f7b6d78..e84347737 100644 Binary files a/spine-sfml/cpp/data/tank-pma.png and b/spine-sfml/cpp/data/tank-pma.png differ diff --git a/spine-sfml/cpp/data/tank-pro.json b/spine-sfml/cpp/data/tank-pro.json index dfc32cab5..a858278b4 100644 --- a/spine-sfml/cpp/data/tank-pro.json +++ b/spine-sfml/cpp/data/tank-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "ulJOWXMG9PE", - "spine": "4.1.23-beta", + "hash": "DdDstJX8qPU", + "spine": "4.2.09-beta", "x": -5852.65, "y": -348.5, "width": 7202.61, @@ -23,7 +23,7 @@ { "name": "antenna5", "parent": "antenna4", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "antenna6", "parent": "antenna5", "length": 42, "x": 42, "color": "ffee00ff" }, { "name": "cannon-connector", "parent": "guntower", "x": -235.05, "y": 96.07 }, - { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff" }, + { "name": "cannon-target", "parent": "tank-root", "x": -2276.67, "y": 400.17, "color": "0096ffff", "icon": "arrows" }, { "name": "cannon", "parent": "cannon-connector", "length": 946.68, "rotation": 180, "color": "ff4000ff" }, { "name": "machinegun-mount", @@ -34,7 +34,7 @@ "y": 218.33, "color": "15ff00ff" }, - { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff" }, + { "name": "machinegun-target", "parent": "tank-root", "x": -2272.76, "y": 607.77, "color": "0096ffff", "icon": "ik" }, { "name": "machinegun", "parent": "machinegun-mount", @@ -53,9 +53,10 @@ "y": 405.76, "scaleX": -6.5, "scaleY": 6.5, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, - { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff" }, + { "name": "smoke-glow", "parent": "smoke-root", "x": 62.92, "y": -0.71, "color": "ff4000ff", "icon": "particles" }, { "name": "smoke1", "parent": "smoke-root", @@ -64,7 +65,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke10", @@ -74,7 +76,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke11", @@ -84,7 +87,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke12", @@ -94,7 +98,8 @@ "y": 2.48, "scaleX": 3.9011, "scaleY": 2.8523, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke13", @@ -104,7 +109,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke14", @@ -114,7 +120,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke15", @@ -124,7 +131,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke16", @@ -134,7 +142,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke17", @@ -144,7 +153,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke18", @@ -154,7 +164,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke2", @@ -164,7 +175,8 @@ "y": 29.7, "scaleX": 3.3345, "scaleY": 3.3345, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke20", @@ -174,7 +186,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke21", @@ -184,7 +197,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke22", @@ -194,7 +208,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke23", @@ -204,7 +219,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke24", @@ -214,7 +230,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke25", @@ -224,7 +241,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke26", @@ -234,7 +252,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke27", @@ -244,7 +263,8 @@ "y": -1.55, "scaleX": 1.6484, "scaleY": 1.6484, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke3", @@ -254,7 +274,8 @@ "y": -17.5, "scaleX": 3.0415, "scaleY": 4.157, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke4", @@ -264,7 +285,8 @@ "y": 8.01, "scaleX": 2.1808, "scaleY": 2.9807, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke5", @@ -274,7 +296,8 @@ "y": 59.88, "scaleX": 4.5119, "scaleY": 2.9725, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke6", @@ -284,7 +307,8 @@ "y": 25.65, "scaleX": 3.7912, "scaleY": 3.0552, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke7", @@ -294,7 +318,8 @@ "y": -50.47, "scaleX": 4.8523, "scaleY": 3.6528, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke8", @@ -304,7 +329,8 @@ "y": -42.55, "scaleX": 4.0006, "scaleY": 3.4796, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "smoke9", @@ -314,7 +340,8 @@ "y": -8.73, "scaleX": 4.2074, "scaleY": 3.0762, - "color": "ff4000ff" + "color": "ff4000ff", + "icon": "particles" }, { "name": "tank-glow", "parent": "tank-root", "x": -247.72, "y": 404.37, "scaleX": 1.0582, "scaleY": 0.6785 }, { diff --git a/spine-sfml/cpp/data/tank-pro.skel b/spine-sfml/cpp/data/tank-pro.skel index 3f7020c06..163e64629 100644 Binary files a/spine-sfml/cpp/data/tank-pro.skel and b/spine-sfml/cpp/data/tank-pro.skel differ diff --git a/spine-sfml/cpp/data/vine-pro.json b/spine-sfml/cpp/data/vine-pro.json index 236e31872..4af855ccf 100644 --- a/spine-sfml/cpp/data/vine-pro.json +++ b/spine-sfml/cpp/data/vine-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "J/Kz2d3OlD0", - "spine": "4.1.23-beta", + "hash": "umDSKvQSk4I", + "spine": "4.2.09-beta", "x": -87.7, "y": -1.71, "width": 227.65, diff --git a/spine-sfml/cpp/data/vine-pro.skel b/spine-sfml/cpp/data/vine-pro.skel index 19f974275..961ccc37e 100644 Binary files a/spine-sfml/cpp/data/vine-pro.skel and b/spine-sfml/cpp/data/vine-pro.skel differ diff --git a/spine-ts/index.html b/spine-ts/index.html index c3951a1e3..909dc85d5 100644 --- a/spine-ts/index.html +++ b/spine-ts/index.html @@ -116,6 +116,7 @@