From 9787e7cee7c7fabd5dbc92db1bdca153b488a225 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Fri, 17 Jan 2014 00:57:41 +0100 Subject: [PATCH] Returned example to use spineboy. --- .../src/AtlasExample.as | 18 ++++++++---------- .../spine-starling-example/src/Main.as | 2 +- .../{spineboy-atlas.atlas => spineboy.atlas} | 0 .../src/{spineboy-atlas.png => spineboy.png} | Bin 4 files changed, 9 insertions(+), 11 deletions(-) rename spine-starling/spine-starling-example/src/{spineboy-atlas.atlas => spineboy.atlas} (100%) rename spine-starling/spine-starling-example/src/{spineboy-atlas.png => spineboy.png} (100%) diff --git a/spine-starling/spine-starling-example/src/AtlasExample.as b/spine-starling/spine-starling-example/src/AtlasExample.as index 310ac105a..3322926d7 100644 --- a/spine-starling/spine-starling-example/src/AtlasExample.as +++ b/spine-starling/spine-starling-example/src/AtlasExample.as @@ -19,13 +19,13 @@ import starling.textures.Texture; import starling.textures.TextureAtlas; public class AtlasExample extends Sprite { - [Embed(source = "goblins.atlas", mimeType = "application/octet-stream")] + [Embed(source = "spineboy.atlas", mimeType = "application/octet-stream")] static public const SpineboyAtlasFile:Class; - [Embed(source = "goblins.png")] + [Embed(source = "spineboy.png")] static public const SpineboyAtlasTexture:Class; - [Embed(source = "goblins.json", mimeType = "application/octet-stream")] + [Embed(source = "spineboy.json", mimeType = "application/octet-stream")] static public const SpineboyJson:Class; private var skeleton:SkeletonAnimation; @@ -36,9 +36,9 @@ public class AtlasExample extends Sprite { 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", "jump", 0.2); + stateData.setMixByName("walk", "jump", 0.2); + stateData.setMixByName("jump", "walk", 0.4); + stateData.setMixByName("jump", "jump", 0.2); skeleton = new SkeletonAnimation(skeletonData, stateData); skeleton.x = 320; @@ -58,11 +58,9 @@ public class AtlasExample extends Sprite { + event.data.name + ": " + event.intValue + ", " + event.floatValue + ", " + event.stringValue); }); - skeleton.skeleton.skinName = "goblin"; - skeleton.skeleton.setSlotsToSetupPose(); skeleton.state.setAnimationByName(0, "walk", true); -// skeleton.state.addAnimationByName(0, "jump", false, 3); -// skeleton.state.addAnimationByName(0, "walk", true, 0); + skeleton.state.addAnimationByName(0, "jump", false, 3); + skeleton.state.addAnimationByName(0, "walk", true, 0); addChild(skeleton); Starling.juggler.add(skeleton); diff --git a/spine-starling/spine-starling-example/src/Main.as b/spine-starling/spine-starling-example/src/Main.as index 7f9120193..08e618af1 100644 --- a/spine-starling/spine-starling-example/src/Main.as +++ b/spine-starling/spine-starling-example/src/Main.as @@ -9,7 +9,7 @@ public class Main extends Sprite { private var _starling:Starling; public function Main () { - _starling = new Starling(GoblinsExample, stage); + _starling = new Starling(AtlasExample, stage); _starling.start(); } } diff --git a/spine-starling/spine-starling-example/src/spineboy-atlas.atlas b/spine-starling/spine-starling-example/src/spineboy.atlas similarity index 100% rename from spine-starling/spine-starling-example/src/spineboy-atlas.atlas rename to spine-starling/spine-starling-example/src/spineboy.atlas diff --git a/spine-starling/spine-starling-example/src/spineboy-atlas.png b/spine-starling/spine-starling-example/src/spineboy.png similarity index 100% rename from spine-starling/spine-starling-example/src/spineboy-atlas.png rename to spine-starling/spine-starling-example/src/spineboy.png