godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90960 from TokageItLab/fix-animation-playback-track-seek 

Make seeking animation playback track consider internal seeking
This commit is contained in:
Rémi Verschelde 2024-05-01 09:55:00 +02:00
parent de00cfbc01 b346e2a722
commit f89de7ab43
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/animation/animation_mixer.cpp
View File

@ -1617,7 +1617,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
} }
if (seeked) { if (seeked) {
// Seek. // Seek.
int idx = a->track_find_key(i, time, is_external_seeking ? Animation::FIND_MODE_NEAREST : Animation::FIND_MODE_EXACT, true); int idx = a->track_find_key(i, time, Animation::FIND_MODE_NEAREST, true);
if (idx < 0) { if (idx < 0) {
continue; continue;
} }
@ -1630,6 +1630,9 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
double at_anim_pos = 0.0; double at_anim_pos = 0.0;
switch (anim->get_loop_mode()) { switch (anim->get_loop_mode()) {
case Animation::LOOP_NONE: { case Animation::LOOP_NONE: {
if (!is_external_seeking && ((!backward && time >= pos + (double)anim->get_length()) || (backward && time <= pos))) {
continue; // Do nothing if current time is outside of length when started.
}
at_anim_pos = MIN((double)anim->get_length(), time - pos); // Seek to end. at_anim_pos = MIN((double)anim->get_length(), time - pos); // Seek to end.
} break; } break;
case Animation::LOOP_LINEAR: { case Animation::LOOP_LINEAR: {
@ -1641,7 +1644,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
default: default:
break; break;
} }
if (player2->is_playing()) { if (player2->is_playing() || !is_external_seeking) {
player2->seek(at_anim_pos, false, p_update_only); player2->seek(at_anim_pos, false, p_update_only);
player2->play(anim_name); player2->play(anim_name);
t->playing = true; t->playing = true;