diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-06 00:10:18 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-06 00:10:18 +0100 |
commit | e5f6e0349010ee05035ad2864b94614e00b8f27a (patch) | |
tree | e70c5f400d980eb38cab14d51093f00004273720 /core/math | |
parent | 7bf4753a9b6097828599572d40e08d780459d837 (diff) | |
parent | 8745c206c449649bf10dc4bdd7cfae9fb92ec993 (diff) |
Merge pull request #70547 from TokageItLab/pingpong-wrap
Fix pingpong-loop with `loop_wrap` is not working & clean-up cubic interpolation key retrieve process
Diffstat (limited to 'core/math')
-rw-r--r-- | core/math/quaternion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/quaternion.cpp b/core/math/quaternion.cpp index cf415a9bf9..34e212a5b6 100644 --- a/core/math/quaternion.cpp +++ b/core/math/quaternion.cpp @@ -220,7 +220,7 @@ Quaternion Quaternion::spherical_cubic_interpolate(const Quaternion &p_b, const ln.z = Math::cubic_interpolate(ln_from.z, ln_to.z, ln_pre.z, ln_post.z, p_weight); Quaternion q2 = to_q * ln.exp(); - // To cancel error made by Expmap ambiguity, do blends. + // To cancel error made by Expmap ambiguity, do blending. return q1.slerp(q2, p_weight); } @@ -271,7 +271,7 @@ Quaternion Quaternion::spherical_cubic_interpolate_in_time(const Quaternion &p_b ln.z = Math::cubic_interpolate_in_time(ln_from.z, ln_to.z, ln_pre.z, ln_post.z, p_weight, p_b_t, p_pre_a_t, p_post_b_t); Quaternion q2 = to_q * ln.exp(); - // To cancel error made by Expmap ambiguity, do blends. + // To cancel error made by Expmap ambiguity, do blending. return q1.slerp(q2, p_weight); } |