Skip to content

Commit

Permalink
Updated version number
Browse files Browse the repository at this point in the history
  • Loading branch information
matt77hias committed Apr 14, 2017
1 parent b62716b commit d22bf28
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion MAGE/MAGE/src/core/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions MAGE/MAGE/src/math/transform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -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());
}

Expand Down

0 comments on commit d22bf28

Please sign in to comment.