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

Merge pull request #85366 from TokageItLab/more-stable-seek-discrete

Browse source 
Check the seeking if it is processed immediately after playback as a special case
This commit is contained in:
Rémi Verschelde 2023-11-27 16:01:03 +01:00
commit b20ecc91e4
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/animation/animation_player.cpp
View file

@ -151,7 +151,7 @@ void AnimationPlayer::_notification(int p_what) {
if (!Engine::get_singleton()->is_editor_hint() && animation_set.has(autoplay)) { if (!Engine::get_singleton()->is_editor_hint() && animation_set.has(autoplay)) {
set_active(true); set_active(true);
play(autoplay); play(autoplay);
seek(0, true); _check_immediately_after_start();
} }
} break; } break;
} }
@ -522,8 +522,9 @@ void AnimationPlayer::seek(double p_time, bool p_update, bool p_update_only) {
return; return;
} }
playback.current.pos = p_time; _check_immediately_after_start();
playback.current.pos = p_time;
if (!playback.current.from) { if (!playback.current.from) {
if (playback.assigned) { if (playback.assigned) {
ERR_FAIL_COND_MSG(!animation_set.has(playback.assigned), vformat("Animation not found: %s.", playback.assigned)); ERR_FAIL_COND_MSG(!animation_set.has(playback.assigned), vformat("Animation not found: %s.", playback.assigned));
@ -534,7 +535,6 @@ void AnimationPlayer::seek(double p_time, bool p_update, bool p_update_only) {
} }
} }
playback.started = false; // Start has already gone by seeking, delta does not need to be 0 in the internal process.
playback.seeked = true; playback.seeked = true;
if (p_update) { if (p_update) {
_process_animation(0, p_update_only); _process_animation(0, p_update_only);
@ -543,10 +543,16 @@ void AnimationPlayer::seek(double p_time, bool p_update, bool p_update_only) {
} }
void AnimationPlayer::advance(double p_time) { void AnimationPlayer::advance(double p_time) {
playback.started = false; // Start has already gone by advancing, delta does not need to be 0 in the internal process. _check_immediately_after_start();
AnimationMixer::advance(p_time); AnimationMixer::advance(p_time);
} }
void AnimationPlayer::_check_immediately_after_start() {
if (playback.started) {
_process_animation(0); // Force process current key for Discrete/Method/Audio/AnimationPlayback. Then, started flag is cleared.
}
}
bool AnimationPlayer::is_valid() const { bool AnimationPlayer::is_valid() const {
return (playback.current.from); return (playback.current.from);
} }

1
scene/animation/animation_player.h
View file

@ -111,6 +111,7 @@ private:
void _process_playback_data(PlaybackData &cd, double p_delta, float p_blend, bool p_seeked, bool p_started, bool p_is_current = false); void _process_playback_data(PlaybackData &cd, double p_delta, float p_blend, bool p_seeked, bool p_started, bool p_is_current = false);
void _blend_playback_data(double p_delta, bool p_started); void _blend_playback_data(double p_delta, bool p_started);
void _stop_internal(bool p_reset, bool p_keep_state); void _stop_internal(bool p_reset, bool p_keep_state);
void _check_immediately_after_start();
bool playing = false; bool playing = false;