UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fixes #2670, animation tracks must be set to discrete, so we only get a single name/loop change for each key.

Browse Source
This commit is contained in:
Mario Zechner 2024-11-06 16:11:36 +01:00
parent c3d510e3c8
commit b610bd7b7a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,7 @@ void SpineAnimationTrack::_bind_methods() {
} }
SpineAnimationTrack::SpineAnimationTrack() : loop(false), SpineAnimationTrack::SpineAnimationTrack() : loop(false),
animation_changed(false),
track_index(-1), track_index(-1),
mix_duration(-1), mix_duration(-1),
hold_previous(false), hold_previous(false),
@ -231,6 +232,9 @@ void SpineAnimationTrack::setup_animation_player() {
reset_animation_ref->add_track(Animation::TYPE_VALUE); reset_animation_ref->add_track(Animation::TYPE_VALUE);
reset_animation_ref->track_set_path(1, NodePath(".:loop")); reset_animation_ref->track_set_path(1, NodePath(".:loop"));
reset_animation_ref->track_insert_key(1, 0, false); reset_animation_ref->track_insert_key(1, 0, false);
reset_animation_ref->value_track_set_update_mode(0, Animation::UPDATE_DISCRETE);
reset_animation_ref->value_track_set_update_mode(1, Animation::UPDATE_DISCRETE);
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
animation_library->add_animation(reset_animation_ref->get_name(), reset_animation_ref); animation_library->add_animation(reset_animation_ref->get_name(), reset_animation_ref);
animation_library->add_animation("-- Empty --", reset_animation_ref); animation_library->add_animation("-- Empty --", reset_animation_ref);
@ -262,6 +266,9 @@ Ref<Animation> SpineAnimationTrack::create_animation(spine::Animation *animation
animation_ref->track_set_path(1, NodePath(".:loop")); animation_ref->track_set_path(1, NodePath(".:loop"));
animation_ref->track_insert_key(1, 0, !loop); animation_ref->track_insert_key(1, 0, !loop);
animation_ref->value_track_set_update_mode(0, Animation::UPDATE_DISCRETE);
animation_ref->value_track_set_update_mode(1, Animation::UPDATE_DISCRETE);
return animation_ref; return animation_ref;
} }
@ -416,7 +423,8 @@ void SpineAnimationTrack::update_animation_state(const Variant &variant_sprite)
if (animation_player->is_playing()) { if (animation_player->is_playing()) {
auto current_entry = animation_state->getCurrent(track_index); auto current_entry = animation_state->getCurrent(track_index);
bool should_set_mix = mix_duration >= 0; bool should_set_mix = mix_duration >= 0;
bool should_set_animation = !current_entry || (animation_name != current_entry->getAnimation()->getName().buffer() || current_entry->getLoop() != loop); bool should_set_animation = !current_entry || (animation_name != current_entry->getAnimation()->getName().buffer() || current_entry->getLoop() != loop) || animation_changed;
animation_changed = false;
if (should_set_animation) { if (should_set_animation) {
if (!EMPTY(animation_name)) { if (!EMPTY(animation_name)) {
@ -446,7 +454,9 @@ void SpineAnimationTrack::update_animation_state(const Variant &variant_sprite)
} }
void SpineAnimationTrack::set_animation_name(const String &_animation_name) { void SpineAnimationTrack::set_animation_name(const String &_animation_name) {
if (debug) print_line(String("Animation name changed"));
animation_name = _animation_name; animation_name = _animation_name;
animation_changed = true;
} }
String SpineAnimationTrack::get_animation_name() { String SpineAnimationTrack::get_animation_name() {
@ -454,6 +464,7 @@ String SpineAnimationTrack::get_animation_name() {
} }
void SpineAnimationTrack::set_loop(bool _loop) { void SpineAnimationTrack::set_loop(bool _loop) {
animation_changed = true;
loop = _loop; loop = _loop;
} }

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

@ -39,9 +39,11 @@ class SpineAnimationTrack : public Node {
protected: protected:
// These are not exposed in the inspector, see SpineAnimationTrackInspectorPlugin. // These are not exposed in the inspector, see SpineAnimationTrackInspectorPlugin.
// Instead, they are are keyed by the animations created in setup_animation_player // Instead, they are are keyed by the animations created in setup_animation_player
// and primarily used for animation player editor support like scrubbing. // and primarily used for animation player editor support like scrubbing and playing
// back the .
String animation_name; String animation_name;
bool loop; bool loop;
bool animation_changed;
// These can be set by the user. // These can be set by the user.
int track_index; int track_index;