From b6d994f6382f94e8e779c4185d1d785eb91dbd31 Mon Sep 17 00:00:00 2001 From: Dave Reid Date: Tue, 23 Apr 2013 10:01:50 +1000 Subject: [PATCH] Compilation fixes due to missing P template parameters. --- glm/gtc/matrix_transform.inl | 4 ++-- glm/gtx/fast_exponential.inl | 12 ++++++------ glm/gtx/fast_square_root.inl | 30 +++++++++++++++--------------- glm/gtx/normal.hpp | 2 +- glm/gtx/normal.inl | 2 +- glm/gtx/orthonormalize.hpp | 4 ++-- glm/gtx/orthonormalize.inl | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 6bd9a184..cb6fdd73 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -339,7 +339,7 @@ namespace glm return Result; } - template + template GLM_FUNC_QUALIFIER detail::tvec3 project ( detail::tvec3 const & obj, @@ -360,7 +360,7 @@ namespace glm return detail::tvec3(tmp); } - template + template GLM_FUNC_QUALIFIER detail::tvec3 unProject ( detail::tvec3 const & win, diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl index 5d957dab..790fabba 100644 --- a/glm/gtx/fast_exponential.inl +++ b/glm/gtx/fast_exponential.inl @@ -27,20 +27,20 @@ namespace glm return f; } - template + template GLM_FUNC_QUALIFIER detail::tvec2 fastPow( const detail::tvec2& x, - const detail::tvec2& y) + const detail::tvec2& y) { return detail::tvec2( fastPow(x.x, y.x), fastPow(x.y, y.y)); } - template + template GLM_FUNC_QUALIFIER detail::tvec3 fastPow( const detail::tvec3& x, - const detail::tvec3& y) + const detail::tvec3& y) { return detail::tvec3( fastPow(x.x, y.x), @@ -48,10 +48,10 @@ namespace glm fastPow(x.z, y.z)); } - template + template GLM_FUNC_QUALIFIER detail::tvec4 fastPow( const detail::tvec4& x, - const detail::tvec4& y) + const detail::tvec4& y) { return detail::tvec4( fastPow(x.x, y.x), diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl index 0f51fbbd..12838e66 100644 --- a/glm/gtx/fast_square_root.inl +++ b/glm/gtx/fast_square_root.inl @@ -53,30 +53,30 @@ namespace glm return abs(x); } - template + template GLM_FUNC_QUALIFIER valType fastLength ( - detail::tvec2 const & x + detail::tvec2 const & x ) { valType sqr = x.x * x.x + x.y * x.y; return fastSqrt(sqr); } - template + template GLM_FUNC_QUALIFIER valType fastLength ( - detail::tvec3 const & x + detail::tvec3 const & x ) { valType sqr = x.x * x.x + x.y * x.y + x.z * x.z; return fastSqrt(sqr); } - template + template GLM_FUNC_QUALIFIER valType fastLength ( - detail::tvec4 const & x + detail::tvec4 const & x ) { valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w; @@ -104,30 +104,30 @@ namespace glm return x > genType(0) ? genType(1) : -genType(1); } - template - GLM_FUNC_QUALIFIER detail::tvec2 fastNormalize + template + GLM_FUNC_QUALIFIER detail::tvec2 fastNormalize ( - detail::tvec2 const & x + detail::tvec2 const & x ) { valType sqr = x.x * x.x + x.y * x.y; return x * fastInverseSqrt(sqr); } - template - GLM_FUNC_QUALIFIER detail::tvec3 fastNormalize + template + GLM_FUNC_QUALIFIER detail::tvec3 fastNormalize ( - detail::tvec3 const & x + detail::tvec3 const & x ) { valType sqr = x.x * x.x + x.y * x.y + x.z * x.z; return x * fastInverseSqrt(sqr); } - template - GLM_FUNC_QUALIFIER detail::tvec4 fastNormalize + template + GLM_FUNC_QUALIFIER detail::tvec4 fastNormalize ( - detail::tvec4 const & x + detail::tvec4 const & x ) { valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w; diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index e0392136..1a43ab80 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -53,7 +53,7 @@ namespace glm //! Computes triangle normal from triangle points. //! From GLM_GTX_normal extension. - template + template detail::tvec3 triangleNormal( detail::tvec3 const & p1, detail::tvec3 const & p2, diff --git a/glm/gtx/normal.inl b/glm/gtx/normal.inl index 2dceb6a6..0846d899 100644 --- a/glm/gtx/normal.inl +++ b/glm/gtx/normal.inl @@ -9,7 +9,7 @@ namespace glm { - template + template GLM_FUNC_QUALIFIER detail::tvec3 triangleNormal ( detail::tvec3 const & p1, diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 7eeb0c79..d81b4e38 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -53,13 +53,13 @@ namespace glm //! Returns the orthonormalized matrix of m. //! From GLM_GTX_orthonormalize extension. - template + template detail::tmat3x3 orthonormalize( const detail::tmat3x3& m); //! Orthonormalizes x according y. //! From GLM_GTX_orthonormalize extension. - template + template detail::tvec3 orthonormalize( const detail::tvec3& x, const detail::tvec3& y); diff --git a/glm/gtx/orthonormalize.inl b/glm/gtx/orthonormalize.inl index a9f40a5f..939080f0 100644 --- a/glm/gtx/orthonormalize.inl +++ b/glm/gtx/orthonormalize.inl @@ -9,7 +9,7 @@ namespace glm { - template + template GLM_FUNC_QUALIFIER detail::tmat3x3 orthonormalize ( const detail::tmat3x3& m @@ -31,7 +31,7 @@ namespace glm return r; } - template + template GLM_FUNC_QUALIFIER detail::tvec3 orthonormalize ( const detail::tvec3& x,