asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #82898 from TokageItLab/fix-unwanted-start-in-animation-player

Browse source 
Fix `AnimationPlayer::play()` process unwanted start between the same animations
This commit is contained in:
Rémi Verschelde 2023-10-06 12:53:09 +02:00
commit 249e724835
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/animation/animation_player.cpp
View file

@ -415,9 +415,16 @@ void AnimationPlayer::play(const StringName &p_name, double p_custom_blend, floa
} }
c.current.from = &animation_set[name]; c.current.from = &animation_set[name];
c.current.speed_scale = p_custom_scale;
if (!end_reached) {
playback_queue.clear();
}
if (c.assigned != name) { // Reset. if (c.assigned != name) { // Reset.
c.current.pos = p_from_end ? c.current.from->animation->get_length() : 0; c.current.pos = p_from_end ? c.current.from->animation->get_length() : 0;
c.assigned = name;
emit_signal(SNAME("current_animation_changed"), c.assigned);
} else { } else {
if (p_from_end && c.current.pos == 0) { if (p_from_end && c.current.pos == 0) {
// Animation reset but played backwards, set position to the end. // Animation reset but played backwards, set position to the end.
@ -425,18 +432,14 @@ void AnimationPlayer::play(const StringName &p_name, double p_custom_blend, floa
} else if (!p_from_end && c.current.pos == c.current.from->animation->get_length()) { } else if (!p_from_end && c.current.pos == c.current.from->animation->get_length()) {
// Animation resumed but already ended, set position to the beginning. // Animation resumed but already ended, set position to the beginning.
c.current.pos = 0; c.current.pos = 0;
} else if (playing) {
return;
} }
} }
c.current.speed_scale = p_custom_scale;
c.assigned = name;
emit_signal(SNAME("current_animation_changed"), c.assigned);
c.seeked = false; c.seeked = false;
c.started = true; c.started = true;
if (!end_reached) {
playback_queue.clear();
}
_set_process(true); // Always process when starting an animation. _set_process(true); // Always process when starting an animation.
playing = true; playing = true;