From 544692f96a09c1a76ff259bc1b5e91e9fef57bc4 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Thu, 22 Oct 2020 22:48:22 -0500 Subject: [PATCH] Common: add convenience function to convert a Quaternion to a Matrix44 --- Source/Core/Common/Matrix.cpp | 5 +++++ Source/Core/Common/Matrix.h | 1 + 2 files changed, 6 insertions(+) diff --git a/Source/Core/Common/Matrix.cpp b/Source/Core/Common/Matrix.cpp index 48adcba274..421dda28f5 100644 --- a/Source/Core/Common/Matrix.cpp +++ b/Source/Core/Common/Matrix.cpp @@ -269,6 +269,11 @@ Matrix44 Matrix44::FromMatrix33(const Matrix33& m33) return mtx; } +Matrix44 Matrix44::FromQuaternion(const Quaternion& q) +{ + return FromMatrix33(Matrix33::FromQuaternion(q)); +} + Matrix44 Matrix44::FromArray(const std::array& arr) { Matrix44 mtx; diff --git a/Source/Core/Common/Matrix.h b/Source/Core/Common/Matrix.h index 56840acab1..7c679a6229 100644 --- a/Source/Core/Common/Matrix.h +++ b/Source/Core/Common/Matrix.h @@ -402,6 +402,7 @@ class Matrix44 public: static Matrix44 Identity(); static Matrix44 FromMatrix33(const Matrix33& m33); + static Matrix44 FromQuaternion(const Quaternion& q); static Matrix44 FromArray(const std::array& arr); static Matrix44 Translate(const Vec3& vec);