diff --git a/examples/raptor/manual-maps/raptor-normals.png b/examples/raptor/manual-maps/raptor-normals.png index 37c5e36b5..ee6b29297 100644 Binary files a/examples/raptor/manual-maps/raptor-normals.png and b/examples/raptor/manual-maps/raptor-normals.png differ diff --git a/examples/raptor/manual-maps/raptor-pma.atlas b/examples/raptor/manual-maps/raptor-pma.atlas index 228f82568..b874237eb 100644 --- a/examples/raptor/manual-maps/raptor-pma.atlas +++ b/examples/raptor/manual-maps/raptor-pma.atlas @@ -1,272 +1,100 @@ - raptor-pma.png -size: 1024,512 -format: RGBA8888 -filter: Linear,Linear -repeat: none + size: 1024, 512 + filter: Linear, Linear + pma: true back-arm - rotate: true - xy: 829, 88 - size: 46, 25 - orig: 46, 25 - offset: 0, 0 - index: -1 + bounds: 829, 88, 46, 25 + rotate: 90 back-bracer - rotate: true - xy: 195, 238 - size: 39, 28 - orig: 39, 28 - offset: 0, 0 - index: -1 + bounds: 195, 238, 39, 28 + rotate: 90 back-hand - rotate: true - xy: 724, 140 - size: 36, 34 - orig: 36, 34 - offset: 0, 0 - index: -1 + bounds: 724, 140, 36, 34 + rotate: 90 back-knee - rotate: true - xy: 760, 131 - size: 49, 67 - orig: 49, 67 - offset: 0, 0 - index: -1 + bounds: 760, 131, 49, 67 + rotate: 90 back-thigh - rotate: true - xy: 225, 238 - size: 39, 24 - orig: 39, 24 - offset: 0, 0 - index: -1 + bounds: 225, 238, 39, 24 + rotate: 90 eyes-open - rotate: false - xy: 975, 204 - size: 47, 45 - orig: 47, 45 - offset: 0, 0 - index: -1 + bounds: 975, 204, 47, 45 front-arm - rotate: false - xy: 969, 112 - size: 48, 26 - orig: 48, 26 - offset: 0, 0 - index: -1 + bounds: 969, 112, 48, 26 front-bracer - rotate: true - xy: 724, 97 - size: 41, 29 - orig: 41, 29 - offset: 0, 0 - index: -1 + bounds: 724, 97, 41, 29 + rotate: 90 front-hand - rotate: false - xy: 251, 239 - size: 41, 38 - orig: 41, 38 - offset: 0, 0 - index: -1 + bounds: 251, 239, 41, 38 front-open-hand - rotate: true - xy: 856, 76 - size: 43, 44 - orig: 43, 44 - offset: 0, 0 - index: -1 + bounds: 856, 76, 43, 44 + rotate: 90 front-thigh - rotate: true - xy: 729, 178 - size: 57, 29 - orig: 57, 29 - offset: 0, 0 - index: -1 + bounds: 729, 178, 57, 29 + rotate: 90 gun - rotate: false - xy: 894, 251 - size: 107, 103 - orig: 107, 103 - offset: 0, 0 - index: -1 + bounds: 894, 251, 107, 103 gun-nohand - rotate: false - xy: 764, 241 - size: 105, 102 - orig: 105, 102 - offset: 0, 0 - index: -1 + bounds: 764, 241, 105, 102 head - rotate: false - xy: 756, 345 - size: 136, 149 - orig: 136, 149 - offset: 0, 0 - index: -1 + bounds: 756, 345, 136, 149 lower-leg - rotate: true - xy: 475, 237 - size: 73, 98 - orig: 73, 98 - offset: 0, 0 - index: -1 + bounds: 475, 237, 73, 98 + rotate: 90 mouth-grind - rotate: false - xy: 975, 172 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 172, 47, 30 mouth-smile - rotate: false - xy: 975, 140 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 140, 47, 30 neck - rotate: false - xy: 366, 282 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 + bounds: 366, 282, 18, 21 raptor-back-arm - rotate: true - xy: 636, 97 - size: 82, 86 - orig: 82, 86 - offset: 0, 0 - index: -1 + bounds: 636, 97, 82, 86 + rotate: 90 raptor-body - rotate: false - xy: 2, 2 - size: 632, 233 - orig: 632, 233 - offset: 0, 0 - index: -1 + bounds: 2, 2, 632, 233 raptor-front-arm - rotate: true - xy: 871, 168 - size: 81, 102 - orig: 81, 102 - offset: 0, 0 - index: -1 + bounds: 871, 168, 81, 102 + rotate: 90 raptor-front-leg - rotate: false - xy: 2, 237 - size: 191, 257 - orig: 191, 257 - offset: 0, 0 - index: -1 + bounds: 2, 237, 191, 257 raptor-hindleg-back - rotate: false - xy: 195, 279 - size: 169, 215 - orig: 169, 215 - offset: 0, 0 - index: -1 + bounds: 195, 279, 169, 215 raptor-horn - rotate: true - xy: 431, 312 - size: 182, 80 - orig: 182, 80 - offset: 0, 0 - index: -1 + bounds: 431, 312, 182, 80 + rotate: 90 raptor-horn-back - rotate: true - xy: 513, 318 - size: 176, 77 - orig: 176, 77 - offset: 0, 0 - index: -1 + bounds: 513, 318, 176, 77 + rotate: 90 raptor-jaw - rotate: false - xy: 894, 356 - size: 126, 138 - orig: 126, 138 - offset: 0, 0 - index: -1 + bounds: 894, 356, 126, 138 raptor-jaw-tooth - rotate: true - xy: 294, 240 - size: 37, 48 - orig: 37, 48 - offset: 0, 0 - index: -1 + bounds: 294, 240, 37, 48 + rotate: 90 raptor-mouth-inside - rotate: true - xy: 344, 241 - size: 36, 41 - orig: 36, 41 - offset: 0, 0 - index: -1 + bounds: 344, 241, 36, 41 + rotate: 90 raptor-saddle-strap-back - rotate: false - xy: 575, 242 - size: 54, 74 - orig: 54, 74 - offset: 0, 0 - index: -1 + bounds: 575, 242, 54, 74 raptor-saddle-strap-front - rotate: true - xy: 764, 182 - size: 57, 95 - orig: 57, 95 - offset: 0, 0 - index: -1 + bounds: 764, 182, 57, 95 + rotate: 90 raptor-saddle-w-shadow - rotate: false - xy: 592, 323 - size: 162, 171 - orig: 162, 171 - offset: 0, 0 - index: -1 + bounds: 592, 323, 162, 171 raptor-tail-shadow - rotate: true - xy: 366, 305 - size: 189, 63 - orig: 189, 63 - offset: 0, 0 - index: -1 + bounds: 366, 305, 189, 63 + rotate: 90 raptor-tongue - rotate: false - xy: 387, 239 - size: 86, 64 - orig: 86, 64 - offset: 0, 0 - index: -1 + bounds: 387, 239, 86, 64 stirrup-back - rotate: true - xy: 829, 136 - size: 44, 35 - orig: 44, 35 - offset: 0, 0 - index: -1 + bounds: 829, 136, 44, 35 + rotate: 90 stirrup-front - rotate: true - xy: 866, 121 - size: 45, 50 - orig: 45, 50 - offset: 0, 0 - index: -1 + bounds: 866, 121, 45, 50 + rotate: 90 stirrup-strap - rotate: false - xy: 918, 120 - size: 49, 46 - orig: 49, 46 - offset: 0, 0 - index: -1 + bounds: 918, 120, 49, 46 torso - rotate: true - xy: 636, 181 - size: 54, 91 - orig: 54, 91 - offset: 0, 0 - index: -1 + bounds: 636, 181, 54, 91 + rotate: 90 visor - rotate: false - xy: 631, 237 - size: 131, 84 - orig: 131, 84 - offset: 0, 0 - index: -1 + bounds: 631, 237, 131, 84 diff --git a/examples/raptor/manual-maps/raptor-pma.png b/examples/raptor/manual-maps/raptor-pma.png index 4c28d1815..8119189a9 100644 Binary files a/examples/raptor/manual-maps/raptor-pma.png and b/examples/raptor/manual-maps/raptor-pma.png differ diff --git a/examples/raptor/manual-maps/raptor-rim-mask.png b/examples/raptor/manual-maps/raptor-rim-mask.png index 75925df76..71beff415 100644 Binary files a/examples/raptor/manual-maps/raptor-rim-mask.png and b/examples/raptor/manual-maps/raptor-rim-mask.png differ diff --git a/examples/raptor/manual-maps/raptor.atlas b/examples/raptor/manual-maps/raptor.atlas index ae95b7d56..f5a0951c4 100644 --- a/examples/raptor/manual-maps/raptor.atlas +++ b/examples/raptor/manual-maps/raptor.atlas @@ -1,272 +1,99 @@ - raptor.png -size: 1024,512 -format: RGBA8888 -filter: Linear,Linear -repeat: none + size: 1024, 512 + filter: Linear, Linear back-arm - rotate: true - xy: 829, 88 - size: 46, 25 - orig: 46, 25 - offset: 0, 0 - index: -1 + bounds: 829, 88, 46, 25 + rotate: 90 back-bracer - rotate: true - xy: 195, 238 - size: 39, 28 - orig: 39, 28 - offset: 0, 0 - index: -1 + bounds: 195, 238, 39, 28 + rotate: 90 back-hand - rotate: true - xy: 724, 140 - size: 36, 34 - orig: 36, 34 - offset: 0, 0 - index: -1 + bounds: 724, 140, 36, 34 + rotate: 90 back-knee - rotate: true - xy: 760, 131 - size: 49, 67 - orig: 49, 67 - offset: 0, 0 - index: -1 + bounds: 760, 131, 49, 67 + rotate: 90 back-thigh - rotate: true - xy: 225, 238 - size: 39, 24 - orig: 39, 24 - offset: 0, 0 - index: -1 + bounds: 225, 238, 39, 24 + rotate: 90 eyes-open - rotate: false - xy: 975, 204 - size: 47, 45 - orig: 47, 45 - offset: 0, 0 - index: -1 + bounds: 975, 204, 47, 45 front-arm - rotate: false - xy: 969, 112 - size: 48, 26 - orig: 48, 26 - offset: 0, 0 - index: -1 + bounds: 969, 112, 48, 26 front-bracer - rotate: true - xy: 724, 97 - size: 41, 29 - orig: 41, 29 - offset: 0, 0 - index: -1 + bounds: 724, 97, 41, 29 + rotate: 90 front-hand - rotate: false - xy: 251, 239 - size: 41, 38 - orig: 41, 38 - offset: 0, 0 - index: -1 + bounds: 251, 239, 41, 38 front-open-hand - rotate: true - xy: 856, 76 - size: 43, 44 - orig: 43, 44 - offset: 0, 0 - index: -1 + bounds: 856, 76, 43, 44 + rotate: 90 front-thigh - rotate: true - xy: 729, 178 - size: 57, 29 - orig: 57, 29 - offset: 0, 0 - index: -1 + bounds: 729, 178, 57, 29 + rotate: 90 gun - rotate: false - xy: 894, 251 - size: 107, 103 - orig: 107, 103 - offset: 0, 0 - index: -1 + bounds: 894, 251, 107, 103 gun-nohand - rotate: false - xy: 764, 241 - size: 105, 102 - orig: 105, 102 - offset: 0, 0 - index: -1 + bounds: 764, 241, 105, 102 head - rotate: false - xy: 756, 345 - size: 136, 149 - orig: 136, 149 - offset: 0, 0 - index: -1 + bounds: 756, 345, 136, 149 lower-leg - rotate: true - xy: 475, 237 - size: 73, 98 - orig: 73, 98 - offset: 0, 0 - index: -1 + bounds: 475, 237, 73, 98 + rotate: 90 mouth-grind - rotate: false - xy: 975, 172 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 172, 47, 30 mouth-smile - rotate: false - xy: 975, 140 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 140, 47, 30 neck - rotate: false - xy: 366, 282 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 + bounds: 366, 282, 18, 21 raptor-back-arm - rotate: true - xy: 636, 97 - size: 82, 86 - orig: 82, 86 - offset: 0, 0 - index: -1 + bounds: 636, 97, 82, 86 + rotate: 90 raptor-body - rotate: false - xy: 2, 2 - size: 632, 233 - orig: 632, 233 - offset: 0, 0 - index: -1 + bounds: 2, 2, 632, 233 raptor-front-arm - rotate: true - xy: 871, 168 - size: 81, 102 - orig: 81, 102 - offset: 0, 0 - index: -1 + bounds: 871, 168, 81, 102 + rotate: 90 raptor-front-leg - rotate: false - xy: 2, 237 - size: 191, 257 - orig: 191, 257 - offset: 0, 0 - index: -1 + bounds: 2, 237, 191, 257 raptor-hindleg-back - rotate: false - xy: 195, 279 - size: 169, 215 - orig: 169, 215 - offset: 0, 0 - index: -1 + bounds: 195, 279, 169, 215 raptor-horn - rotate: true - xy: 431, 312 - size: 182, 80 - orig: 182, 80 - offset: 0, 0 - index: -1 + bounds: 431, 312, 182, 80 + rotate: 90 raptor-horn-back - rotate: true - xy: 513, 318 - size: 176, 77 - orig: 176, 77 - offset: 0, 0 - index: -1 + bounds: 513, 318, 176, 77 + rotate: 90 raptor-jaw - rotate: false - xy: 894, 356 - size: 126, 138 - orig: 126, 138 - offset: 0, 0 - index: -1 + bounds: 894, 356, 126, 138 raptor-jaw-tooth - rotate: true - xy: 294, 240 - size: 37, 48 - orig: 37, 48 - offset: 0, 0 - index: -1 + bounds: 294, 240, 37, 48 + rotate: 90 raptor-mouth-inside - rotate: true - xy: 344, 241 - size: 36, 41 - orig: 36, 41 - offset: 0, 0 - index: -1 + bounds: 344, 241, 36, 41 + rotate: 90 raptor-saddle-strap-back - rotate: false - xy: 575, 242 - size: 54, 74 - orig: 54, 74 - offset: 0, 0 - index: -1 + bounds: 575, 242, 54, 74 raptor-saddle-strap-front - rotate: true - xy: 764, 182 - size: 57, 95 - orig: 57, 95 - offset: 0, 0 - index: -1 + bounds: 764, 182, 57, 95 + rotate: 90 raptor-saddle-w-shadow - rotate: false - xy: 592, 323 - size: 162, 171 - orig: 162, 171 - offset: 0, 0 - index: -1 + bounds: 592, 323, 162, 171 raptor-tail-shadow - rotate: true - xy: 366, 305 - size: 189, 63 - orig: 189, 63 - offset: 0, 0 - index: -1 + bounds: 366, 305, 189, 63 + rotate: 90 raptor-tongue - rotate: false - xy: 387, 239 - size: 86, 64 - orig: 86, 64 - offset: 0, 0 - index: -1 + bounds: 387, 239, 86, 64 stirrup-back - rotate: true - xy: 829, 136 - size: 44, 35 - orig: 44, 35 - offset: 0, 0 - index: -1 + bounds: 829, 136, 44, 35 + rotate: 90 stirrup-front - rotate: true - xy: 866, 121 - size: 45, 50 - orig: 45, 50 - offset: 0, 0 - index: -1 + bounds: 866, 121, 45, 50 + rotate: 90 stirrup-strap - rotate: false - xy: 918, 120 - size: 49, 46 - orig: 49, 46 - offset: 0, 0 - index: -1 + bounds: 918, 120, 49, 46 torso - rotate: true - xy: 636, 181 - size: 54, 91 - orig: 54, 91 - offset: 0, 0 - index: -1 + bounds: 636, 181, 54, 91 + rotate: 90 visor - rotate: false - xy: 631, 237 - size: 131, 84 - orig: 131, 84 - offset: 0, 0 - index: -1 + bounds: 631, 237, 131, 84 diff --git a/examples/raptor/manual-maps/raptor.png b/examples/raptor/manual-maps/raptor.png index 4ab7766af..9140cfc79 100644 Binary files a/examples/raptor/manual-maps/raptor.png and b/examples/raptor/manual-maps/raptor.png differ diff --git a/spine-xna/example/data/raptor.atlas b/spine-xna/example/data/raptor.atlas index ae95b7d56..f5a0951c4 100644 --- a/spine-xna/example/data/raptor.atlas +++ b/spine-xna/example/data/raptor.atlas @@ -1,272 +1,99 @@ - raptor.png -size: 1024,512 -format: RGBA8888 -filter: Linear,Linear -repeat: none + size: 1024, 512 + filter: Linear, Linear back-arm - rotate: true - xy: 829, 88 - size: 46, 25 - orig: 46, 25 - offset: 0, 0 - index: -1 + bounds: 829, 88, 46, 25 + rotate: 90 back-bracer - rotate: true - xy: 195, 238 - size: 39, 28 - orig: 39, 28 - offset: 0, 0 - index: -1 + bounds: 195, 238, 39, 28 + rotate: 90 back-hand - rotate: true - xy: 724, 140 - size: 36, 34 - orig: 36, 34 - offset: 0, 0 - index: -1 + bounds: 724, 140, 36, 34 + rotate: 90 back-knee - rotate: true - xy: 760, 131 - size: 49, 67 - orig: 49, 67 - offset: 0, 0 - index: -1 + bounds: 760, 131, 49, 67 + rotate: 90 back-thigh - rotate: true - xy: 225, 238 - size: 39, 24 - orig: 39, 24 - offset: 0, 0 - index: -1 + bounds: 225, 238, 39, 24 + rotate: 90 eyes-open - rotate: false - xy: 975, 204 - size: 47, 45 - orig: 47, 45 - offset: 0, 0 - index: -1 + bounds: 975, 204, 47, 45 front-arm - rotate: false - xy: 969, 112 - size: 48, 26 - orig: 48, 26 - offset: 0, 0 - index: -1 + bounds: 969, 112, 48, 26 front-bracer - rotate: true - xy: 724, 97 - size: 41, 29 - orig: 41, 29 - offset: 0, 0 - index: -1 + bounds: 724, 97, 41, 29 + rotate: 90 front-hand - rotate: false - xy: 251, 239 - size: 41, 38 - orig: 41, 38 - offset: 0, 0 - index: -1 + bounds: 251, 239, 41, 38 front-open-hand - rotate: true - xy: 856, 76 - size: 43, 44 - orig: 43, 44 - offset: 0, 0 - index: -1 + bounds: 856, 76, 43, 44 + rotate: 90 front-thigh - rotate: true - xy: 729, 178 - size: 57, 29 - orig: 57, 29 - offset: 0, 0 - index: -1 + bounds: 729, 178, 57, 29 + rotate: 90 gun - rotate: false - xy: 894, 251 - size: 107, 103 - orig: 107, 103 - offset: 0, 0 - index: -1 + bounds: 894, 251, 107, 103 gun-nohand - rotate: false - xy: 764, 241 - size: 105, 102 - orig: 105, 102 - offset: 0, 0 - index: -1 + bounds: 764, 241, 105, 102 head - rotate: false - xy: 756, 345 - size: 136, 149 - orig: 136, 149 - offset: 0, 0 - index: -1 + bounds: 756, 345, 136, 149 lower-leg - rotate: true - xy: 475, 237 - size: 73, 98 - orig: 73, 98 - offset: 0, 0 - index: -1 + bounds: 475, 237, 73, 98 + rotate: 90 mouth-grind - rotate: false - xy: 975, 172 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 172, 47, 30 mouth-smile - rotate: false - xy: 975, 140 - size: 47, 30 - orig: 47, 30 - offset: 0, 0 - index: -1 + bounds: 975, 140, 47, 30 neck - rotate: false - xy: 366, 282 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 + bounds: 366, 282, 18, 21 raptor-back-arm - rotate: true - xy: 636, 97 - size: 82, 86 - orig: 82, 86 - offset: 0, 0 - index: -1 + bounds: 636, 97, 82, 86 + rotate: 90 raptor-body - rotate: false - xy: 2, 2 - size: 632, 233 - orig: 632, 233 - offset: 0, 0 - index: -1 + bounds: 2, 2, 632, 233 raptor-front-arm - rotate: true - xy: 871, 168 - size: 81, 102 - orig: 81, 102 - offset: 0, 0 - index: -1 + bounds: 871, 168, 81, 102 + rotate: 90 raptor-front-leg - rotate: false - xy: 2, 237 - size: 191, 257 - orig: 191, 257 - offset: 0, 0 - index: -1 + bounds: 2, 237, 191, 257 raptor-hindleg-back - rotate: false - xy: 195, 279 - size: 169, 215 - orig: 169, 215 - offset: 0, 0 - index: -1 + bounds: 195, 279, 169, 215 raptor-horn - rotate: true - xy: 431, 312 - size: 182, 80 - orig: 182, 80 - offset: 0, 0 - index: -1 + bounds: 431, 312, 182, 80 + rotate: 90 raptor-horn-back - rotate: true - xy: 513, 318 - size: 176, 77 - orig: 176, 77 - offset: 0, 0 - index: -1 + bounds: 513, 318, 176, 77 + rotate: 90 raptor-jaw - rotate: false - xy: 894, 356 - size: 126, 138 - orig: 126, 138 - offset: 0, 0 - index: -1 + bounds: 894, 356, 126, 138 raptor-jaw-tooth - rotate: true - xy: 294, 240 - size: 37, 48 - orig: 37, 48 - offset: 0, 0 - index: -1 + bounds: 294, 240, 37, 48 + rotate: 90 raptor-mouth-inside - rotate: true - xy: 344, 241 - size: 36, 41 - orig: 36, 41 - offset: 0, 0 - index: -1 + bounds: 344, 241, 36, 41 + rotate: 90 raptor-saddle-strap-back - rotate: false - xy: 575, 242 - size: 54, 74 - orig: 54, 74 - offset: 0, 0 - index: -1 + bounds: 575, 242, 54, 74 raptor-saddle-strap-front - rotate: true - xy: 764, 182 - size: 57, 95 - orig: 57, 95 - offset: 0, 0 - index: -1 + bounds: 764, 182, 57, 95 + rotate: 90 raptor-saddle-w-shadow - rotate: false - xy: 592, 323 - size: 162, 171 - orig: 162, 171 - offset: 0, 0 - index: -1 + bounds: 592, 323, 162, 171 raptor-tail-shadow - rotate: true - xy: 366, 305 - size: 189, 63 - orig: 189, 63 - offset: 0, 0 - index: -1 + bounds: 366, 305, 189, 63 + rotate: 90 raptor-tongue - rotate: false - xy: 387, 239 - size: 86, 64 - orig: 86, 64 - offset: 0, 0 - index: -1 + bounds: 387, 239, 86, 64 stirrup-back - rotate: true - xy: 829, 136 - size: 44, 35 - orig: 44, 35 - offset: 0, 0 - index: -1 + bounds: 829, 136, 44, 35 + rotate: 90 stirrup-front - rotate: true - xy: 866, 121 - size: 45, 50 - orig: 45, 50 - offset: 0, 0 - index: -1 + bounds: 866, 121, 45, 50 + rotate: 90 stirrup-strap - rotate: false - xy: 918, 120 - size: 49, 46 - orig: 49, 46 - offset: 0, 0 - index: -1 + bounds: 918, 120, 49, 46 torso - rotate: true - xy: 636, 181 - size: 54, 91 - orig: 54, 91 - offset: 0, 0 - index: -1 + bounds: 636, 181, 54, 91 + rotate: 90 visor - rotate: false - xy: 631, 237 - size: 131, 84 - orig: 131, 84 - offset: 0, 0 - index: -1 + bounds: 631, 237, 131, 84 diff --git a/spine-xna/example/data/raptor.png b/spine-xna/example/data/raptor.png index 4ab7766af..9140cfc79 100644 Binary files a/spine-xna/example/data/raptor.png and b/spine-xna/example/data/raptor.png differ diff --git a/spine-xna/example/data/raptor_normals.png b/spine-xna/example/data/raptor_normals.png index 37c5e36b5..ee6b29297 100644 Binary files a/spine-xna/example/data/raptor_normals.png and b/spine-xna/example/data/raptor_normals.png differ