UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix up HasRendererObject changes/removal.

Browse Source
This commit is contained in:
Mario Zechner 2022-09-13 10:26:19 +02:00
parent ee5e103ef8
commit 899fd11825
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-godot/spine_godot/SpineAtlasResource.cpp
View File

@ -75,7 +75,7 @@ public:
auto renderer_object = memnew(SpineRendererObject); auto renderer_object = memnew(SpineRendererObject);
renderer_object->texture = Ref<Texture>(nullptr); renderer_object->texture = Ref<Texture>(nullptr);
renderer_object->normal_map = Ref<Texture>(nullptr); renderer_object->normal_map = Ref<Texture>(nullptr);
page.setRendererObject((void *) renderer_object); page.texture = (void *) renderer_object;
return; return;
} }
@ -97,7 +97,7 @@ public:
renderer_object->canvas_texture->set_normal_texture(renderer_object->normal_map); renderer_object->canvas_texture->set_normal_texture(renderer_object->normal_map);
#endif #endif
page.setRendererObject((void *) renderer_object); page.texture = (void *) renderer_object;
page.width = texture->get_width(); page.width = texture->get_width();
page.height = texture->get_height(); page.height = texture->get_height();
} }

4
spine-godot/spine_godot/SpineSprite.cpp
View File

@ -552,7 +552,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
if (attachment->getRTTI().isExactly(spine::RegionAttachment::rtti)) { if (attachment->getRTTI().isExactly(spine::RegionAttachment::rtti)) {
auto *region = (spine::RegionAttachment *) attachment; auto *region = (spine::RegionAttachment *) attachment;
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject(); renderer_object = (SpineRendererObject *) region->getRegion()->rendererObject;
vertices->setSize(8, 0); vertices->setSize(8, 0);
region->computeWorldVertices(*slot, *vertices, 0); region->computeWorldVertices(*slot, *vertices, 0);
@ -566,7 +566,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
tint.a *= attachment_color.a; tint.a *= attachment_color.a;
} else if (attachment->getRTTI().isExactly(spine::MeshAttachment::rtti)) { } else if (attachment->getRTTI().isExactly(spine::MeshAttachment::rtti)) {
auto *mesh = (spine::MeshAttachment *) attachment; auto *mesh = (spine::MeshAttachment *) attachment;
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject(); renderer_object = (SpineRendererObject *) mesh->getRegion()->rendererObject;
vertices->setSize(mesh->getWorldVerticesLength(), 0); vertices->setSize(mesh->getWorldVerticesLength(), 0);
mesh->computeWorldVertices(*slot, *vertices); mesh->computeWorldVertices(*slot, *vertices);