diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-11 22:03:10 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-11 22:03:10 +0100 |
| commit | 775f46099519b906f9eb830a6ff8d091a3ae1d01 (patch) | |
| tree | 243e70bafe52113c175a25d09f7946a55fafada6 | |
| parent | 612533da80daf6f34703c1b2453e4f496e80668e (diff) | |
| parent | 7bf83a86039b63bf2eda7043bd3351ae73ead486 (diff) | |
Merge pull request #73117 from TokageItLab/fix-nodeoneshot-fadeout
Fix NodeOneShot fade-out doesn't blend animations correctly
| -rw-r--r-- | scene/animation/animation_blend_tree.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 3567738366..221e66499b 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -351,14 +351,15 @@ double AnimationNodeOneShot::process(double p_time, bool p_seek, bool p_is_exter } real_t blend; - bool use_fade_in = fade_in > 0; + bool use_blend = fade_in > 0; if (cur_time < fade_in) { - if (use_fade_in) { + if (use_blend) { blend = cur_time / fade_in; } else { blend = 0; // Should not happen. } } else if (!do_start && cur_remaining <= fade_out) { + use_blend = true; if (fade_out > 0) { blend = (cur_remaining / fade_out); } else { @@ -371,7 +372,7 @@ double AnimationNodeOneShot::process(double p_time, bool p_seek, bool p_is_exter double main_rem = 0.0; if (mix == MIX_MODE_ADD) { main_rem = blend_input(0, p_time, p_seek, p_is_external_seeking, 1.0, FILTER_IGNORE, sync); - } else if (use_fade_in) { + } else if (use_blend) { main_rem = blend_input(0, p_time, p_seek, p_is_external_seeking, 1.0 - blend, FILTER_BLEND, sync); // Unlike below, processing this edge is a corner case. } double os_rem = blend_input(1, os_seek ? cur_time : p_time, os_seek, p_is_external_seeking, Math::is_zero_approx(blend) ? CMP_EPSILON : blend, FILTER_PASS, true); // Blend values must be more than CMP_EPSILON to process discrete keys in edge. |