diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-22 12:18:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 12:18:08 +0100 |
| commit | 0beb721c70dae9220f89f09f455d6843e638cd9f (patch) | |
| tree | 7a5c4a9ede62b4ca6f809c9e991bcf22f8ff1c1c /scene/resources/animation.cpp | |
| parent | 6836db05a59052c22355964a96127119e27b67e1 (diff) | |
| parent | f3895e7a676970d3ff589a6c236996d98f1da356 (diff) | |
Merge pull request #58344 from TokageItLab/fix-cubic-interpolate-with-loop
Diffstat (limited to 'scene/resources/animation.cpp')
| -rw-r--r-- | scene/resources/animation.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index bc533ff022..312a557602 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -2413,7 +2413,7 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol real_t c = 0.0; // prepare for all cases of interpolation - if ((loop_mode == LOOP_LINEAR || loop_mode == LOOP_PINGPONG) && p_loop_wrap) { + if (loop_mode == LOOP_LINEAR && p_loop_wrap) { // loop if (!p_backward) { // no backward @@ -2567,11 +2567,19 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol case INTERPOLATION_CUBIC: { int pre = idx - 1; if (pre < 0) { - pre = 0; + if (loop_mode == LOOP_LINEAR && p_loop_wrap) { + pre = len - 1; + } else { + pre = 0; + } } int post = next + 1; if (post >= len) { - post = next; + if (loop_mode == LOOP_LINEAR && p_loop_wrap) { + post = 0; + } else { + post = next; + } } return _cubic_interpolate(p_keys[pre].value, p_keys[idx].value, p_keys[next].value, p_keys[post].value, c); |