mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
[c] Proper fix for #666, VertexAttachment#verticesCount means #vertices for box and path attachment, but means something else for mesh attachments.
This commit is contained in:
parent
5784a46512
commit
11941cfe0b
@ -944,7 +944,9 @@ 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);
|
||||||
_readVertices(self, attachmentMap, SUPER(box), Json_getInt(attachmentMap, "vertexCount", 0) << 1);
|
int vertexCount = Json_getInt(attachmentMap, "vertexCount", 0) << 1;
|
||||||
|
_readVertices(self, attachmentMap, SUPER(box), vertexCount);
|
||||||
|
box->super.verticesCount = vertexCount;
|
||||||
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
|
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -955,6 +957,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
|
|||||||
path->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1);
|
path->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1);
|
||||||
vertexCount = Json_getInt(attachmentMap, "vertexCount", 0);
|
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);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user