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

[as3] Get rid of regionTextureWidth/Height

Browse Source
This commit is contained in:
badlogic 2018-12-22 15:38:26 +01:00
parent 48ea9b1914
commit f1f4ea04eb
7 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
spine-as3/spine-as3/src/spine/attachments/AtlasAttachmentLoader.as
View File

@ -79,8 +79,6 @@ package spine.attachments {
attachment.regionHeight = region.height; attachment.regionHeight = region.height;
attachment.regionOriginalWidth = region.originalWidth; attachment.regionOriginalWidth = region.originalWidth;
attachment.regionOriginalHeight = region.originalHeight; attachment.regionOriginalHeight = region.originalHeight;
attachment.regionTextureWidth = region.page.width;
attachment.regionTextureHeight = region.page.height;
return attachment; return attachment;
} }

31
spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as
View File

@ -52,8 +52,6 @@ package spine.attachments {
public var regionHeight : Number; public var regionHeight : Number;
public var regionOriginalWidth : Number; // Unrotated, unstripped size. public var regionOriginalWidth : Number; // Unrotated, unstripped size.
public var regionOriginalHeight : Number; public var regionOriginalHeight : Number;
public var regionTextureWidth: Number;
public var regionTextureHeight: Number;
// Nonessential. // Nonessential.
public var edges : Vector.<int>; public var edges : Vector.<int>;
public var width : Number; public var width : Number;
@ -66,29 +64,26 @@ package spine.attachments {
public function updateUVs() : void { public function updateUVs() : void {
var i : int, n : int = regionUVs.length; var i : int, n : int = regionUVs.length;
var u: Number, v: Number, width: Number, height: Number; var u: Number, v: Number, width: Number, height: Number;
var widthO : Number = regionU2 - regionU, heightO : Number = regionV2 - regionV; var textureWidth: Number, textureHeight: Number;
var uO = regionU, vO = regionV;
if (!uvs || uvs.length != n) uvs = new Vector.<Number>(n, true); if (!uvs || uvs.length != n) uvs = new Vector.<Number>(n, true);
if (regionRotate) { if (regionRotate) {
u = regionU - (regionOriginalHeight - regionOffsetY - regionHeight) / regionTextureWidth; textureHeight = regionWidth / (regionV2 - regionV);
v = regionV - (regionOriginalWidth - regionOffsetX - regionWidth) / regionTextureHeight; textureWidth = regionHeight / (regionU2 - regionU);
width = regionOriginalHeight / regionTextureWidth; u = regionU - (regionOriginalHeight - regionOffsetY - regionHeight) / textureWidth;
height = regionOriginalWidth / regionTextureHeight; v = regionV - (regionOriginalWidth - regionOffsetX - regionWidth) / textureHeight;
if (u != uO || v != vO || width != widthO || heightO != height) { width = regionOriginalHeight / textureWidth;
trace("fah"); height = regionOriginalWidth / textureHeight;
}
for (i = 0; i < n; i += 2) { for (i = 0; i < n; i += 2) {
uvs[i] = u + regionUVs[int(i + 1)] * width; uvs[i] = u + regionUVs[int(i + 1)] * width;
uvs[int(i + 1)] = v + height - regionUVs[i] * height; uvs[int(i + 1)] = v + height - regionUVs[i] * height;
} }
} else { } else {
u = regionU - regionOffsetX / regionTextureWidth; textureWidth = regionWidth / (regionU2 - regionU);
v = regionV - (regionOriginalHeight - regionOffsetY - regionHeight) / regionTextureHeight; textureHeight = regionHeight / (regionV2 - regionV);
width = regionOriginalWidth / regionTextureWidth; u = regionU - regionOffsetX / textureWidth;
height = regionOriginalHeight / regionTextureHeight; v = regionV - (regionOriginalHeight - regionOffsetY - regionHeight) / textureHeight;
if (u != uO || v != vO || width != widthO || heightO != height) { width = regionOriginalWidth / textureWidth;
trace("fah"); height = regionOriginalHeight / textureHeight;
}
for (i = 0; i < n; i += 2) { for (i = 0; i < n; i += 2) {
uvs[i] = u + regionUVs[i] * width; uvs[i] = u + regionUVs[i] * width;
uvs[int(i + 1)] = v + regionUVs[int(i + 1)] * height; uvs[int(i + 1)] = v + regionUVs[int(i + 1)] * height;

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@ -123,8 +123,6 @@ 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;
attachment.regionTextureWidth = atlas.texture.width;
attachment.regionTextureHeight = atlas.texture.height;
if (rotated) { if (rotated) {
var tmp : Number = attachment.regionOriginalWidth; var tmp : Number = attachment.regionOriginalWidth;
attachment.regionOriginalWidth = attachment.regionOriginalHeight; attachment.regionOriginalWidth = attachment.regionOriginalHeight;