godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Fix AnimationPlayer cumulative speed_scale

Browse Source
This commit is contained in:
kobewi
2023-05-26 07:11:29 +02:00
parent 2eec9a67d5
commit 87a6145135
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/animation/animation_player.cpp
View File

@@ -1766,7 +1766,7 @@ void AnimationPlayer::set_current_animation(const String &p_anim) {
} else if (!is_playing()) { } else if (!is_playing()) {
play(p_anim); play(p_anim);
} else if (playback.assigned != p_anim) { } else if (playback.assigned != p_anim) {
float speed = get_playing_speed(); float speed = playback.current.speed_scale;
play(p_anim, -1.0, speed, signbit(speed)); play(p_anim, -1.0, speed, signbit(speed));
} else { } else {
// Same animation, do not replay from start // Same animation, do not replay from start
@@ -1779,7 +1779,7 @@ String AnimationPlayer::get_current_animation() const {
void AnimationPlayer::set_assigned_animation(const String &p_anim) { void AnimationPlayer::set_assigned_animation(const String &p_anim) {
if (is_playing()) { if (is_playing()) {
float speed = get_playing_speed(); float speed = playback.current.speed_scale;
play(p_anim, -1.0, speed, signbit(speed)); play(p_anim, -1.0, speed, signbit(speed));
} else { } else {
ERR_FAIL_COND_MSG(!animation_set.has(p_anim), vformat("Animation not found: %s.", p_anim)); ERR_FAIL_COND_MSG(!animation_set.has(p_anim), vformat("Animation not found: %s.", p_anim));