diff --git a/spine-as3/spine-as3-example/lib/spine-as3.swc b/spine-as3/spine-as3-example/lib/spine-as3.swc index 0b5371182..73b4f2570 100644 Binary files a/spine-as3/spine-as3-example/lib/spine-as3.swc and b/spine-as3/spine-as3-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling-example/lib/spine-as3.swc b/spine-starling/spine-starling-example/lib/spine-as3.swc index 0b5371182..5ca97aa4a 100644 Binary files a/spine-starling/spine-starling-example/lib/spine-as3.swc and b/spine-starling/spine-starling-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as b/spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as index 196d55cd9..a4874a1bc 100644 --- a/spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as +++ b/spine-starling/spine-starling-example/src/spine/examples/SpineboyExample.as @@ -29,6 +29,7 @@ *****************************************************************************/ package spine.examples { + import spine.animation.TrackEntry; import spine.animation.AnimationStateData; import spine.*; import spine.atlas.Atlas; @@ -71,17 +72,23 @@ public class SpineboyExample extends Sprite { skeleton.x = 400; skeleton.y = 560; - skeleton.state.onStart.add(function (trackIndex:int) : void { - trace(trackIndex + " start: " + skeleton.state.getCurrent(trackIndex)); + skeleton.state.onStart.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " start: " + entry.animation.name); }); - skeleton.state.onEnd.add(function (trackIndex:int) : void { - trace(trackIndex + " end: " + skeleton.state.getCurrent(trackIndex)); + skeleton.state.onInterrupt.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " interrupt: " + entry.animation.name); }); - skeleton.state.onComplete.add(function (trackIndex:int, count:int) : void { - trace(trackIndex + " complete: " + skeleton.state.getCurrent(trackIndex) + ", " + count); + skeleton.state.onEnd.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " end: " + entry.animation.name); }); - skeleton.state.onEvent.add(function (trackIndex:int, event:Event) : void { - trace(trackIndex + " event: " + skeleton.state.getCurrent(trackIndex) + ", " + skeleton.state.onComplete.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " complete: " + entry.animation.name); + }); + skeleton.state.onDispose.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " dispose: " + entry.animation.name); + }); + skeleton.state.onEvent.add(function (entry:TrackEntry, event:Event) : void { + trace(entry.trackIndex + " event: " + entry.animation.name + ", " + event.data.name + ": " + event.intValue + ", " + event.floatValue + ", " + event.stringValue); }); diff --git a/spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as b/spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as index deb312e61..eb145575a 100644 --- a/spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as +++ b/spine-starling/spine-starling-example/src/spine/examples/StretchymanExample.as @@ -29,8 +29,9 @@ *****************************************************************************/ package spine.examples { -import spine.animation.AnimationStateData; import spine.*; +import spine.animation.AnimationStateData; +import spine.animation.TrackEntry; import spine.atlas.Atlas; import spine.attachments.AtlasAttachmentLoader; import spine.attachments.AttachmentLoader; @@ -39,9 +40,6 @@ import spine.starling.StarlingTextureLoader; import starling.core.Starling; import starling.display.Sprite; -import starling.events.Touch; -import starling.events.TouchEvent; -import starling.events.TouchPhase; public class StretchymanExample extends Sprite { [Embed(source = "/stretchyman.json", mimeType = "application/octet-stream")] @@ -70,17 +68,23 @@ public class StretchymanExample extends Sprite { skeleton.state.timeScale = 0.1; - skeleton.state.onStart.add(function (trackIndex:int) : void { - trace(trackIndex + " start: " + skeleton.state.getCurrent(trackIndex)); + skeleton.state.onStart.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " start: " + entry.animation.name); }); - skeleton.state.onEnd.add(function (trackIndex:int) : void { - trace(trackIndex + " end: " + skeleton.state.getCurrent(trackIndex)); + skeleton.state.onInterrupt.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " interrupt: " + entry.animation.name); }); - skeleton.state.onComplete.add(function (trackIndex:int, count:int) : void { - trace(trackIndex + " complete: " + skeleton.state.getCurrent(trackIndex) + ", " + count); + skeleton.state.onEnd.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " end: " + entry.animation.name); }); - skeleton.state.onEvent.add(function (trackIndex:int, event:Event) : void { - trace(trackIndex + " event: " + skeleton.state.getCurrent(trackIndex) + ", " + skeleton.state.onComplete.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " complete: " + entry.animation.name); + }); + skeleton.state.onDispose.add(function (entry:TrackEntry) : void { + trace(entry.trackIndex + " dispose: " + entry.animation.name); + }); + skeleton.state.onEvent.add(function (entry:TrackEntry, event:Event) : void { + trace(entry.trackIndex + " event: " + entry.animation.name + ", " + event.data.name + ": " + event.intValue + ", " + event.floatValue + ", " + event.stringValue); }); diff --git a/spine-starling/spine-starling/lib/spine-as3.swc b/spine-starling/spine-starling/lib/spine-as3.swc index 0b5371182..5ca97aa4a 100644 Binary files a/spine-starling/spine-starling/lib/spine-as3.swc and b/spine-starling/spine-starling/lib/spine-as3.swc differ