UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-08 11:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes.

Browse Source
This commit is contained in:
NathanSweet 2013-05-06 18:44:48 +02:00
parent 3f3449ca99
commit 591b21c8ea
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-as3/spine-as3/src/spine/Skeleton.as
View File

@ -143,7 +143,7 @@ public class Skeleton {
public function set skin (newSkin:Skin) : void { public function set skin (newSkin:Skin) : void {
if (skin != null && newSkin != null) if (skin != null && newSkin != null)
newSkin.attachAll(this, skin); newSkin.attachAll(this, skin);
skin = newSkin; _skin = newSkin;
} }
/** @return May be null. */ /** @return May be null. */
@ -181,6 +181,7 @@ public class Skeleton {
slot.attachment = attachment; slot.attachment = attachment;
return; return;
} }
i++;
} }
throw new ArgumentError("Slot not found: " + slotName); throw new ArgumentError("Slot not found: " + slotName);
} }

4
spine-as3/spine-as3/src/spine/SkeletonJson.as
View File

@ -193,8 +193,8 @@ public class SkeletonJson {
var slotMap:Object = slots[slotName]; var slotMap:Object = slots[slotName];
var slotIndex:int = skeletonData.findSlotIndex(slotName); var slotIndex:int = skeletonData.findSlotIndex(slotName);
for (var timelineName2:Object in boneMap) { for (var timelineName2:Object in slotMap) {
var values2:Object = boneMap[timelineName2]; var values2:Object = slotMap[timelineName2];
if (timelineName2 == TIMELINE_COLOR) { if (timelineName2 == TIMELINE_COLOR) {
var timeline2:ColorTimeline = new ColorTimeline(values2.length); var timeline2:ColorTimeline = new ColorTimeline(values2.length);
timeline2.slotIndex = slotIndex; timeline2.slotIndex = slotIndex;

24
spine-as3/spine-as3/src/spine/flash/SkeletonSprite.as
View File

@ -53,23 +53,35 @@ public class SkeletonSprite extends Sprite {
var region:AtlasRegion = AtlasRegion(regionAttachment.rendererObject); var region:AtlasRegion = AtlasRegion(regionAttachment.rendererObject);
if (!wrapper) { if (!wrapper) {
var bitmapData:BitmapData = region.page.rendererObject as BitmapData; var bitmapData:BitmapData = region.page.rendererObject as BitmapData;
var regionData:BitmapData = new BitmapData(region.width, region.height); var regionData:BitmapData;
regionData.copyPixels(bitmapData, // if (region.rotate) {
new Rectangle(region.x, region.y, region.width, region.height), // regionData = new BitmapData(region.height, region.width);
new Point()); regionData.copyPixels(bitmapData, //
new Rectangle(region.x, region.y, region.height, region.width), //
new Point());
} else {
regionData = new BitmapData(region.width, region.height);
regionData.copyPixels(bitmapData, //
new Rectangle(region.x, region.y, region.width, region.height), //
new Point());
}
var bitmap:Bitmap = new Bitmap(regionData); var bitmap:Bitmap = new Bitmap(regionData);
bitmap.smoothing = true; bitmap.smoothing = true;
bitmap.x = -regionAttachment.width / 2; // Registration point. bitmap.x = -regionAttachment.width / 2; // Registration point.
bitmap.y = -regionAttachment.height / 2; bitmap.y = -regionAttachment.height / 2;
if (region.rotate) {
bitmap.rotation = 90;
bitmap.x += region.width;
}
wrapper = new Sprite(); wrapper = new Sprite();
wrapper.addChild(bitmap); wrapper.addChild(bitmap);
regionAttachment["wrapper"] = wrapper; regionAttachment["wrapper"] = wrapper;
} }
var bone:Bone = slot.bone; var bone:Bone = slot.bone;
var x:Number = regionAttachment.x + region.offsetX; var x:Number = regionAttachment.x - region.offsetX;
var y:Number = regionAttachment.y + region.offsetY; var y:Number = regionAttachment.y - region.offsetY;
wrapper.x = bone.worldX + x * bone.m00 + y * bone.m01; wrapper.x = bone.worldX + x * bone.m00 + y * bone.m01;
wrapper.y = bone.worldY + x * bone.m10 + y * bone.m11; wrapper.y = bone.worldY + x * bone.m10 + y * bone.m11;
wrapper.rotation = -(bone.worldRotation + regionAttachment.rotation); wrapper.rotation = -(bone.worldRotation + regionAttachment.rotation);