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

[as3] Port of mesh whitespaces stripping. See #1232.

Browse Source
This commit is contained in:
badlogic 2018-12-22 14:57:16 +01:00
parent d72302b94b
commit bcab346cde
8 changed files with 30 additions and 6 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/.settings/org.eclipse.core.resources.prefs
View File

@ -36,7 +36,9 @@ encoding//src/spine/animation/TrackEntry.as=UTF-8
encoding//src/spine/animation/TransformConstraintTimeline.as=UTF-8
encoding//src/spine/animation/TranslateTimeline.as=UTF-8
encoding//src/spine/animation/TwoColorTimeline.as=UTF-8
encoding//src/spine/attachments/AtlasAttachmentLoader.as=UTF-8
encoding//src/spine/attachments/ClippingAttachment.as=UTF-8
encoding//src/spine/attachments/MeshAttachment.as=UTF-8
encoding//src/spine/attachments/PointAttachment.as=UTF-8
encoding//src/spine/interpolation/Pow.as=UTF-8
encoding//src/spine/interpolation/PowOut.as=UTF-8

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

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

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

@ -52,6 +52,8 @@ package spine.attachments {
public var regionHeight : Number;
public var regionOriginalWidth : Number; // Unrotated, unstripped size.
public var regionOriginalHeight : Number;
public var regionTextureWidth: Number;
public var regionTextureHeight: Number;
// Nonessential.
public var edges : Vector.<int>;
public var width : Number;
@ -61,19 +63,35 @@ package spine.attachments {
super(name);
}
public function updateUVs() : void {
var width : Number = regionU2 - regionU, height : Number = regionV2 - regionV;
public function updateUVs() : void {
var i : int, n : int = regionUVs.length;
var u: Number, v: Number, width: Number, height: Number;
var widthO : Number = regionU2 - regionU, heightO : Number = regionV2 - regionV;
var uO = regionU, vO = regionV;
if (!uvs || uvs.length != n) uvs = new Vector.<Number>(n, true);
if (regionRotate) {
u = regionU - (regionOriginalHeight - regionOffsetY - regionHeight) / regionTextureWidth;
v = regionV - (regionOriginalWidth - regionOffsetX - regionWidth) / regionTextureHeight;
width = regionOriginalHeight / regionTextureWidth;
height = regionOriginalWidth / regionTextureHeight;
if (u != uO || v != vO || width != widthO || heightO != height) {
trace("fah");
}
for (i = 0; i < n; i += 2) {
uvs[i] = regionU + regionUVs[int(i + 1)] * width;
uvs[int(i + 1)] = regionV + height - regionUVs[i] * height;
uvs[i] = u + regionUVs[int(i + 1)] * width;
uvs[int(i + 1)] = v + height - regionUVs[i] * height;
}
} else {
u = regionU - regionOffsetX / regionTextureWidth;
v = regionV - (regionOriginalHeight - regionOffsetY - regionHeight) / regionTextureHeight;
width = regionOriginalWidth / regionTextureWidth;
height = regionOriginalHeight / regionTextureHeight;
if (u != uO || v != vO || width != widthO || heightO != height) {
trace("fah");
}
for (i = 0; i < n; i += 2) {
uvs[i] = regionU + regionUVs[i] * width;
uvs[int(i + 1)] = regionV + regionUVs[int(i + 1)] * height;
uvs[i] = u + regionUVs[i] * width;
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,6 +123,8 @@ package spine.starling {
attachment.regionHeight = texture.height;
attachment.regionOriginalWidth = frame ? frame.width : texture.width;
attachment.regionOriginalHeight = frame ? frame.height : texture.height;
attachment.regionTextureWidth = atlas.texture.width;
attachment.regionTextureHeight = atlas.texture.height;
if (rotated) {
var tmp : Number = attachment.regionOriginalWidth;
attachment.regionOriginalWidth = attachment.regionOriginalHeight;