Procházet zdrojové kódy

Compilation fixes due to missing P template parameters.

Dave Reid před 12 roky
rodič
revize
b6d994f638

+ 2 - 2
glm/gtc/matrix_transform.inl

@@ -339,7 +339,7 @@ namespace glm
 		return Result;
 		return Result;
 	}
 	}
 
 
-	template <typename T, precision P, typename U>
+	template <typename T, typename U, precision P>
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> project
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> project
 	(
 	(
 		detail::tvec3<T, P> const & obj,
 		detail::tvec3<T, P> const & obj,
@@ -360,7 +360,7 @@ namespace glm
 		return detail::tvec3<T, P>(tmp);
 		return detail::tvec3<T, P>(tmp);
 	}
 	}
 
 
-	template <typename T, precision P, typename U>
+	template <typename T, typename U, precision P>
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> unProject
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> unProject
 	(
 	(
 		detail::tvec3<T, P> const & win,
 		detail::tvec3<T, P> const & win,

+ 6 - 6
glm/gtx/fast_exponential.inl

@@ -27,20 +27,20 @@ namespace glm
 		return f;
 		return f;
 	}
 	}
 
 
-	template <typename T>
+	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tvec2<T, P> fastPow(
 	GLM_FUNC_QUALIFIER detail::tvec2<T, P> fastPow(
 		const detail::tvec2<T, P>& x, 
 		const detail::tvec2<T, P>& x, 
-		const detail::tvec2<int>& y)
+		const detail::tvec2<int, P>& y)
 	{
 	{
 		return detail::tvec2<T, P>(
 		return detail::tvec2<T, P>(
 			fastPow(x.x, y.x),
 			fastPow(x.x, y.x),
 			fastPow(x.y, y.y));
 			fastPow(x.y, y.y));
 	}
 	}
 
 
-	template <typename T>
+	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> fastPow(
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> fastPow(
 		const detail::tvec3<T, P>& x, 
 		const detail::tvec3<T, P>& x, 
-		const detail::tvec3<int>& y)
+		const detail::tvec3<int, P>& y)
 	{
 	{
 		return detail::tvec3<T, P>(
 		return detail::tvec3<T, P>(
 			fastPow(x.x, y.x),
 			fastPow(x.x, y.x),
@@ -48,10 +48,10 @@ namespace glm
 			fastPow(x.z, y.z));
 			fastPow(x.z, y.z));
 	}
 	}
 
 
