From 5a78663bfabb666784cb62e937e6d31c89e3c14b Mon Sep 17 00:00:00 2001 From: badlogic Date: Fri, 10 Aug 2018 11:57:11 +0200 Subject: [PATCH] [cocos2dx] Resolved merge conflict that got accidentially commited. --- spine-cocos2dx/src/spine/SkeletonRenderer.cpp | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/spine-cocos2dx/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/src/spine/SkeletonRenderer.cpp index 0356d88c5..86ba4e64e 100644 --- a/spine-cocos2dx/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/src/spine/SkeletonRenderer.cpp @@ -305,31 +305,10 @@ namespace spine { continue; } -<<<<<<< HEAD // Early exit if slot is invisible if (slot->getColor().a == 0) { _clipper->clipEnd(*slot); continue; -======= - if (!isTwoColorTint) { - triangles.indices = attachmentVertices->_triangles->indices; - triangles.indexCount = attachmentVertices->_triangles->indexCount; - triangles.verts = batch->allocateVertices(attachmentVertices->_triangles->vertCount); - triangles.vertCount = attachmentVertices->_triangles->vertCount; - memcpy(triangles.verts, attachmentVertices->_triangles->verts, sizeof(cocos2d::V3F_C4B_T2F) * attachmentVertices->_triangles->vertCount); - int vertexSizeInFloats = sizeof(cocos2d::V3F_C4B_T2F) / sizeof(float); - spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, attachment->super.worldVerticesLength, (float*)triangles.verts, 0, vertexSizeInFloats); - } else { - trianglesTwoColor.indices = attachmentVertices->_triangles->indices; - 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; - } - int vertexSizeInFloats = sizeof(V3F_C4B_C4B_T2F) / sizeof(float); - spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, attachment->super.worldVerticesLength, (float*)trianglesTwoColor.verts, 0, vertexSizeInFloats); ->>>>>>> 3.7-beta } cocos2d::TrianglesCommand::Triangles triangles;