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

[godot] Resolves #2925, fixes regression in building Godot 3.x

Browse Source 
Incorrect parameters were being passed to functions. This was preventing
Godot 3.x from building.

This fix has been tested against the spine-godot modules 3.6.1-stable,
4.4.1-stable, and the 4.4.1-stable Spine GDExtension.
This commit is contained in:
Luke Ingram 2025-09-17 21:54:48 -04:00
parent 9243c57b7c
commit 77ec2a3cf5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,6 @@ static void add_triangles(SpineMesh2D *mesh_instance,
#else #else
auto texture = renderer_object->texture; auto texture = renderer_object->texture;
auto normal_map = renderer_object->normal_map; auto normal_map = renderer_object->normal_map;
auto specular_map = renderer_object->specular_map;
VisualServer::get_singleton()->canvas_item_add_triangle_array(mesh_instance->get_canvas_item(), VisualServer::get_singleton()->canvas_item_add_triangle_array(mesh_instance->get_canvas_item(),
indices, indices,
vertices, vertices,
@ -189,8 +188,7 @@ static void add_triangles(SpineMesh2D *mesh_instance,
Vector<float>(), Vector<float>(),
texture.is_null() ? RID() : texture->get_rid(), texture.is_null() ? RID() : texture->get_rid(),
-1, -1,
normal_map.is_null() ? RID() : normal_map->get_rid(), normal_map.is_null() ? RID() : normal_map->get_rid());
specular_map.is_null() ? RID() : specular_map->get_rid());
#endif #endif
#endif #endif
} }
@ -405,8 +403,7 @@ void SpineMesh2D::update_mesh(const Vector<Point2> &vertices,
Transform2D(), Transform2D(),
Color(1, 1, 1, 1), Color(1, 1, 1, 1),
renderer_object->texture.is_null() ? RID() : renderer_object->texture->get_rid(), renderer_object->texture.is_null() ? RID() : renderer_object->texture->get_rid(),
renderer_object->normal_map.is_null() ? RID() : renderer_object->normal_map->get_rid(), renderer_object->normal_map.is_null() ? RID() : renderer_object->normal_map->get_rid());
renderer_object->specular_map.is_null() ? RID() : renderer_object->specular_map->get_rid());
#endif #endif
} }
#endif #endif