godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #110508 from Olle-Lukowski/fix/emit-anim-finished

Browse Source 
Ensure the AnimationPlayer emits animation_finished for every animation
This commit is contained in:
Thaddeus Crews
2025-10-23 11:03:51 -05:00
parent d90a266304 578d7cd115
commit df4137cd9b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/animation/animation_player.cpp
View File

@@ -277,6 +277,9 @@ void AnimationPlayer::_blend_playback_data(double p_delta, bool p_started) {
// Finally, if not end the animation, do blending. // Finally, if not end the animation, do blending.
if (end_reached) { if (end_reached) {
playback.blend.clear(); playback.blend.clear();
if (end_notify) {
finished_anim = playback.assigned;
}
return; return;
} }
List<List<Blend>::Element *> to_erase; List<List<Blend>::Element *> to_erase;
@@ -306,6 +309,8 @@ bool AnimationPlayer::_blend_pre_process(double p_delta, int p_track_count, cons
end_reached = false; end_reached = false;
end_notify = false; end_notify = false;
finished_anim = StringName();
bool started = playback.started; // The animation may be changed during process, so it is safer that the state is changed before process. bool started = playback.started; // The animation may be changed during process, so it is safer that the state is changed before process.
if (playback.started) { if (playback.started) {
playback.started = false; playback.started = false;
@@ -326,6 +331,10 @@ void AnimationPlayer::_blend_capture(double p_delta) {
} }
void AnimationPlayer::_blend_post_process() { void AnimationPlayer::_blend_post_process() {
if (!finished_anim.is_empty()) {
emit_signal(SceneStringName(animation_finished), finished_anim);
}
if (end_reached) { if (end_reached) {
// If the method track changes current animation, the animation is not finished. // If the method track changes current animation, the animation is not finished.
if (tmp_from == playback.current.from->animation->get_instance_id()) { if (tmp_from == playback.current.from->animation->get_instance_id()) {
@@ -342,7 +351,6 @@ void AnimationPlayer::_blend_post_process() {
playing = false; playing = false;
_set_process(false); _set_process(false);
if (end_notify) { if (end_notify) {
emit_signal(SceneStringName(animation_finished), playback.assigned);
emit_signal(SNAME("current_animation_changed"), ""); emit_signal(SNAME("current_animation_changed"), "");
if (movie_quit_on_finish && OS::get_singleton()->has_feature("movie")) { if (movie_quit_on_finish && OS::get_singleton()->has_feature("movie")) {
print_line(vformat("Movie Maker mode is enabled. Quitting on animation finish as requested by: %s", get_path())); print_line(vformat("Movie Maker mode is enabled. Quitting on animation finish as requested by: %s", get_path()));

2
scene/animation/animation_player.h
View File

@@ -52,6 +52,8 @@ public:
private: private:
AHashMap<StringName, StringName> animation_next_set; // For auto advance. AHashMap<StringName, StringName> animation_next_set; // For auto advance.
StringName finished_anim;
float speed_scale = 1.0; float speed_scale = 1.0;
double default_blend_time = 0.0; double default_blend_time = 0.0;