From 983220d3bcbef92d0c13927e49d55f0200a6d55f Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 17 Feb 2023 16:50:20 +0100 Subject: [PATCH] [godot] Fix refactoring compilation errors. --- spine-godot/spine_godot/SpineAtlasResource.cpp | 4 ++-- spine-godot/spine_godot/SpineSprite.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp index 4a178f03c..f766eec87 100644 --- a/spine-godot/spine_godot/SpineAtlasResource.cpp +++ b/spine-godot/spine_godot/SpineAtlasResource.cpp @@ -75,7 +75,7 @@ public: auto renderer_object = memnew(SpineRendererObject); renderer_object->texture = Ref(nullptr); renderer_object->normal_map = Ref(nullptr); - page.setRendererObject((void *) renderer_object); + page.texture = (void *) renderer_object; return; } @@ -97,7 +97,7 @@ public: renderer_object->canvas_texture->set_normal_texture(renderer_object->normal_map); #endif - page.setRendererObject((void *) renderer_object); + page.texture = (void *) renderer_object; page.width = texture->get_width(); page.height = texture->get_height(); } diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp index 023796d5b..4647ef2b5 100644 --- a/spine-godot/spine_godot/SpineSprite.cpp +++ b/spine-godot/spine_godot/SpineSprite.cpp @@ -711,7 +711,7 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { vertices->setSize(8, 0); region->computeWorldVertices(*slot, *vertices, 0); - renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject(); + renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRegion())->page->texture; uvs = ®ion->getUVs(); indices = &quad_indices; @@ -725,7 +725,7 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { vertices->setSize(mesh->getWorldVerticesLength(), 0); mesh->computeWorldVertices(*slot, *vertices); - renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject(); + renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRegion())->page->texture; uvs = &mesh->getUVs(); indices = &mesh->getTriangles();