UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-06 10:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cocos2dx] Fix merged code.

Browse Source
This commit is contained in:
Mario Zechner 2022-10-03 14:55:08 +02:00
parent 63d3971ffe
commit 1c6de8ff47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -284,7 +284,7 @@ namespace spine {
if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) { if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) {
RegionAttachment *attachment = static_cast<RegionAttachment *>(slot->getAttachment()); RegionAttachment *attachment = static_cast<RegionAttachment *>(slot->getAttachment());
texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->getRendererObject(); texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->texture;
float *dstTriangleVertices = nullptr; float *dstTriangleVertices = nullptr;
int dstStride = 0;// in floats int dstStride = 0;// in floats
@ -322,7 +322,7 @@ namespace spine {
color = attachment->getColor(); color = attachment->getColor();
} else if (slot->getAttachment()->getRTTI().isExactly(MeshAttachment::rtti)) { } else if (slot->getAttachment()->getRTTI().isExactly(MeshAttachment::rtti)) {
MeshAttachment *attachment = (MeshAttachment *) slot->getAttachment(); MeshAttachment *attachment = (MeshAttachment *) slot->getAttachment();
texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->getRendererObject(); texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->texture;
float *dstTriangleVertices = nullptr; float *dstTriangleVertices = nullptr;
int dstStride = 0;// in floats int dstStride = 0;// in floats