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

Forgot some setError calls and cleanup

Browse Source
This commit is contained in:
Stephen Gowen 2017-12-03 16:40:04 -05:00
parent 2b2b34db00
commit 1f415cec9f
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
View File

@ -440,7 +440,7 @@ namespace Spine
if (length == 0 || !binary)
{
setError("Unable to read skeleton file: ", path);
return 0;
return NULL;
}
skeletonData = readSkeletonData((unsigned char*)binary, length);
FREE(binary);
@ -559,7 +559,7 @@ namespace Spine
int i, ii, nn;
if (slotCount == 0)
{
return 0;
return NULL;
}
skin = NEW(Skin);
@ -950,6 +950,12 @@ namespace Spine
duration = MAX(duration, timeline->_frames[(frameCount - 1) * TwoColorTimeline::ENTRIES]);
break;
}
default:
{
ContainerUtil::cleanUpVectorOfPointers(timelines);
setError("Invalid timeline type for a slot: ", skeletonData->_slots[slotIndex]->_name.c_str());
return NULL;
}
}
}
}
@ -1016,6 +1022,12 @@ namespace Spine
duration = MAX(duration, timeline->_frames[(frameCount - 1) * TranslateTimeline::ENTRIES]);
break;
}
default:
{
ContainerUtil::cleanUpVectorOfPointers(timelines);
setError("Invalid timeline type for a bone: ", skeletonData->_bones[boneIndex]->_name.c_str());
return NULL;
}
}
}
}
@ -1140,9 +1152,21 @@ namespace Spine
int slotIndex = readVarint(input, true);
for (int iii = 0, nnn = readVarint(input, true); iii < nnn; iii++)
{
const char* vertexAttachmentName = readString(input);
VertexAttachment* attachment = static_cast<VertexAttachment*>(skin->getAttachment(slotIndex, std::string(vertexAttachmentName)));
FREE(vertexAttachmentName);
const char* attachmentName = readString(input);
Attachment* baseAttachment = skin->getAttachment(slotIndex, std::string(attachmentName));
if (!baseAttachment)
{
ContainerUtil::cleanUpVectorOfPointers(timelines);
setError("Attachment not found: ", attachmentName);
FREE(attachmentName);
return NULL;
}
FREE(attachmentName);
VertexAttachment* attachment = static_cast<VertexAttachment*>(baseAttachment);
bool weighted = attachment->_bones.size() > 0;
Vector<float>& vertices = attachment->_vertices;
int deformLength = weighted ? static_cast<int>(vertices.size()) / 3 * 2 : static_cast<int>(vertices.size());