diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-12-07 13:35:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-07 13:35:25 +0100 |
commit | 44a88244dee7e8996824aa29507e917b22ffccca (patch) | |
tree | 5520e6abcfae670354c5b1d559eb84ee01cbbd64 /core/math/basis.cpp | |
parent | d32878bfa81c1f20335c319f7d70095f4e91b284 (diff) | |
parent | 5465e604bb8118450feb7422793efb7dc3e9d28b (diff) |
Merge pull request #44162 from aaronfranke/arg
Improve some argument names for core types
Diffstat (limited to 'core/math/basis.cpp')
-rw-r--r-- | core/math/basis.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/math/basis.cpp b/core/math/basis.cpp index c6030d9757..a64f29517d 100644 --- a/core/math/basis.cpp +++ b/core/math/basis.cpp @@ -1017,15 +1017,15 @@ void Basis::set_diagonal(const Vector3 &p_diag) { elements[2][2] = p_diag.z; } -Basis Basis::slerp(const Basis &target, const real_t &t) const { +Basis Basis::slerp(const Basis &p_to, const real_t &p_weight) const { //consider scale Quat from(*this); - Quat to(target); + Quat to(p_to); - Basis b(from.slerp(to, t)); - b.elements[0] *= Math::lerp(elements[0].length(), target.elements[0].length(), t); - b.elements[1] *= Math::lerp(elements[1].length(), target.elements[1].length(), t); - b.elements[2] *= Math::lerp(elements[2].length(), target.elements[2].length(), t); + Basis b(from.slerp(to, p_weight)); + b.elements[0] *= Math::lerp(elements[0].length(), p_to.elements[0].length(), p_weight); + b.elements[1] *= Math::lerp(elements[1].length(), p_to.elements[1].length(), p_weight); + b.elements[2] *= Math::lerp(elements[2].length(), p_to.elements[2].length(), p_weight); return b; } |