From 9149fb760ce6e85af640ce38a302255e4ea8b81a Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 8 Sep 2020 12:15:01 +0100 Subject: [PATCH] Initialise Basis elements with a default Basis in the declaration. Ensures a valid Basis is created with all constructors. --- core/math/basis.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/core/math/basis.h b/core/math/basis.h index 985fb0e44f9c..a86937ceb465 100644 --- a/core/math/basis.h +++ b/core/math/basis.h @@ -36,7 +36,11 @@ class Basis { public: - Vector3 elements[3]; + Vector3 elements[3] = { + Vector3(1, 0, 0), + Vector3(0, 1, 0), + Vector3(0, 0, 1) + }; _FORCE_INLINE_ const Vector3 &operator[](int axis) const { return elements[axis]; @@ -254,17 +258,7 @@ public: elements[2] = row2; } - _FORCE_INLINE_ Basis() { - elements[0][0] = 1; - elements[0][1] = 0; - elements[0][2] = 0; - elements[1][0] = 0; - elements[1][1] = 1; - elements[1][2] = 0; - elements[2][0] = 0; - elements[2][1] = 0; - elements[2][2] = 1; - } + _FORCE_INLINE_ Basis() {} }; _FORCE_INLINE_ void Basis::operator*=(const Basis &p_matrix) {