-	template <typename T>
+	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tvec4<T, P> fastPow(
 	GLM_FUNC_QUALIFIER detail::tvec4<T, P> fastPow(
 		const detail::tvec4<T, P>& x, 
 		const detail::tvec4<T, P>& x, 
-		const detail::tvec4<int>& y)
+		const detail::tvec4<int, P>& y)
 	{
 	{
 		return detail::tvec4<T, P>(
 		return detail::tvec4<T, P>(
 			fastPow(x.x, y.x),
 			fastPow(x.x, y.x),

+ 15 - 15
glm/gtx/fast_square_root.inl

@@ -53,30 +53,30 @@ namespace glm
 		return abs(x);
 		return abs(x);
 	}
 	}
 
 
-	template <typename valType>
+	template <typename valType, precision P>
 	GLM_FUNC_QUALIFIER valType fastLength
 	GLM_FUNC_QUALIFIER valType fastLength
 	(
 	(
-		detail::tvec2<valType> const & x
+		detail::tvec2<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y;
 		valType sqr = x.x * x.x + x.y * x.y;
 		return fastSqrt(sqr);
 		return fastSqrt(sqr);
 	}
 	}
 
 
-	template <typename valType>
+	template <typename valType, precision P>
 	GLM_FUNC_QUALIFIER valType fastLength
 	GLM_FUNC_QUALIFIER valType fastLength
 	(
 	(
-		detail::tvec3<valType> const & x
+		detail::tvec3<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
 		return fastSqrt(sqr);
 		return fastSqrt(sqr);
 	}
 	}
 
 
-	template <typename valType>
+	template <typename valType, precision P>
 	GLM_FUNC_QUALIFIER valType fastLength
 	GLM_FUNC_QUALIFIER valType fastLength
 	(
 	(
-		detail::tvec4<valType> const & x
+		detail::tvec4<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
 		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);
 		return x > genType(0) ? genType(1) : -genType(1);
 	}
 	}
 
 
-	template <typename valType>
-	GLM_FUNC_QUALIFIER detail::tvec2<valType> fastNormalize
+	template <typename valType, precision P>
+	GLM_FUNC_QUALIFIER detail::tvec2<valType, P> fastNormalize
 	(
 	(
-		detail::tvec2<valType> const & x
+		detail::tvec2<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y;
 		valType sqr = x.x * x.x + x.y * x.y;
 		return x * fastInverseSqrt(sqr);
 		return x * fastInverseSqrt(sqr);
 	}
 	}
 
 
-	template <typename valType>
-	GLM_FUNC_QUALIFIER detail::tvec3<valType> fastNormalize
+	template <typename valType, precision P>
+	GLM_FUNC_QUALIFIER detail::tvec3<valType, P> fastNormalize
 	(
 	(
-		detail::tvec3<valType> const & x
+		detail::tvec3<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
 		return x * fastInverseSqrt(sqr);
 		return x * fastInverseSqrt(sqr);
 	}
 	}
 
 
-	template <typename valType>
-	GLM_FUNC_QUALIFIER detail::tvec4<valType> fastNormalize
+	template <typename valType, precision P>
+	GLM_FUNC_QUALIFIER detail::tvec4<valType, P> fastNormalize
 	(
 	(
-		detail::tvec4<valType> const & x
+		detail::tvec4<valType, P> const & x
 	)
 	)
 	{
 	{
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
 		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;

+ 1 - 1
glm/gtx/normal.hpp

@@ -53,7 +53,7 @@ namespace glm
 
 
 	//! Computes triangle normal from triangle points. 
 	//! Computes triangle normal from triangle points. 
 	//! From GLM_GTX_normal extension.
 	//! From GLM_GTX_normal extension.
-    template <typename T> 
+    template <typename T, precision P> 
 	detail::tvec3<T, P> triangleNormal(
 	detail::tvec3<T, P> triangleNormal(
 		detail::tvec3<T, P> const & p1, 
 		detail::tvec3<T, P> const & p1, 
 		detail::tvec3<T, P> const & p2, 
 		detail::tvec3<T, P> const & p2, 

+ 1 - 1
glm/gtx/normal.inl

@@ -9,7 +9,7 @@
 
 
 namespace glm
 namespace glm
 {
 {
-	template <typename T> 
+	template <typename T, precision P> 
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> triangleNormal
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> triangleNormal
 	(
 	(
 		detail::tvec3<T, P> const & p1, 
 		detail::tvec3<T, P> const & p1, 

+ 2 - 2
glm/gtx/orthonormalize.hpp

@@ -53,13 +53,13 @@ namespace glm
 
 
 	//! Returns the orthonormalized matrix of m.
 	//! Returns the orthonormalized matrix of m.
 	//! From GLM_GTX_orthonormalize extension.
 	//! From GLM_GTX_orthonormalize extension.
-	template <typename T> 
+	template <typename T, precision P> 
 	detail::tmat3x3<T, P> orthonormalize(
 	detail::tmat3x3<T, P> orthonormalize(
 		const detail::tmat3x3<T, P>& m);
 		const detail::tmat3x3<T, P>& m);
 		
 		
     //! Orthonormalizes x according y.
     //! Orthonormalizes x according y.
 	//! From GLM_GTX_orthonormalize extension.
 	//! From GLM_GTX_orthonormalize extension.
-	template <typename T> 
+	template <typename T, precision P> 
 	detail::tvec3<T, P> orthonormalize(
 	detail::tvec3<T, P> orthonormalize(
 		const detail::tvec3<T, P>& x, 
 		const detail::tvec3<T, P>& x, 
 		const detail::tvec3<T, P>& y);
 		const detail::tvec3<T, P>& y);

+ 2 - 2
glm/gtx/orthonormalize.inl

@@ -9,7 +9,7 @@
 
 
 namespace glm
 namespace glm
 {
 {
-	template <typename T>
+	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tmat3x3<T, P> orthonormalize
 	GLM_FUNC_QUALIFIER detail::tmat3x3<T, P> orthonormalize
 	(
 	(
 		const detail::tmat3x3<T, P>& m
 		const detail::tmat3x3<T, P>& m
@@ -31,7 +31,7 @@ namespace glm
 		return r;
 		return r;
 	}
 	}
 
 
-	template <typename T> 
+	template <typename T, precision P> 
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> orthonormalize
 	GLM_FUNC_QUALIFIER detail::tvec3<T, P> orthonormalize
 	(
 	(
 		const detail::tvec3<T, P>& x, 
 		const detail::tvec3<T, P>& x,