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

Manually merged PR #952

Browse Source
This commit is contained in:
badlogic 2017-07-28 10:59:04 +02:00
parent de44f15620
commit c7f96ebc70
2 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
spine-starling/spine-starling-example/lib/spine-starling.swc
View File

Binary file not shown.

25
spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as
View File

@ -50,7 +50,6 @@ package spine.starling {
public function StarlingAtlasAttachmentLoader(atlas : TextureAtlas) { public function StarlingAtlasAttachmentLoader(atlas : TextureAtlas) {
this.atlas = atlas; this.atlas = atlas;
Bone.yDown = true; Bone.yDown = true;
} }
@ -59,11 +58,11 @@ package spine.starling {
} }
public function newRegionAttachment(skin : Skin, name : String, path : String) : RegionAttachment { public function newRegionAttachment(skin : Skin, name : String, path : String) : RegionAttachment {
var texture : SubTexture = getTexture(path) as SubTexture;//atlas.getTexture() method always return type of SubTexture var texture : SubTexture = getTexture(path) as SubTexture;
if (texture == null) if (texture == null)
throw new Error("Region not found in Starling atlas: " + path + " (region attachment: " + name + ")"); throw new Error("Region not found in Starling atlas: " + path + " (region attachment: " + name + ")");
var attachment : RegionAttachment = new RegionAttachment(name); var attachment : RegionAttachment = new RegionAttachment(name);
var rotated : Boolean = texture.rotated;//if texture == null you trhow exception, that is why atlas.getRotation() method always return texture.rotated. var rotated : Boolean = texture.rotated;
attachment.rendererObject = new Image(Texture.fromTexture(texture)); // Discard frame. attachment.rendererObject = new Image(Texture.fromTexture(texture)); // Discard frame.
var frame : Rectangle = texture.frame; var frame : Rectangle = texture.frame;
attachment.regionOffsetX = frame ? -frame.x : 0; attachment.regionOffsetX = frame ? -frame.x : 0;
@ -97,12 +96,11 @@ package spine.starling {
var texture : SubTexture = getTexture(path) as SubTexture; var texture : SubTexture = getTexture(path) as SubTexture;
if (texture == null) if (texture == null)
throw new Error("Region not found in Starling atlas: " + path + " (mesh attachment: " + name + ")"); throw new Error("Region not found in Starling atlas: " + path + " (mesh attachment: " + name + ")");
var rotated : Boolean =texture.rotated; var rotated : Boolean = texture.rotated;
var attachment : MeshAttachment = new MeshAttachment(name); var attachment : MeshAttachment = new MeshAttachment(name);
attachment.regionRotate = rotated; attachment.regionRotate = rotated;
attachment.rendererObject = new Image(Texture.fromTexture(texture)); // Discard frame. attachment.rendererObject = new Image(Texture.fromTexture(texture)); // Discard frame.
// var subTexture : SubTexture = texture as SubTexture;
// if (subTexture) {//subTexture can't be null (line 99)
var root : Texture = texture.root; var root : Texture = texture.root;
var rectRegion : Rectangle = atlas.getRegion(path); var rectRegion : Rectangle = atlas.getRegion(path);
if (!rotated) { if (!rotated) {
@ -117,20 +115,7 @@ package spine.starling {
attachment.regionV = (rectRegion.y + texture.width) / root.height; attachment.regionV = (rectRegion.y + texture.width) / root.height;
} }
attachment.rendererObject = new Image(root); attachment.rendererObject = new Image(root);
// } else {
//Code never reached to here. if subTextre==null you throw exception.
// if (!rotated) {
// attachment.regionU = 0;
// attachment.regionV = 1;
// attachment.regionU2 = 1;
// attachment.regionV2 = 0;
// } else {
// attachment.regionU2 = 0;
// attachment.regionV2 = 1;
// attachment.regionU = 1;
// attachment.regionV = 0;
// }
// }
var frame : Rectangle = texture.frame; var frame : Rectangle = texture.frame;
attachment.regionOffsetX = frame ? -frame.x : 0; attachment.regionOffsetX = frame ? -frame.x : 0;
attachment.regionOffsetY = frame ? -frame.y : 0; attachment.regionOffsetY = frame ? -frame.y : 0;