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

[godot] Godot 4.3 updates

Browse Source
This commit is contained in:
Mario Zechner 2024-08-19 14:01:08 +02:00
parent 59e3b58d14
commit f3ded1ed1a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/spine-godot-v4-all.yml vendored
View File

@ -14,10 +14,10 @@ jobs:
matrix: matrix:
version: version:
[ [
{"tag": "4.1.4-stable", "version": "4.1.4.stable", "mono": false},
{"tag": "4.1.4-stable", "version": "4.1.4.stable", "mono": true},
{"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": false}, {"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": false},
{"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": true}, {"tag": "4.2.2-stable", "version": "4.2.2.stable", "mono": true},
{"tag": "4.2-stable", "version": "4.2.stable", "mono": false},
{"tag": "4.2-stable", "version": "4.2.stable", "mono": true},
] ]
uses: ./.github/workflows/spine-godot-v4.yml uses: ./.github/workflows/spine-godot-v4.yml
with: with:

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

@ -182,8 +182,8 @@ void SpineAnimationTrack::setup_animation_player() {
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
List<StringName> animation_libraries; List<StringName> animation_libraries;
animation_player->get_animation_library_list(&animation_libraries); animation_player->get_animation_library_list(&animation_libraries);
for (int i = 0; i < animation_libraries.size(); i++) { for (auto iter = animation_libraries.front(); iter; iter = iter->next()) {
animation_player->remove_animation_library(animation_libraries[i]); animation_player->remove_animation_library(iter->get());
} }
#else #else
List<StringName> animation_names; List<StringName> animation_names;

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

@ -53,8 +53,12 @@
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#if TOOLS_ENABLED #if TOOLS_ENABLED
#if VERSION_MAJOR > 4 && VERSION_MINOR > 2
#include "editor/plugins/editor_plugin.h"
else
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#endif #endif
#endif
Ref<CanvasItemMaterial> SpineSprite::default_materials[4] = {}; Ref<CanvasItemMaterial> SpineSprite::default_materials[4] = {};
static int sprite_count = 0; static int sprite_count = 0;