From df152fa9db5d0593ddc653e70b5bcd8985776ce7 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 18 Sep 2013 00:28:36 +0200 Subject: [PATCH 1/2] Updated version for next release --- glm/core/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 824086b4..95020ea0 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -36,7 +36,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 4 -#define GLM_VERSION_REVISION 6 +#define GLM_VERSION_REVISION 7 /////////////////////////////////////////////////////////////////////////////////////////////////// // Platform From 843cc7bd612e5b530bbe60e8726dca844b4a4d42 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 19 Sep 2013 21:33:29 +0200 Subject: [PATCH 2/2] Fixed eulerAngleY rotation orientation --- glm/gtx/euler_angles.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl index 36704036..a6ca0ab6 100644 --- a/glm/gtx/euler_angles.inl +++ b/glm/gtx/euler_angles.inl @@ -35,9 +35,9 @@ namespace glm valType sinY = glm::sin(angleY); return detail::tmat4x4( - cosY, valType(0), sinY, valType(0), + cosY, valType(0),-sinY, valType(0), valType(0), valType(1), valType(0), valType(0), - -sinY, valType(0), cosY, valType(0), + sinY, valType(0), cosY, valType(0), valType(0), valType(0), valType(0), valType(1)); }