diff --git a/spine-as3/spine-as3-example/src/Main.as b/spine-as3/spine-as3-example/src/Main.as index bccf91a7a..3f499db10 100644 --- a/spine-as3/spine-as3-example/src/Main.as +++ b/spine-as3/spine-as3-example/src/Main.as @@ -57,11 +57,12 @@ public class Main extends Sprite { public function Main () { var atlas:Atlas = new Atlas(new SpineboyAtlas(), new FlashTextureLoader(new SpineboyAtlasTexture())); var json:SkeletonJson = new SkeletonJson(new AtlasAttachmentLoader(atlas)); + json.scale = 0.6; var skeletonData:SkeletonData = json.readSkeletonData(new SpineboyJson()); var stateData:AnimationStateData = new AnimationStateData(skeletonData); stateData.setMixByName("walk", "jump", 0.2); - stateData.setMixByName("jump", "walk", 0.4); + stateData.setMixByName("jump", "run", 0.4); stateData.setMixByName("jump", "jump", 0.2); skeleton = new SkeletonAnimation(skeletonData, stateData); @@ -82,12 +83,12 @@ public class Main extends Sprite { + event.data.name + ": " + event.intValue + ", " + event.floatValue + ", " + event.stringValue); }); - if (true) { - skeleton.state.setAnimationByName(0, "drawOrder", true); + if (false) { + skeleton.state.setAnimationByName(0, "test", true); } else { skeleton.state.setAnimationByName(0, "walk", true); skeleton.state.addAnimationByName(0, "jump", false, 3); - skeleton.state.addAnimationByName(0, "walk", true, 0); + skeleton.state.addAnimationByName(0, "run", true, 0); } addChild(skeleton); diff --git a/spine-as3/spine-as3-example/src/goblins-ffd.atlas b/spine-as3/spine-as3-example/src/goblins-ffd.atlas index b977b07f6..5fefae2bb 100644 --- a/spine-as3/spine-as3-example/src/goblins-ffd.atlas +++ b/spine-as3/spine-as3-example/src/goblins-ffd.atlas @@ -4,288 +4,288 @@ format: RGBA8888 filter: Linear,Linear repeat: none dagger - rotate: false - xy: 2, 28 + rotate: true + xy: 372, 100 size: 26, 108 orig: 26, 108 offset: 0, 0 index: -1 goblin/eyes-closed rotate: false - xy: 137, 29 + xy: 2, 7 size: 34, 12 orig: 34, 12 offset: 0, 0 index: -1 goblin/head rotate: false - xy: 26, 357 + xy: 107, 36 size: 103, 66 orig: 103, 66 offset: 0, 0 index: -1 goblin/left-arm rotate: false - xy: 30, 28 + xy: 901, 56 size: 37, 35 orig: 37, 35 offset: 0, 0 index: -1 goblin/left-foot rotate: false - xy: 134, 260 + xy: 929, 95 size: 65, 31 orig: 65, 31 offset: 0, 0 index: -1 goblin/left-hand rotate: false - xy: 69, 25 + xy: 452, 2 size: 36, 41 orig: 36, 41 offset: 0, 0 index: -1 goblin/left-lower-leg - rotate: false - xy: 134, 293 + rotate: true + xy: 713, 93 size: 33, 70 orig: 33, 70 offset: 0, 0 index: -1 goblin/left-shoulder rotate: false - xy: 137, 43 + xy: 610, 44 size: 29, 44 orig: 29, 44 offset: 0, 0 index: -1 goblin/left-upper-leg - rotate: false - xy: 30, 65 + rotate: true + xy: 638, 93 size: 33, 73 orig: 33, 73 offset: 0, 0 index: -1 goblin/neck rotate: false - xy: 201, 387 + xy: 490, 2 size: 36, 41 orig: 36, 41 offset: 0, 0 index: -1 goblin/pelvis rotate: false - xy: 26, 140 + xy: 482, 45 size: 62, 43 orig: 62, 43 offset: 0, 0 index: -1 goblin/right-arm - rotate: false - xy: 171, 84 + rotate: true + xy: 690, 2 size: 23, 50 orig: 23, 50 offset: 0, 0 index: -1 goblin/right-foot rotate: false - xy: 134, 225 + xy: 771, 58 size: 63, 33 orig: 63, 33 offset: 0, 0 index: -1 goblin/right-hand rotate: false - xy: 204, 258 + xy: 940, 56 size: 36, 37 orig: 36, 37 offset: 0, 0 index: -1 goblin/right-lower-leg - rotate: false - xy: 201, 430 + rotate: true + xy: 482, 90 size: 36, 76 orig: 36, 76 offset: 0, 0 index: -1 goblin/right-shoulder - rotate: false - xy: 130, 89 + rotate: true + xy: 602, 3 size: 39, 45 orig: 39, 45 offset: 0, 0 index: -1 goblin/right-upper-leg - rotate: false - xy: 98, 214 + rotate: true + xy: 641, 57 size: 34, 63 orig: 34, 63 offset: 0, 0 index: -1 goblin/torso - rotate: false - xy: 131, 410 + rotate: true + xy: 212, 34 size: 68, 96 orig: 68, 96 offset: 0, 0 index: -1 goblin/undie-straps rotate: false - xy: 2, 7 + xy: 380, 5 size: 55, 19 orig: 55, 19 offset: 0, 0 index: -1 goblin/undies rotate: false - xy: 199, 227 + xy: 174, 5 size: 36, 29 orig: 36, 29 offset: 0, 0 index: -1 goblingirl/eyes-closed rotate: false - xy: 59, 2 + xy: 269, 11 size: 37, 21 orig: 37, 21 offset: 0, 0 index: -1 goblingirl/head rotate: false - xy: 26, 425 + xy: 2, 21 size: 103, 81 orig: 103, 81 offset: 0, 0 index: -1 goblingirl/left-arm - rotate: false - xy: 201, 190 + rotate: true + xy: 978, 56 size: 37, 35 orig: 37, 35 offset: 0, 0 index: -1 goblingirl/left-foot rotate: false - xy: 134, 192 + xy: 107, 3 size: 65, 31 orig: 65, 31 offset: 0, 0 index: -1 goblingirl/left-hand rotate: false - xy: 196, 109 + xy: 565, 2 size: 35, 40 orig: 35, 40 offset: 0, 0 index: -1 goblingirl/left-lower-leg - rotate: false - xy: 169, 293 + rotate: true + xy: 785, 93 size: 33, 70 orig: 33, 70 offset: 0, 0 index: -1 goblingirl/left-shoulder - rotate: false - xy: 107, 30 + rotate: true + xy: 690, 27 size: 28, 46 orig: 28, 46 offset: 0, 0 index: -1 goblingirl/left-upper-leg - rotate: false - xy: 65, 68 + rotate: true + xy: 857, 93 size: 33, 70 orig: 33, 70 offset: 0, 0 index: -1 goblingirl/neck rotate: false - xy: 204, 297 + xy: 528, 2 size: 35, 41 orig: 35, 41 offset: 0, 0 index: -1 goblingirl/pelvis rotate: false - xy: 131, 365 + xy: 546, 45 size: 62, 43 orig: 62, 43 offset: 0, 0 index: -1 goblingirl/right-arm rotate: false - xy: 100, 97 + xy: 452, 48 size: 28, 50 orig: 28, 50 offset: 0, 0 index: -1 goblingirl/right-foot rotate: false - xy: 134, 157 + xy: 836, 58 size: 63, 33 orig: 63, 33 offset: 0, 0 index: -1 goblingirl/right-hand - rotate: false - xy: 199, 151 + rotate: true + xy: 771, 20 size: 36, 37 orig: 36, 37 offset: 0, 0 index: -1 goblingirl/right-lower-leg - rotate: false - xy: 96, 279 + rotate: true + xy: 560, 90 size: 36, 76 orig: 36, 76 offset: 0, 0 index: -1 goblingirl/right-shoulder rotate: false - xy: 204, 340 + xy: 649, 10 size: 39, 45 orig: 39, 45 offset: 0, 0 index: -1 goblingirl/right-upper-leg - rotate: false - xy: 98, 149 + rotate: true + xy: 706, 57 size: 34, 63 orig: 34, 63 offset: 0, 0 index: -1 goblingirl/torso rotate: false - xy: 26, 259 + xy: 310, 2 size: 68, 96 orig: 68, 96 offset: 0, 0 index: -1 goblingirl/undie-straps rotate: false - xy: 134, 136 + xy: 212, 13 size: 55, 19 orig: 55, 19 offset: 0, 0 index: -1 goblingirl/undies rotate: false - xy: 196, 78 + xy: 810, 27 size: 36, 29 orig: 36, 29 offset: 0, 0 index: -1 shield rotate: false - xy: 26, 185 + xy: 380, 26 size: 70, 72 orig: 70, 72 offset: 0, 0 index: -1 spear - rotate: false - xy: 2, 138 + rotate: true + xy: 2, 104 size: 22, 368 orig: 22, 368 offset: 0, 0 diff --git a/spine-as3/spine-as3-example/src/goblins-ffd.json b/spine-as3/spine-as3-example/src/goblins-ffd.json index 163060444..67a624a36 100644 --- a/spine-as3/spine-as3-example/src/goblins-ffd.json +++ b/spine-as3/spine-as3-example/src/goblins-ffd.json @@ -759,6 +759,11 @@ }, "ffd": { "default": { + "left hand item": { + "spear": [ + { "time": 0 } + ] + }, "right hand item": { "dagger": [ { diff --git a/spine-as3/spine-as3-example/src/goblins-ffd.png b/spine-as3/spine-as3-example/src/goblins-ffd.png index f172361f2..a3daf0010 100644 Binary files a/spine-as3/spine-as3-example/src/goblins-ffd.png and b/spine-as3/spine-as3-example/src/goblins-ffd.png differ diff --git a/spine-as3/spine-as3-example/src/spineboy.json b/spine-as3/spine-as3-example/src/spineboy.json index 1ffa7aad5..7b4497712 100644 --- a/spine-as3/spine-as3-example/src/spineboy.json +++ b/spine-as3/spine-as3-example/src/spineboy.json @@ -54,7 +54,8 @@ { "name": "goggles", "bone": "head", "attachment": "goggles" }, { "name": "front_bracer", "bone": "front_bracer", "attachment": "front_bracer" }, { "name": "front_fist", "bone": "front_fist", "attachment": "front_fist_closed" }, - { "name": "muzzle", "bone": "gunTip", "additive": true } + { "name": "muzzle", "bone": "gunTip", "additive": true }, + { "name": "head-bb", "bone": "head" } ], "skins": { "default": { @@ -92,6 +93,12 @@ "head": { "head": { "x": 128.95, "y": 0.29, "rotation": -70.63, "width": 271, "height": 298 } }, + "head-bb": { + "head": { + "type": "boundingbox", + "vertices": [ -19.143097, -70.30209, 40.80313, -118.074234, 257.77155, -115.61827, 285.16193, 57.18005, 120.77191, 164.95125, -5.067627, 76.94907 ] + } + }, "mouth": { "mouth_grind": { "x": 23.68, "y": -32.23, "rotation": -70.63, "width": 93, "height": 59 }, "mouth_oooo": { "x": 23.68, "y": -32.23, "rotation": -70.63, "width": 93, "height": 59 }, diff --git a/spine-as3/spine-as3-example/src/spineboy.png b/spine-as3/spine-as3-example/src/spineboy.png index b43262310..dce2fe3e2 100644 Binary files a/spine-as3/spine-as3-example/src/spineboy.png and b/spine-as3/spine-as3-example/src/spineboy.png differ