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

[starling] Added support for rotated regions in atlases loaded via StarlingAttachmentLoader. Closes #897

Browse Source
This commit is contained in:
badlogic 2017-05-10 15:32:02 +02:00
parent 66c6d5cd89
commit 2b60e8f3b2
5 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@
* Fixed renderer to work with 3.6 changes. * Fixed renderer to work with 3.6 changes.
* Added support for two color tinting. * Added support for two color tinting.
* Added support for clipping. * Added support for clipping.
* Added support for rotated regions in texture atlas loaded via StarlingAtlasAttachmentLoader.
## C ## C
* **Breaking changes** * **Breaking changes**

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

Binary file not shown.

2
spine-starling/spine-starling-example/src/spine/examples/CoinExample.as
View File

@ -65,7 +65,7 @@ package spine.examples {
var skeletonData : SkeletonData = json.readSkeletonData(new CoinJson()); var skeletonData : SkeletonData = json.readSkeletonData(new CoinJson());
this.x = 400; this.x = 400;
this.y = 400; this.y = 600;
skeleton = new SkeletonAnimation(skeletonData); skeleton = new SkeletonAnimation(skeletonData);
skeleton.state.setAnimationByName(0, "rotate", true); skeleton.state.setAnimationByName(0, "rotate", true);

3
spine-starling/spine-starling-example/src/spine/examples/Main.as
View File

@ -38,8 +38,7 @@ package spine.examples {
private var _starling : Starling; private var _starling : Starling;
public function Main() { public function Main() {
// _starling = new Starling(SpineboyExample, stage); _starling = new Starling(SpineboyExample, stage);
_starling = new Starling(RaptorExample, stage);
_starling.enableErrorChecking = true; _starling.enableErrorChecking = true;
_starling.showStats = true; _starling.showStats = true;
_starling.skipUnchangedFrames = false; _starling.skipUnchangedFrames = false;

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

@ -58,10 +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 : Texture = atlas.getTexture(path); var texture : Texture = atlas.getTexture(path);
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 = atlas.getRotation(path);
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;
@ -70,20 +71,42 @@ package spine.starling {
attachment.regionHeight = texture.height; attachment.regionHeight = texture.height;
attachment.regionOriginalWidth = frame ? frame.width : texture.width; attachment.regionOriginalWidth = frame ? frame.width : texture.width;
attachment.regionOriginalHeight = frame ? frame.height : texture.height; attachment.regionOriginalHeight = frame ? frame.height : texture.height;
if (rotated) {
var tmp : Number = attachment.regionOriginalWidth;
attachment.regionOriginalWidth = attachment.regionOriginalHeight;
attachment.regionOriginalHeight = tmp;
tmp = attachment.regionWidth;
attachment.regionWidth = attachment.regionHeight;
attachment.regionHeight = tmp;
}
var subTexture : SubTexture = texture as SubTexture; var subTexture : SubTexture = texture as SubTexture;
if (subTexture) { if (subTexture) {
var root : Texture = subTexture.root; var root : Texture = subTexture.root;
var rectRegion : Rectangle = atlas.getRegion(path); var rectRegion : Rectangle = atlas.getRegion(path);
attachment["regionU"] = rectRegion.x / root.width; if (!rotated) {
attachment["regionV"] = rectRegion.y / root.height; attachment["regionU"] = rectRegion.x / root.width;
attachment["regionU2"] = (rectRegion.x + subTexture.width) / root.width; attachment["regionV"] = rectRegion.y / root.height;
attachment["regionV2"] = (rectRegion.y + subTexture.height) / root.height; attachment["regionU2"] = (rectRegion.x + subTexture.width) / root.width;
attachment["regionV2"] = (rectRegion.y + subTexture.height) / root.height;
} else {
attachment["regionU2"] = rectRegion.x / root.width;
attachment["regionV2"] = rectRegion.y / root.height;
attachment["regionU"] = (rectRegion.x + subTexture.width) / root.width;
attachment["regionV"] = (rectRegion.y + subTexture.height) / root.height;
}
attachment.setUVs(attachment["regionU"], attachment["regionV"], attachment["regionU2"], attachment["regionV2"], atlas.getRotation(path)); attachment.setUVs(attachment["regionU"], attachment["regionV"], attachment["regionU2"], attachment["regionV2"], atlas.getRotation(path));
} else { } else {
attachment["regionU"] = 0; if (!rotated) {
attachment["regionV"] = 1; attachment["regionU"] = 0;
attachment["regionU2"] = 1; attachment["regionV"] = 1;
attachment["regionV2"] = 0; attachment["regionU2"] = 1;
attachment["regionV2"] = 0;
} else {
attachment["regionU2"] = 0;
attachment["regionV2"] = 1;
attachment["regionU"] = 1;
attachment["regionV"] = 0;
}
} }
return attachment; return attachment;
} }
@ -92,22 +115,38 @@ package spine.starling {
var texture : Texture = atlas.getTexture(path); var texture : Texture = atlas.getTexture(path);
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 = atlas.getRotation(path);
var attachment : MeshAttachment = new MeshAttachment(name); var attachment : MeshAttachment = new MeshAttachment(name);
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; var subTexture : SubTexture = texture as SubTexture;
if (subTexture) { if (subTexture) {
var root : Texture = subTexture.root; var root : Texture = subTexture.root;
var rectRegion : Rectangle = atlas.getRegion(path); var rectRegion : Rectangle = atlas.getRegion(path);
attachment.regionU = rectRegion.x / root.width; if (!rotated) {
attachment.regionV = rectRegion.y / root.height; attachment.regionU = rectRegion.x / root.width;
attachment.regionU2 = (rectRegion.x + subTexture.width) / root.width; attachment.regionV = rectRegion.y / root.height;
attachment.regionV2 = (rectRegion.y + subTexture.height) / root.height; attachment.regionU2 = (rectRegion.x + subTexture.width) / root.width;
attachment.regionV2 = (rectRegion.y + subTexture.height) / root.height;
} else {
attachment.regionU2 = rectRegion.x / root.width;
attachment.regionV2 = rectRegion.y / root.height;
attachment.regionU = (rectRegion.x + subTexture.height) / root.width;
attachment.regionV = (rectRegion.y + subTexture.width) / root.height;
}
attachment.rendererObject = new Image(root); attachment.rendererObject = new Image(root);
} else { } else {
attachment.regionU = 0; if (!rotated) {
attachment.regionV = 1; attachment.regionU = 0;
attachment.regionU2 = 1; attachment.regionV = 1;
attachment.regionV2 = 0; 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;
@ -116,6 +155,14 @@ package spine.starling {
attachment.regionHeight = texture.height; attachment.regionHeight = texture.height;
attachment.regionOriginalWidth = frame ? frame.width : texture.width; attachment.regionOriginalWidth = frame ? frame.width : texture.width;
attachment.regionOriginalHeight = frame ? frame.height : texture.height; attachment.regionOriginalHeight = frame ? frame.height : texture.height;
if (rotated) {
var tmp : Number = attachment.regionOriginalWidth;
attachment.regionOriginalWidth = attachment.regionOriginalHeight;
attachment.regionOriginalHeight = tmp;
tmp = attachment.regionWidth;
attachment.regionWidth = attachment.regionHeight;
attachment.regionHeight = tmp;
}
return attachment; return attachment;
} }