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

[cpp] Fix rendererObject assignment in sequence loading code

Browse Source
This commit is contained in:
Mario Zechner 2024-07-01 16:24:18 +02:00
parent e12b71bb1a
commit e9aab1c94e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
View File

@ -50,7 +50,6 @@ namespace spine {
String path = sequence->getPath(basePath, i); String path = sequence->getPath(basePath, i);
regions[i] = atlas->findRegion(path); regions[i] = atlas->findRegion(path);
if (!regions[i]) return false; if (!regions[i]) return false;
regions[i]->rendererObject = regions[i];
} }
return true; return true;
} }

1
spine-sfml/cpp/example/main.cpp
View File

@ -787,7 +787,6 @@ int main() {
testcase(spineboy, "data/spineboy-pro.json", "data/spineboy-pro.skel", "data/spineboy-pma.atlas", 0.62f); testcase(spineboy, "data/spineboy-pro.json", "data/spineboy-pro.skel", "data/spineboy-pma.atlas", 0.62f);
testcase(ikDemo, "data/spineboy-pro.json", "data/spineboy-pro.skel", "data/spineboy-pma.atlas", 0.6f); testcase(ikDemo, "data/spineboy-pro.json", "data/spineboy-pro.skel", "data/spineboy-pma.atlas", 0.6f);
testcase(vine, "data/vine-pro.json", "data/vine-pro.skel", "data/vine-pma.atlas", 0.5f); testcase(vine, "data/vine-pro.json", "data/vine-pro.skel", "data/vine-pma.atlas", 0.5f);
testcase(dragon, "data/dragon-ess.json", "data/dragon-ess.skel", "data/dragon-pma.atlas", 0.6f);
testcase(owl, "data/owl-pro.json", "data/owl-pro.skel", "data/owl-pma.atlas", 0.5f); testcase(owl, "data/owl-pro.json", "data/owl-pro.skel", "data/owl-pma.atlas", 0.5f);
testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin-pma.atlas", 0.5f); testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin-pma.atlas", 0.5f);
testcase(raptor, "data/raptor-pro.json", "data/raptor-pro.skel", "data/raptor-pma.atlas", 0.5f); testcase(raptor, "data/raptor-pro.json", "data/raptor-pro.skel", "data/raptor-pma.atlas", 0.5f);

4
spine-sfml/cpp/src/spine/spine-sfml.cpp
View File

@ -90,13 +90,13 @@ void SkeletonDrawable::draw(RenderTarget &target, RenderStates states) const {
if (!skeletonRenderer) skeletonRenderer = new (__FILE__, __LINE__) SkeletonRenderer(); if (!skeletonRenderer) skeletonRenderer = new (__FILE__, __LINE__) SkeletonRenderer();
RenderCommand *command = skeletonRenderer->render(*skeleton); RenderCommand *command = skeletonRenderer->render(*skeleton);
while (command) { while (command) {
Texture *texture = (Texture *)command->texture;
Vector2u size = texture->getSize();
Vertex vertex; Vertex vertex;
float *positions = command->positions; float *positions = command->positions;
float *uvs = command->uvs; float *uvs = command->uvs;
uint32_t *colors = command->colors; uint32_t *colors = command->colors;
uint16_t *indices = command->indices; uint16_t *indices = command->indices;
Texture *texture = (Texture *)command->texture;
Vector2u size = texture->getSize();
for (int i = 0, n = command->numIndices; i < n; ++i) { for (int i = 0, n = command->numIndices; i < n; ++i) {
int ii = indices[i]; int ii = indices[i];
int index = ii << 1; int index = ii << 1;