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

Fix AnimationPlaybackTrack seeking behavior overall

Browse source 
Co-authored-by: jsjtxietian <jsjtxietian@outlook.com>
Co-authored-by: Miguel0312 <miguel.vpereira14@gmail.com>
Co-authored-by: BruceLiCong <citb_li@163.com>
This commit is contained in:
Silc Lizard (Tokage) Renew 2024-03-23 12:23:24 +09:00
parent fe01776f05
commit c1741fe98e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/animation/animation_mixer.cpp
View file

@ -1596,7 +1596,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
} }
} break; } break;
case Animation::TYPE_ANIMATION: { case Animation::TYPE_ANIMATION: {
if (p_update_only || Math::is_zero_approx(blend)) { if (Math::is_zero_approx(blend)) {
continue; continue;
} }
TrackCacheAnimation *t = static_cast<TrackCacheAnimation *>(track); TrackCacheAnimation *t = static_cast<TrackCacheAnimation *>(track);
@ -1623,10 +1623,10 @@ 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: {
at_anim_pos = MAX((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: {
at_anim_pos = Math::fposmod(time - pos, (double)anim->get_length()); //seek to loop at_anim_pos = Math::fposmod(time - pos, (double)anim->get_length()); // Seek to loop.
} break; } break;
case Animation::LOOP_PINGPONG: { case Animation::LOOP_PINGPONG: {
at_anim_pos = Math::pingpong(time - pos, (double)a->get_length()); at_anim_pos = Math::pingpong(time - pos, (double)a->get_length());
@ -1634,14 +1634,14 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
default: default:
break; break;
} }
if (player2->is_playing() || seeked) { if (player2->is_playing()) {
player2->seek(at_anim_pos); player2->seek(at_anim_pos, false, p_update_only);
player2->play(anim_name); player2->play(anim_name);
t->playing = true; t->playing = true;
playing_caches.insert(t); playing_caches.insert(t);
} else { } else {
player2->set_assigned_animation(anim_name); player2->set_assigned_animation(anim_name);
player2->seek(at_anim_pos, true); player2->seek(at_anim_pos, true, p_update_only);
} }
} else { } else {
// Find stuff to play. // Find stuff to play.