diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-05-16 23:24:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 23:24:56 +0200 |
commit | 36a74696d6751957c1d345ed1c7633d8b68ba827 (patch) | |
tree | 73ca2106917b826f93de8d5048b07db982f6cb79 /core/math/matrix3.h | |
parent | 2cf36651b968e99602445678e1fa6ea0adfc078a (diff) | |
parent | ed7aadcd87a64cde70febc8ee313860e8c67dcaf (diff) |
Merge pull request #18804 from tagcup/vec_slerp
Add SLERP to Vector{2,3}, optimize Quat's Vector3 rotation.
Diffstat (limited to 'core/math/matrix3.h')
-rw-r--r-- | core/math/matrix3.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/math/matrix3.h b/core/math/matrix3.h index fd383fc673..63d4f5d79d 100644 --- a/core/math/matrix3.h +++ b/core/math/matrix3.h @@ -155,6 +155,8 @@ public: bool is_diagonal() const; bool is_rotation() const; + Basis slerp(const Basis &target, const real_t &t) const; + operator String() const; /* create / set */ |