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

Allow seek() without assigned animation in AnimationPlayer

This commit is contained in:
Silc Renew 2023-01-30 23:23:18 +09:00
parent 312011fade
commit f8d529a232
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/animation/animation_player.cpp
View File

@ -1816,15 +1816,18 @@ float AnimationPlayer::get_playing_speed() const {
} }
void AnimationPlayer::seek(double p_time, bool p_update) { void AnimationPlayer::seek(double p_time, bool p_update) {
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));
playback.current.from = &animation_set[playback.assigned]; playback.current.from = &animation_set[playback.assigned];
} }
ERR_FAIL_COND(!playback.current.from); if (!playback.current.from) {
return; // There is no animation.
}
} }
playback.current.pos = p_time;
playback.seeked = true; playback.seeked = true;
if (p_update) { if (p_update) {
_animation_process(0); _animation_process(0);
@ -1832,20 +1835,22 @@ void AnimationPlayer::seek(double p_time, bool p_update) {
} }
void AnimationPlayer::seek_delta(double p_time, double p_delta) { void AnimationPlayer::seek_delta(double p_time, double p_delta) {
playback.current.pos = p_time - p_delta;
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));
playback.current.from = &animation_set[playback.assigned]; playback.current.from = &animation_set[playback.assigned];
} }
ERR_FAIL_COND(!playback.current.from); if (!playback.current.from) {
return; // There is no animation.
}
} }
playback.current.pos = p_time - p_delta;
if (speed_scale != 0.0) { if (speed_scale != 0.0) {
p_delta /= speed_scale; p_delta /= speed_scale;
} }
_animation_process(p_delta); _animation_process(p_delta);
//playback.current.pos=p_time;
} }
bool AnimationPlayer::is_valid() const { bool AnimationPlayer::is_valid() const {