From e20382a30413a41c48c41aa1b5aa2265a1dd1639 Mon Sep 17 00:00:00 2001 From: Stephen Gowen Date: Wed, 6 Dec 2017 17:30:48 -0500 Subject: [PATCH] Now I understand the origin of this deform2 and awkward memset function, haha --- spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp index 493b62e4f..4673c305a 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp @@ -1201,35 +1201,35 @@ namespace Spine for (valueMap = timelineMap->_child, frameIndex = 0; valueMap; valueMap = valueMap->_next, ++frameIndex) { Json* vertices = Json::getItem(valueMap, "vertices"); - Vector deform2; + Vector deform; if (!vertices) { if (weighted) { - deform2 = tempDeform; + deform = tempDeform; } else { - deform2 = attachment->_vertices; + deform = attachment->_vertices; } } else { int v, start = Json::getInt(valueMap, "offset", 0); Json* vertex; - deform2 = tempDeform; + deform = tempDeform; if (_scale == 1) { for (vertex = vertices->_child, v = start; vertex; vertex = vertex->_next, ++v) { - deform2[v] = vertex->_valueFloat; + deform[v] = vertex->_valueFloat; } } else { for (vertex = vertices->_child, v = start; vertex; vertex = vertex->_next, ++v) { - deform2[v] = vertex->_valueFloat * _scale; + deform[v] = vertex->_valueFloat * _scale; } } if (!weighted) @@ -1237,11 +1237,11 @@ namespace Spine Vector& verticesAttachment = attachment->_vertices; for (v = 0; v < deformLength; ++v) { - deform2[v] += verticesAttachment[v]; + deform[v] += verticesAttachment[v]; } } } - timeline->setFrame(frameIndex, Json::getFloat(valueMap, "time", 0), deform2); + timeline->setFrame(frameIndex, Json::getFloat(valueMap, "time", 0), deform); readCurve(valueMap, timeline, frameIndex); }