From d22bf281af2aace3b64191c16ecb49434417ed63 Mon Sep 17 00:00:00 2001 From: ALIEN Date: Fri, 14 Apr 2017 20:04:27 +0200 Subject: [PATCH] Updated version number --- MAGE/MAGE/src/core/version.hpp | 2 +- MAGE/MAGE/src/math/transform.hpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/MAGE/MAGE/src/core/version.hpp b/MAGE/MAGE/src/core/version.hpp index e4a669d82..3bde899b9 100644 --- a/MAGE/MAGE/src/core/version.hpp +++ b/MAGE/MAGE/src/core/version.hpp @@ -6,7 +6,7 @@ #pragma region #define MAGE_VERSION_MAJOR 0 -#define MAGE_VERSION_MINOR 19 +#define MAGE_VERSION_MINOR 20 #define MAGE_VERSION_PATCH 0 #define MAGE_QUOTE(S) #S diff --git a/MAGE/MAGE/src/math/transform.hpp b/MAGE/MAGE/src/math/transform.hpp index 59ff4dd67..4a898a896 100644 --- a/MAGE/MAGE/src/math/transform.hpp +++ b/MAGE/MAGE/src/math/transform.hpp @@ -540,7 +540,6 @@ namespace mage { @return The object-to-parent rotation matrix of this transform. */ const XMMATRIX GetObjectToParentRotationMatrix() const { - //return XMMatrixRotationY(GetRotationY()) * XMMatrixRotationX(GetRotationX()) * XMMatrixRotationZ(GetRotationZ()); return XMMatrixRotationZ(GetRotationZ()) * XMMatrixRotationX(GetRotationX()) * XMMatrixRotationY(GetRotationY()); } @@ -550,7 +549,6 @@ namespace mage { @return The parent-to-object rotation matrix of this transform. */ const XMMATRIX GetParentToObjectRotationMatrix() const { - //return XMMatrixRotationZ(-GetRotationZ()) * XMMatrixRotationX(-GetRotationX()) * XMMatrixRotationY(-GetRotationY()); return XMMatrixRotationY(-GetRotationY()) * XMMatrixRotationX(-GetRotationX()) * XMMatrixRotationZ(-GetRotationZ()); }