Merge pull request #18804 from tagcup/vec_slerp

Add SLERP to Vector{2,3}, optimize Quat's Vector3 rotation.

1 files changed, 13 insertions, 0 deletions

diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp
index b0b05d1ec8..8ee8ccb457 100644
--- a/core/math/matrix3.cpp
+++ b/core/math/matrix3.cpp
@@ -826,3 +826,16 @@ void Basis::set_diagonal(const Vector3 p_diag) {
 	elements[2][1] = 0;
 	elements[2][2] = p_diag.z;
 }
+
+Basis Basis::slerp(const Basis &target, const real_t &t) const {
+	// TODO: implement this directly without using quaternions to make it more efficient
+#ifdef MATH_CHECKS
+	ERR_FAIL_COND_V(is_rotation() == false, Basis());
+	ERR_FAIL_COND_V(target.is_rotation() == false, Basis());
+#endif
+
+	Quat from(*this);
+	Quat to(target);
+
+	return Basis(from.slerp(to, t));
+}