From b2cb4fe479d4ccf8fe91834849e4172a59c46812 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 15:34:28 +0100 Subject: [PATCH 1/4] Fixed ticket #124 cast from mat* to quat undefined error --- glm/gtc/quaternion.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index e846fdc4..a4760ca6 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -88,7 +88,7 @@ namespace detail{ tmat3x3 const & m ) { - *this = toQuat(m); + *this = gtc::quaternion::quat_cast(m); } template @@ -97,7 +97,7 @@ namespace detail{ tmat4x4 const & m ) { - *this = toQuat(m); + *this = gtc::quaternion::quat_cast(m); } ////////////////////////////////////////////////////////////// From d46aa4403459be4c464b1efea73e99e77c5bea4b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 15:39:26 +0100 Subject: [PATCH 2/4] Fixed warning, ticket #118 --- glm/core/_detail.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 0748a83d..4d6a57ed 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -18,7 +18,7 @@ namespace detail { class thalf; -#if(__STDC_VERSION__ && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available +#if(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available typedef int64_t sint64; typedef uint64_t uint64; #elif(GLM_COMPILER & GLM_COMPILER_VC) From 9c6acd6549f10275736498e55518918202019f52 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 17:08:59 +0100 Subject: [PATCH 3/4] Fixed ticket 125: missing dependence --- glm/gtx/matrix_query.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index b71b1af0..5a3aa3cc 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -8,6 +8,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Dependency: // - GLM core +// - GLM_GTX_matrix_query /////////////////////////////////////////////////////////////////////////////////////////////////// #ifndef glm_gtx_matrix_query @@ -24,7 +25,7 @@ namespace glm{ namespace gtx{ namespace matrix_query ///< GLM_GTX_matrix_query: Query to evaluate matrix properties { - /// \addtogroup gtx_matrix_query + /// @addtogroup gtx_matrix_query /// @{ //! Return if a matrix a null matrix. From 9385876f51a6343659418019498031c28d58fe66 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 17:13:37 +0100 Subject: [PATCH 4/4] Fixed ticket 120, M_1_PI undeclare in C++0x --- glm/gtx/matrix_interpolation.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtx/matrix_interpolation.inl b/glm/gtx/matrix_interpolation.inl index ab4d2bb4..0c5f9b1b 100644 --- a/glm/gtx/matrix_interpolation.inl +++ b/glm/gtx/matrix_interpolation.inl @@ -28,7 +28,7 @@ namespace matrix_interpolation axis.z = (T)0.0; return; } - angle = M_1_PI; + angle = T(3.1415926535897932384626433832795); T xx = (mat[0][0] + (T)1.0) / (T)2.0; T yy = (mat[1][1] + (T)1.0) / (T)2.0; T zz = (mat[2][2] + (T)1.0) / (T)2.0;