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 4.0 compilation errors.

Browse Source
This commit is contained in:
Mario Zechner 2023-02-16 13:51:00 +01:00
parent b64942b257
commit b80b57b380
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/SpineSprite.cpp
View File

@ -708,7 +708,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
} }
mesh_instance->renderer_object = renderer_object; mesh_instance->renderer_object = renderer_object;
#if VERSION > 3 #if VERSION_MAJOR > 3
mesh_instance->indices_id = (uint64_t) indices; mesh_instance->indices_id = (uint64_t) indices;
#endif #endif
spine::BlendMode blend_mode = slot->getData().getBlendMode(); spine::BlendMode blend_mode = slot->getData().getBlendMode();
@ -768,7 +768,7 @@ void SpineSprite::draw() {
if (!animation_state.is_valid() && !skeleton.is_valid()) return; if (!animation_state.is_valid() && !skeleton.is_valid()) return;
if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) return; if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) return;
#if VERSION > 3 #if VERSION_MAJOR > 3
RS::get_singleton()->canvas_item_clear(this->get_canvas_item()); RS::get_singleton()->canvas_item_clear(this->get_canvas_item());
#else #else
VisualServer::get_singleton()->canvas_item_clear(this->get_canvas_item()); VisualServer::get_singleton()->canvas_item_clear(this->get_canvas_item());

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

@ -56,7 +56,7 @@ protected:
Vector<int> indices; Vector<int> indices;
SpineRendererObject *renderer_object; SpineRendererObject *renderer_object;
#if VERSION > 3 #if VERSION_MAJOR > 3
uint64_t last_indices_id; uint64_t last_indices_id;
uint64_t indices_id; uint64_t indices_id;
RID mesh; RID mesh;
@ -70,7 +70,7 @@ protected:
#endif #endif
public: public:
#if VERSION > 3 #if VERSION_MAJOR > 3
SpineMesh2D() : renderer_object(nullptr), last_indices_id(0), indices_id(0), num_vertices(0), num_indices(0), vertex_stride(0), attribute_stride(0){}; SpineMesh2D() : renderer_object(nullptr), last_indices_id(0), indices_id(0), num_vertices(0), num_indices(0), vertex_stride(0), attribute_stride(0){};
~SpineMesh2D() { ~SpineMesh2D() {
if (mesh.is_valid()) { if (mesh.is_valid()) {