From b132231034af99cc2a4050bdecab16afff59cac0 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 28 Sep 2013 23:33:41 +0200 Subject: [PATCH] Scale bounding boxes on load. --- spine-c/src/spine/SkeletonJson.c | 2 +- spine-csharp/src/SkeletonJson.cs | 2 +- .../src/com/esotericsoftware/spine/SkeletonJson.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spine-c/src/spine/SkeletonJson.c b/spine-c/src/spine/SkeletonJson.c index 1cecaab4d..f4e28fb5d 100644 --- a/spine-c/src/spine/SkeletonJson.c +++ b/spine-c/src/spine/SkeletonJson.c @@ -464,7 +464,7 @@ SkeletonData* SkeletonJson_readSkeletonData (SkeletonJson* self, const char* jso box->verticesCount = verticesArray->size; box->vertices = MALLOC(float, verticesArray->size); for (vertex = verticesArray->child, i = 0; vertex; vertex = vertex->next, ++i) - box->vertices[i] = vertex->valueFloat; + box->vertices[i] = vertex->valueFloat * self->scale; break; } } diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs index c4fff9d2e..c3365a156 100644 --- a/spine-csharp/src/SkeletonJson.cs +++ b/spine-csharp/src/SkeletonJson.cs @@ -212,7 +212,7 @@ namespace Spine { List values = (List)map["vertices"]; float[] vertices = new float[values.Count]; for (int i = 0, n = values.Count; i < n; i++) - vertices[i] = (float)values[i]; + vertices[i] = (float)values[i] * scale; boundingBox.Vertices = vertices; } diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index d3a48380f..9a1a6eb0d 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -197,12 +197,12 @@ public class SkeletonJson { } else if (attachment instanceof BoundingBoxAttachment) { BoundingBoxAttachment box = (BoundingBoxAttachment)attachment; - JsonValue pointsArray = map.require("vertices"); - float[] points = new float[pointsArray.size]; + JsonValue verticesArray = map.require("vertices"); + float[] vertices = new float[verticesArray.size]; int i = 0; - for (JsonValue point = pointsArray.child; point != null; point = point.next()) - points[i++] = point.asFloat(); - box.setVertices(points); + for (JsonValue point = verticesArray.child; point != null; point = point.next()) + vertices[i++] = point.asFloat() * scale; + box.setVertices(vertices); } return attachment;