From ab15078b3e57a9f2f51af41c182df438c0c5da03 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 25 May 2014 08:55:14 +0200 Subject: [PATCH] Fixes. --- spine-as3/spine-as3/src/spine/animation/FfdTimeline.as | 2 +- spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as | 2 +- .../spine-as3/src/spine/attachments/SkinnedMeshAttachment.as | 2 +- .../spine/attachments/SkinnedMeshAttachment.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as b/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as index fa500c8dd..c77d4b8d9 100644 --- a/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as @@ -43,7 +43,7 @@ public class FfdTimeline extends CurveTimeline { public function FfdTimeline (frameCount:int) { super(frameCount); frames = new Vector.(frameCount, true); - frameVertices = new Vector.(frameCount, true); + frameVertices = new Vector.>(frameCount, true); } /** Sets the time and value of the specified keyframe. */ diff --git a/spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as b/spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as index e3052c0b9..b8827f4cb 100644 --- a/spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as +++ b/spine-as3/spine-as3/src/spine/attachments/MeshAttachment.as @@ -68,7 +68,7 @@ public dynamic class MeshAttachment extends Attachment { public function updateUVs () : void { var width:Number = regionU2 - regionU, height:Number = regionV2 - regionV; - var i:int, n:int = uvs.length; + var i:int, n:int = regionUVs.length; if (!uvs || uvs.length != n) uvs = new Vector.(n, true); if (regionRotate) { for (i = 0; i < n; i += 2) { diff --git a/spine-as3/spine-as3/src/spine/attachments/SkinnedMeshAttachment.as b/spine-as3/spine-as3/src/spine/attachments/SkinnedMeshAttachment.as index 630d203eb..74cf3f9b4 100644 --- a/spine-as3/spine-as3/src/spine/attachments/SkinnedMeshAttachment.as +++ b/spine-as3/spine-as3/src/spine/attachments/SkinnedMeshAttachment.as @@ -69,7 +69,7 @@ public dynamic class SkinnedMeshAttachment extends Attachment { public function updateUVs () : void { var width:Number = regionU2 - regionU, height:Number = regionV2 - regionV; - var i:int, n:int = uvs.length; + var i:int, n:int = regionUVs.length; if (!uvs || uvs.length != n) uvs = new Vector.(n, true); if (regionRotate) { for (i = 0; i < n; i += 2) { diff --git a/spine-libgdx/src/com/esotericsoftware/spine/attachments/SkinnedMeshAttachment.java b/spine-libgdx/src/com/esotericsoftware/spine/attachments/SkinnedMeshAttachment.java index 7f52b8a86..70c0af418 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/attachments/SkinnedMeshAttachment.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/attachments/SkinnedMeshAttachment.java @@ -70,6 +70,7 @@ public class SkinnedMeshAttachment extends Attachment { } public void updateUVs () { + float[] regionUVs = this.regionUVs; int verticesLength = regionUVs.length; int worldVerticesLength = verticesLength / 2 * 5; if (worldVertices == null || worldVertices.length != worldVerticesLength) worldVertices = new float[worldVerticesLength]; @@ -84,7 +85,6 @@ public class SkinnedMeshAttachment extends Attachment { width = region.getU2() - u; height = region.getV2() - v; } - float[] regionUVs = this.regionUVs; if (region instanceof AtlasRegion && ((AtlasRegion)region).rotate) { for (int i = 0, w = 3; i < verticesLength; i += 2, w += 5) { worldVertices[w] = u + regionUVs[i + 1] * width;