diff --git a/spine-as3/spine-as3-example/src/Main.as b/spine-as3/spine-as3-example/src/Main.as index f670482d3..2eb030937 100644 --- a/spine-as3/spine-as3-example/src/Main.as +++ b/spine-as3/spine-as3-example/src/Main.as @@ -9,7 +9,7 @@ import spine.SkeletonJson; import spine.atlas.Atlas; import spine.attachments.AtlasAttachmentLoader; import spine.flash.SingleTextureLoader; -import spine.flash.SkeletonAnimationSprite; +import spine.flash.SkeletonAnimation; [SWF(width = "640", height = "480", frameRate = "60", backgroundColor = "#dddddd")] public class Main extends Sprite { @@ -22,7 +22,7 @@ public class Main extends Sprite { [Embed(source = "spineboy.json", mimeType = "application/octet-stream")] static public const SpineboyJson:Class; - private var skeleton:SkeletonAnimationSprite; + private var skeleton:SkeletonAnimation; public function Main () { var atlas:Atlas = new Atlas(new SpineboyAtlas(), new SingleTextureLoader(new SpineboyAtlasTexture())); @@ -34,7 +34,7 @@ public class Main extends Sprite { stateData.setMixByName("jump", "walk", 0.4); stateData.setMixByName("jump", "jump", 0.2); - skeleton = new SkeletonAnimationSprite(skeletonData); + skeleton = new SkeletonAnimation(skeletonData); skeleton.setAnimationStateData(stateData); skeleton.x = 320; skeleton.y = 420; diff --git a/spine-as3/spine-as3/src/spine/flash/SkeletonAnimationSprite.as b/spine-as3/spine-as3/src/spine/flash/SkeletonAnimation.as similarity index 93% rename from spine-as3/spine-as3/src/spine/flash/SkeletonAnimationSprite.as rename to spine-as3/spine-as3/src/spine/flash/SkeletonAnimation.as index 341cb63d2..aae291fac 100644 --- a/spine-as3/spine-as3/src/spine/flash/SkeletonAnimationSprite.as +++ b/spine-as3/spine-as3/src/spine/flash/SkeletonAnimation.as @@ -3,10 +3,10 @@ import spine.AnimationState; import spine.AnimationStateData; import spine.SkeletonData; -public class SkeletonAnimationSprite extends SkeletonSprite { +public class SkeletonAnimation extends SkeletonSprite { public var states:Vector. = new Vector.(); - public function SkeletonAnimationSprite (skeletonData:SkeletonData) { + public function SkeletonAnimation (skeletonData:SkeletonData) { super(skeletonData); addAnimationState(); } diff --git a/spine-starling/spine-starling/.actionScriptProperties b/spine-starling/spine-starling/.actionScriptProperties index 3dde2f399..6d614b3c3 100644 --- a/spine-starling/spine-starling/.actionScriptProperties +++ b/spine-starling/spine-starling/.actionScriptProperties @@ -10,7 +10,7 @@ - + diff --git a/spine-starling/spine-starling/libs/starling.swc b/spine-starling/spine-starling/libs/starling-1.3.swc similarity index 100% rename from spine-starling/spine-starling/libs/starling.swc rename to spine-starling/spine-starling/libs/starling-1.3.swc diff --git a/spine-starling/spine-starling/src/spine/starling/SkeletonAnimationSprite.as b/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as similarity index 93% rename from spine-starling/spine-starling/src/spine/starling/SkeletonAnimationSprite.as rename to spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as index 55f9296f4..249d0c89a 100644 --- a/spine-starling/spine-starling/src/spine/starling/SkeletonAnimationSprite.as +++ b/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as @@ -3,10 +3,10 @@ package spine.starling { import spine.AnimationStateData; import spine.SkeletonData; -public class SkeletonAnimationSprite extends SkeletonSprite { +public class SkeletonAnimation extends SkeletonSprite { public var states:Vector. = new Vector.(); - public function SkeletonAnimationSprite (skeletonData:SkeletonData) { + public function SkeletonAnimation (skeletonData:SkeletonData) { super(skeletonData); addAnimationState(); } diff --git a/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as b/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as index 8a15513fe..f361d9078 100644 --- a/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as +++ b/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as @@ -35,6 +35,7 @@ public class SkeletonSprite extends DisplayObject implements IAnimatable { } override public function render (support:RenderSupport, alpha:Number) : void { + alpha *= this.alpha * skeleton.a; var drawOrder:Vector. = skeleton.drawOrder; for (var i:int = 0, n:int = drawOrder.length; i < n; i++) { var slot:Slot = drawOrder[i]; @@ -45,11 +46,11 @@ public class SkeletonSprite extends DisplayObject implements IAnimatable { var r:Number = skeleton.r * slot.r; var g:Number = skeleton.g * slot.g; var b:Number = skeleton.b * slot.b; - var a:Number = skeleton.a * slot.a; + var a:Number = slot.a; var image:SkeletonImage = regionAttachment.rendererObject as SkeletonImage; var vertexData:Vector. = image.vertexData.rawData; - + vertexData[0] = vertices[2]; vertexData[1] = vertices[3]; vertexData[2] = r; diff --git a/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as b/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as index d73ea8502..2dcd4ef78 100644 --- a/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as +++ b/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as @@ -1,4 +1,6 @@ package spine.starling { +import flash.geom.Rectangle; + import spine.Bone; import spine.Skin; import spine.attachments.Attachment; @@ -22,11 +24,13 @@ public class StarlingAtlasAttachmentLoader implements AttachmentLoader { if (type == AttachmentType.region) { var regionAttachment:RegionAttachment = new RegionAttachment(name); var texture:Texture = atlas.getTexture(name); + var frame:Rectangle = texture.frame; + texture = Texture.fromTexture(texture); // Discard frame. regionAttachment.rendererObject = new SkeletonImage(texture); - regionAttachment.regionOffsetX = texture.frame.x; - regionAttachment.regionOffsetY = texture.frame.y; - regionAttachment.regionWidth = texture.width; - regionAttachment.regionHeight = texture.height; + regionAttachment.regionOffsetX = frame.x; + regionAttachment.regionOffsetY = frame.y; + regionAttachment.regionWidth = frame.width; + regionAttachment.regionHeight = frame.height; regionAttachment.regionOriginalWidth = texture.width; regionAttachment.regionOriginalHeight = texture.height; return regionAttachment;