diff --git a/cocos/editor-support/spine/Animation.c b/cocos/editor-support/spine/Animation.c index c42fc7d0d7..6c3fea6f2b 100644 --- a/cocos/editor-support/spine/Animation.c +++ b/cocos/editor-support/spine/Animation.c @@ -745,7 +745,7 @@ void _spAttachmentTimeline_apply (const spTimeline* timeline, spSkeleton* skelet spSlot* slot = skeleton->slots[self->slotIndex]; if (direction == SP_MIX_DIRECTION_OUT && pose == SP_MIX_POSE_SETUP) { - const char* attachmentName = slot->data->attachmentName; + attachmentName = slot->data->attachmentName; spSlot_setAttachment(slot, attachmentName ? spSkeleton_getAttachmentForSlotIndex(skeleton, self->slotIndex, attachmentName) : 0); return; } diff --git a/cocos/editor-support/spine/SkeletonAnimation.cpp b/cocos/editor-support/spine/SkeletonAnimation.cpp index 2186154bd7..acf53fea8b 100644 --- a/cocos/editor-support/spine/SkeletonAnimation.cpp +++ b/cocos/editor-support/spine/SkeletonAnimation.cpp @@ -114,8 +114,6 @@ void SkeletonAnimation::initialize () { _state = spAnimationState_create(spAnimationStateData_create(_skeleton->data)); _state->rendererObject = this; _state->listener = animationCallback; - - _spAnimationState* stateInternal = (_spAnimationState*)_state; } SkeletonAnimation::SkeletonAnimation () diff --git a/cocos/editor-support/spine/SkeletonBatch.cpp b/cocos/editor-support/spine/SkeletonBatch.cpp index c196caf185..7ac3ce419c 100644 --- a/cocos/editor-support/spine/SkeletonBatch.cpp +++ b/cocos/editor-support/spine/SkeletonBatch.cpp @@ -146,8 +146,8 @@ void SkeletonBatch::reset() { cocos2d::TrianglesCommand* SkeletonBatch::nextFreeCommand() { if (_commandsPool.size() <= _nextFreeCommand) { - unsigned int newSize = _commandsPool.size() * 2 + 1; - for (int i = _commandsPool.size(); i < newSize; i++) { + size_t newSize = _commandsPool.size() * 2 + 1; + for (size_t i = _commandsPool.size(); i < newSize; i++) { _commandsPool.push_back(new TrianglesCommand()); } } diff --git a/cocos/editor-support/spine/SkeletonBinary.c b/cocos/editor-support/spine/SkeletonBinary.c index 3ed69e7b47..97168a5bb0 100644 --- a/cocos/editor-support/spine/SkeletonBinary.c +++ b/cocos/editor-support/spine/SkeletonBinary.c @@ -307,9 +307,8 @@ static spAnimation* _spSkeletonBinary_readAnimation (spSkeletonBinary* self, con break; } default: { - int i; - for (i = 0; i < kv_size(timelines); ++i) - spTimeline_dispose(kv_A(timelines, i)); + for (iii = 0; iii < kv_size(timelines); ++iii) + spTimeline_dispose(kv_A(timelines, iii)); kv_destroy(timelines); _spSkeletonBinary_setError(self, "Invalid timeline type for a slot: ", skeletonData->slots[slotIndex]->name); return 0; @@ -370,9 +369,8 @@ static spAnimation* _spSkeletonBinary_readAnimation (spSkeletonBinary* self, con break; } default: { - int i; - for (i = 0; i < kv_size(timelines); ++i) - spTimeline_dispose(kv_A(timelines, i)); + for (iii = 0; iii < kv_size(timelines); ++iii) + spTimeline_dispose(kv_A(timelines, iii)); kv_destroy(timelines); _spSkeletonBinary_setError(self, "Invalid timeline type for a bone: ", skeletonData->bones[boneIndex]->name); return 0; @@ -482,9 +480,9 @@ static spAnimation* _spSkeletonBinary_readAnimation (spSkeletonBinary* self, con spVertexAttachment* attachment = SUB_CAST(spVertexAttachment, spSkin_getAttachment(skin, slotIndex, attachmentName)); if (!attachment) { - int i; - for (i = 0; i < kv_size(timelines); ++i) - spTimeline_dispose(kv_A(timelines, i)); + int iiii; + for (iiii = 0; iiii < kv_size(timelines); ++iiii) + spTimeline_dispose(kv_A(timelines, iiii)); kv_destroy(timelines); _spSkeletonBinary_setError(self, "Attachment not found: ", attachmentName); FREE(attachmentName); @@ -601,7 +599,7 @@ static spAnimation* _spSkeletonBinary_readAnimation (spSkeletonBinary* self, con animation = spAnimation_create(name, 0); FREE(animation->timelines); animation->duration = duration; - animation->timelinesCount = kv_size(timelines); + animation->timelinesCount = (int)kv_size(timelines); animation->timelines = kv_array(timelines); return animation; } @@ -665,11 +663,11 @@ static void _readVertices(spSkeletonBinary* self, _dataInput* input, spVertexAtt } kv_trim(float, weights); - attachment->verticesCount = kv_size(weights); + attachment->verticesCount = (int)kv_size(weights); attachment->vertices = kv_array(weights); kv_trim(int, bones); - attachment->bonesCount = kv_size(bones); + attachment->bonesCount = (int)kv_size(bones); attachment->bones = kv_array(bones); } diff --git a/cocos/editor-support/spine/SkeletonJson.c b/cocos/editor-support/spine/SkeletonJson.c index 120f165c25..87808de419 100644 --- a/cocos/editor-support/spine/SkeletonJson.c +++ b/cocos/editor-support/spine/SkeletonJson.c @@ -404,33 +404,33 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r for (valueMap = timelineMap->child, frameIndex = 0; valueMap; valueMap = valueMap->next, ++frameIndex) { Json* vertices = Json_getItem(valueMap, "vertices"); - float* deform; + float* deform2; if (!vertices) { if (weighted) { - deform = tempDeform; + deform2 = tempDeform; memset(deform, 0, sizeof(float) * deformLength); } else - deform = attachment->vertices; + deform2 = attachment->vertices; } else { int v, start = Json_getInt(valueMap, "offset", 0); Json* vertex; - deform = tempDeform; + deform2 = tempDeform; memset(deform, 0, sizeof(float) * start); if (self->scale == 1) { for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v) - deform[v] = vertex->valueFloat; + deform2[v] = vertex->valueFloat; } else { for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v) - deform[v] = vertex->valueFloat * self->scale; + deform2[v] = vertex->valueFloat * self->scale; } memset(deform + v, 0, sizeof(float) * (deformLength - v)); if (!weighted) { - float* vertices = attachment->vertices; + float* verticesAttachment = attachment->vertices; for (v = 0; v < deformLength; ++v) - deform[v] += vertices[v]; + deform2[v] += verticesAttachment[v]; } } - spDeformTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), deform); + spDeformTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), deform2); readCurve(valueMap, SUPER(timeline), frameIndex); } FREE(tempDeform); @@ -446,16 +446,16 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r spDrawOrderTimeline* timeline = spDrawOrderTimeline_create(drawOrder->size, skeletonData->slotsCount); for (valueMap = drawOrder->child, frameIndex = 0; valueMap; valueMap = valueMap->next, ++frameIndex) { int ii; - int* drawOrder = 0; + int* drawOrder2 = 0; Json* offsets = Json_getItem(valueMap, "offsets"); if (offsets) { Json* offsetMap; int* unchanged = MALLOC(int, skeletonData->slotsCount - offsets->size); int originalIndex = 0, unchangedIndex = 0; - drawOrder = MALLOC(int, skeletonData->slotsCount); + drawOrder2 = MALLOC(int, skeletonData->slotsCount); for (ii = skeletonData->slotsCount - 1; ii >= 0; --ii) - drawOrder[ii] = -1; + drawOrder2[ii] = -1; for (offsetMap = offsets->child; offsetMap; offsetMap = offsetMap->next) { int slotIndex = spSkeletonData_findSlotIndex(skeletonData, Json_getString(offsetMap, "slot", 0)); @@ -468,7 +468,7 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r while (originalIndex != slotIndex) unchanged[unchangedIndex++] = originalIndex++; /* Set changed items. */ - drawOrder[originalIndex + Json_getInt(offsetMap, "offset", 0)] = originalIndex; + drawOrder2[originalIndex + Json_getInt(offsetMap, "offset", 0)] = originalIndex; originalIndex++; } /* Collect remaining unchanged items. */ @@ -476,11 +476,11 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r unchanged[unchangedIndex++] = originalIndex++; /* Fill in unchanged items. */ for (ii = skeletonData->slotsCount - 1; ii >= 0; ii--) - if (drawOrder[ii] == -1) drawOrder[ii] = unchanged[--unchangedIndex]; + if (drawOrder2[ii] == -1) drawOrder2[ii] = unchanged[--unchangedIndex]; FREE(unchanged); } - spDrawOrderTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), drawOrder); - FREE(drawOrder); + spDrawOrderTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), drawOrder2); + FREE(drawOrder2); } animation->timelines[animation->timelinesCount++] = SUPER_CAST(spTimeline, timeline); animation->duration = MAX(animation->duration, timeline->frames[drawOrder->size - 1]); @@ -885,7 +885,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha spAttachment* attachment; const char* skinAttachmentName = attachmentMap->name; const char* attachmentName = Json_getString(attachmentMap, "name", skinAttachmentName); - const char* path = Json_getString(attachmentMap, "path", attachmentName); + const char* attachmentPath = Json_getString(attachmentMap, "path", attachmentName); const char* color; Json* entry; @@ -909,7 +909,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha return 0; } - attachment = spAttachmentLoader_createAttachment(self->attachmentLoader, skin, type, attachmentName, path); + attachment = spAttachmentLoader_createAttachment(self->attachmentLoader, skin, type, attachmentName, attachmentPath); if (!attachment) { if (self->attachmentLoader->error1) { spSkeletonData_dispose(skeletonData); @@ -922,7 +922,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha switch (attachment->type) { case SP_ATTACHMENT_REGION: { spRegionAttachment* region = SUB_CAST(spRegionAttachment, attachment); - if (path) MALLOC_STR(region->path, path); + if (path) MALLOC_STR(region->path, attachmentPath); region->x = Json_getFloat(attachmentMap, "x", 0) * self->scale; region->y = Json_getFloat(attachmentMap, "y", 0) * self->scale; region->scaleX = Json_getFloat(attachmentMap, "scaleX", 1); @@ -949,7 +949,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha case SP_ATTACHMENT_LINKED_MESH: { spMeshAttachment* mesh = SUB_CAST(spMeshAttachment, attachment); - MALLOC_STR(mesh->path, path); + MALLOC_STR(mesh->path, attachmentPath); color = Json_getString(attachmentMap, "color", 0); if (color) { @@ -1009,19 +1009,19 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha break; } case SP_ATTACHMENT_PATH: { - spPathAttachment* path = SUB_CAST(spPathAttachment, attachment); + spPathAttachment* pathAttatchment = SUB_CAST(spPathAttachment, attachment); int vertexCount = 0; - path->closed = Json_getInt(attachmentMap, "closed", 0); - path->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1); + pathAttatchment->closed = Json_getInt(attachmentMap, "closed", 0); + pathAttatchment->constantSpeed = Json_getInt(attachmentMap, "constantSpeed", 1); vertexCount = Json_getInt(attachmentMap, "vertexCount", 0); - _readVertices(self, attachmentMap, SUPER(path), vertexCount << 1); + _readVertices(self, attachmentMap, SUPER(pathAttatchment), vertexCount << 1); - path->lengthsLength = vertexCount / 3; - path->lengths = MALLOC(float, path->lengthsLength); + pathAttatchment->lengthsLength = vertexCount / 3; + pathAttatchment->lengths = MALLOC(float, pathAttatchment->lengthsLength); curves = Json_getItem(attachmentMap, "lengths"); for (curves = curves->child, ii = 0; curves; curves = curves->next, ++ii) { - path->lengths[ii] = curves->valueFloat * self->scale; + pathAttatchment->lengths[ii] = curves->valueFloat * self->scale; } break; } diff --git a/cocos/editor-support/spine/SkeletonRenderer.cpp b/cocos/editor-support/spine/SkeletonRenderer.cpp index 3d90d955ce..b486f34d02 100644 --- a/cocos/editor-support/spine/SkeletonRenderer.cpp +++ b/cocos/editor-support/spine/SkeletonRenderer.cpp @@ -224,8 +224,8 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; trianglesTwoColor.verts = twoColorBatch->allocateVertices(attachmentVertices->_triangles->vertCount); trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; - for (int i = 0; i < trianglesTwoColor.vertCount; i++) { - trianglesTwoColor.verts[i].texCoords = attachmentVertices->_triangles->verts[i].texCoords; + for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) { + trianglesTwoColor.verts[ii].texCoords = attachmentVertices->_triangles->verts[ii].texCoords; } spRegionAttachment_computeWorldVertices(attachment, slot->bone, (float*)trianglesTwoColor.verts, 0, 7); } @@ -253,8 +253,8 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; trianglesTwoColor.verts = twoColorBatch->allocateVertices(attachmentVertices->_triangles->vertCount); trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; - for (int i = 0; i < trianglesTwoColor.vertCount; i++) { - trianglesTwoColor.verts[i].texCoords = attachmentVertices->_triangles->verts[i].texCoords; + for (int ii = 0; i < trianglesTwoColor.vertCount; ii++) { + trianglesTwoColor.verts[ii].texCoords = attachmentVertices->_triangles->verts[ii].texCoords; } spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, trianglesTwoColor.vertCount * sizeof(V3F_C4B_C4B_T2F) / 4, (float*)trianglesTwoColor.verts, 0, 7); } diff --git a/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp b/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp index 46b92e9223..3fb4612747 100644 --- a/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp +++ b/cocos/editor-support/spine/SkeletonTwoColorBatch.cpp @@ -336,8 +336,8 @@ void SkeletonTwoColorBatch::reset() { TwoColorTrianglesCommand* SkeletonTwoColorBatch::nextFreeCommand() { if (_commandsPool.size() <= _nextFreeCommand) { - unsigned int newSize = _commandsPool.size() * 2 + 1; - for (int i = _commandsPool.size(); i < newSize; i++) { + size_t newSize = _commandsPool.size() * 2 + 1; + for (size_t i = _commandsPool.size(); i < newSize; i++) { _commandsPool.push_back(new TwoColorTrianglesCommand()); } } diff --git a/cocos/editor-support/spine/Triangulator.c b/cocos/editor-support/spine/Triangulator.c index c09976546b..bc47382585 100644 --- a/cocos/editor-support/spine/Triangulator.c +++ b/cocos/editor-support/spine/Triangulator.c @@ -152,8 +152,9 @@ spShortArray* spTriangulator_triangulate(spTriangulator* self, spFloatArray* ver spShortArray_ensureCapacity(triangles, MAX(0, vertexCount - 2) << 2); while (vertexCount > 3) { - int previous = vertexCount - 1, i = 0, next = 1; + int previous = vertexCount - 1, next = 1; int previousIndex, nextIndex; + i = 0; while (1) { if (!isConcave[i]) { int p1 = indices[previous] << 1, p2 = indices[i] << 1, p3 = indices[next] << 1;