UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c] Reverted vertexCount sanity. badlogic was right, it's more complex than it seems! See #669

Browse Source
This commit is contained in:
NathanSweet 2016-08-10 19:48:52 +02:00
parent 942cf272fa
commit 94dcbf4125
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-c/src/spine/SkeletonJson.c
View File

@ -511,7 +511,7 @@ static void _readVertices (spSkeletonJson* self, Json* attachmentMap, spVertexAt
if (self->scale != 1) if (self->scale != 1)
for (i = 0; i < entrySize; ++i) for (i = 0; i < entrySize; ++i)
vertices[i] *= self->scale; vertices[i] *= self->scale;
attachment->verticesCount = verticesLength >> 1; attachment->verticesCount = verticesLength;
attachment->vertices = vertices; attachment->vertices = vertices;
attachment->bonesCount = 0; attachment->bonesCount = 0;
@ -944,17 +944,20 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
} }
case SP_ATTACHMENT_BOUNDING_BOX: { case SP_ATTACHMENT_BOUNDING_BOX: {
spBoundingBoxAttachment* box = SUB_CAST(spBoundingBoxAttachment, attachment); spBoundingBoxAttachment* box = SUB_CAST(spBoundingBoxAttachment, attachment);
int vertexCount = Json_getInt(attachmentMap, "vertexCount", 0); int vertexCount = Json_getInt(attachmentMap, "vertexCount", 0) << 1;
_readVertices(self, attachmentMap, SUPER(box), vertexCount << 1); _readVertices(self, attachmentMap, SUPER(box), vertexCount);
box->super.verticesCount = vertexCount;
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment); spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
break; break;
} }
case SP_ATTACHMENT_PATH: { case SP_ATTACHMENT_PATH: {
spPathAttachment* path = SUB_CAST(spPathAttachment, attachment); spPathAttachment* path = SUB_CAST(spPathAttachment, attachment);
int vertexCount = Json_getInt(attachmentMap, "vertexCount", 0); int vertexCount = 0;
path->closed = Json_getInt(attachmentMap, "closed", 0); path->closed = Json_getInt(attachmentMap, "closed", 0);
path->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1); path->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1);
vertexCount = Json_getInt(attachmentMap, "vertexCount", 0);
_readVertices(self, attachmentMap, SUPER(path), vertexCount << 1); _readVertices(self, attachmentMap, SUPER(path), vertexCount << 1);
path->super.verticesCount = vertexCount;
path->lengthsLength = vertexCount / 3; path->lengthsLength = vertexCount / 3;
path->lengths = MALLOC(float, path->lengthsLength); path->lengths = MALLOC(float, path->lengthsLength);