Merge branch 'swizzle' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into swizzle

glm/core/_vectorize.hpp

@@ -26,7 +26,7 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-#define VECTORIZE_1PARAM(func) \
+#define VECTORIZE2_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec2<T> func( \
 		detail::tvec2<T> const & v) \
@@ -34,8 +34,9 @@
         return detail::tvec2<T>( \
             func(v.x), \
             func(v.y)); \
-    } \
+    }
-	\
+
+#define VECTORIZE3_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec3<T> func( \
 		detail::tvec3<T> const & v) \
@@ -44,8 +45,9 @@
             func(v.x), \
             func(v.y), \
             func(v.z)); \
-    } \
+    }
-	\
+
+#define VECTORIZE4_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec4<T> func( \
 		detail::tvec4<T> const & v) \
@@ -57,7 +59,59 @@
             func(v.w)); \
     }
 
-#define VECTORIZE_2PARAMS(func) \
+#define VECTORIZE_VEC(func) \
+	VECTORIZE2_VEC(func) \
+	VECTORIZE3_VEC(func) \
+	VECTORIZE4_VEC(func)
+
+#define VECTORIZE2_VEC_SCA(func) \
+    template <typename T> \
+    GLM_FUNC_QUALIFIER detail::tvec2<T> func \
+	( \
+		detail::tvec2<T> const & x,  \
+		typename detail::tvec2<T>::value_type const & y \
+	) \
+    { \
+        return detail::tvec2<T>( \
+            func(x.x, y), \
+            func(x.y, y)); \
+    }
+
+#define VECTORIZE3_VEC_SCA(func) \
+    template <typename T> \
+    GLM_FUNC_QUALIFIER detail::tvec3<T> func \
+	( \
+		detail::tvec3<T> const & x,  \
+		typename detail::tvec3<T>::value_type const & y \
+	) \
+    { \
+        return detail::tvec3<T>( \
+            func(x.x, y), \
+            func(x.y, y), \
+            func(x.z, y)); \
+    }
+
+#define VECTORIZE4_VEC_SCA(func) \
+    template <typename T> \
+    GLM_FUNC_QUALIFIER detail::tvec4<T> func \
+	( \
+		detail::tvec4<T> const & x,  \
+		typename detail::tvec4<T>::value_type const & y \
+	) \
+    { \
+        return detail::tvec4<T>( \
+            func(x.x, y), \
+            func(x.y, y), \
+            func(x.z, y), \
+            func(x.w, y)); \
+    }
+
+#define VECTORIZE_VEC_SCA(func) \
+	VECTORIZE2_VEC_SCA(func) \
+	VECTORIZE3_VEC_SCA(func) \
+	VECTORIZE4_VEC_SCA(func)
+
+#define VECTORIZE2_VEC_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec2<T> func \
 	( \
@@ -68,8 +122,9 @@
         return detail::tvec2<T>( \
             func(x.x, y.x), \
             func(x.y, y.y)); \
-    } \
+    }
-	 \
+
+#define VECTORIZE3_VEC_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec3<T> func \
 	( \
@@ -81,8 +136,9 @@
             func(x.x, y.x), \
             func(x.y, y.y), \
             func(x.z, y.z)); \
-    } \
+    }
-	 \
+
+#define VECTORIZE4_VEC_VEC(func) \
     template <typename T> \
     GLM_FUNC_QUALIFIER detail::tvec4<T> func \
 	( \
@@ -96,3 +152,8 @@
             func(x.z, y.z), \
             func(x.w, y.w)); \
     }
+
+#define VECTORIZE_VEC_VEC(func) \
+	VECTORIZE2_VEC_VEC(func) \
+	VECTORIZE3_VEC_VEC(func) \
+	VECTORIZE4_VEC_VEC(func)

glm/core/func_common.hpp

@@ -44,72 +44,90 @@ namespace glm
 	/// @{
 
 	/// Returns x if x >= 0; otherwise, it returns -x.
+	/// 
+	/// @tparam genType floating-point or signed integer; scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/abs.xml">GLSL abs man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
-    template <typename genFIType> 
+    template <typename genType> 
-	genFIType abs(genFIType const & x);
+	genType abs(genType const & x);
 
 	/// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. 
-    /// 
+	/// 
+	/// @tparam genType Floating-point or signed integer; scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sign.xml">GLSL sign man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
-	template <typename genFIType> 
+	template <typename genType> 
-	genFIType sign(genFIType const & x);
+	genType sign(genType const & x);
 
-    //! Returns a value equal to the nearest integer that is less then or equal to x. 
+    /// Returns a value equal to the nearest integer that is less then or equal to x. 
-    //! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floor.xml">GLSL floor man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	genType floor(genType const & x);
 
-	//! Returns a value equal to the nearest integer to x 
+	/// Returns a value equal to the nearest integer to x 
-	//! whose absolute value is not larger than the absolute value of x. 
+	/// whose absolute value is not larger than the absolute value of x. 
-    //! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/trunc.xml">GLSL trunc man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	genType trunc(genType const & x);
 
-	//! Returns a value equal to the nearest integer to x. 
+	/// Returns a value equal to the nearest integer to x. 
-	//! The fraction 0.5 will round in a direction chosen by the 
+	/// The fraction 0.5 will round in a direction chosen by the 
-	//! implementation, presumably the direction that is fastest. 
+	/// implementation, presumably the direction that is fastest. 
-	//! This includes the possibility that round(x) returns the 
+	/// This includes the possibility that round(x) returns the 
-	//! same value as roundEven(x) for all values of x. 
+	/// same value as roundEven(x) for all values of x. 
-    //! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	genType round(genType const & x);
 
-	//! Returns a value equal to the nearest integer to x.
+	/// Returns a value equal to the nearest integer to x.
-	//! A fractional part of 0.5 will round toward the nearest even
+	/// A fractional part of 0.5 will round toward the nearest even
-	//! integer. (Both 3.5 and 4.5 for x will return 4.0.) 
+	/// integer. (Both 3.5 and 4.5 for x will return 4.0.) 
-    //! 
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/roundEven.xml">GLSL roundEven man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	genType roundEven(genType const & x);
 
-	//! Returns a value equal to the nearest integer 
+	/// Returns a value equal to the nearest integer 
-	//! that is greater than or equal to x. 
+	/// that is greater than or equal to x. 
-    //! 
+    /// 
+	/// @tparam genType Floating-point scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ceil.xml">GLSL ceil man page</a>
 	/// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
     template <typename genType> 
 	genType ceil(genType const & x);
 
-	//! Return x - floor(x).
+	/// Return x - floor(x).
-    //! 
+    /// 
+	/// @tparam genType Floating-point scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fract.xml">GLSL fract man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
     template <typename genType> 
 	genType fract(genType const & x);
 
-	//! Modulus. Returns x - y * floor(x / y) 
+	/// Modulus. Returns x - y * floor(x / y) 
-	//! for each component in x using the floating point value y.
+	/// for each component in x using the floating point value y.
-    //! 
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
     template <typename genType> 
@@ -117,9 +135,11 @@ namespace glm
 		genType const & x, 
 		genType const & y);
 
-	//! Modulus. Returns x - y * floor(x / y) 
+	/// Modulus. Returns x - y * floor(x / y) 
-	//! for each component in x using the floating point value y.
+	/// for each component in x using the floating point value y.
-    //! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
     template <typename genType> 
@@ -127,11 +147,13 @@ namespace glm
 		genType const & x, 
 		typename genType::value_type const & y);
 
-	//! Returns the fractional part of x and sets i to the integer
+	/// Returns the fractional part of x and sets i to the integer
-	//! part (as a whole number floating point value). Both the
+	/// part (as a whole number floating point value). Both the
-	//! return value and the output parameter will have the same
+	/// return value and the output parameter will have the same
-	//! sign as x.
+	/// sign as x.
-    //! 
+    /// 
+	/// @tparam genType Floating-point scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/modf.xml">GLSL modf man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
@@ -140,6 +162,8 @@ namespace glm
 		genType & i);
 
     /// Returns y if y < x; otherwise, it returns x.
+	///
+	/// @tparam genType Floating-point or integer; scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
@@ -154,6 +178,8 @@ namespace glm
 		typename genType::value_type const & y);
 
     /// Returns y if x < y; otherwise, it returns x.
+	/// 
+	/// @tparam genType Floating-point or integer; scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/max.xml">GLSL max man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
@@ -167,9 +193,11 @@ namespace glm
 		genType const & x, 
 		typename genType::value_type const & y);
 
-    //! Returns min(max(x, minVal), maxVal) for each component in x 
+    /// Returns min(max(x, minVal), maxVal) for each component in x 
-	//! using the floating-point values minVal and maxVal.
+	/// using the floating-point values minVal and maxVal.
-    //! 
+    ///
+	/// @tparam genType Floating-point or integer; scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/clamp.xml">GLSL clamp man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
@@ -243,16 +271,18 @@ namespace glm
 		typename genType::value_type const & edge, 
 		genType const & x);
 
-	//! Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
+	/// Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
-	//! performs smooth Hermite interpolation between 0 and 1
+	/// performs smooth Hermite interpolation between 0 and 1
-	//! when edge0 < x < edge1. This is useful in cases where
+	/// when edge0 < x < edge1. This is useful in cases where
-	//! you would want a threshold function with a smooth
+	/// you would want a threshold function with a smooth
-	//! transition. This is equivalent to:
+	/// transition. This is equivalent to:
-	//! genType t;
+	/// genType t;
-	//! t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
+	/// t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
-	//! return t * t * (3 – 2 * t);
+	/// return t * t * (3 – 2 * t);
-	//! Results are undefined if edge0 >= edge1.
+	/// Results are undefined if edge0 >= edge1.
-    //! 
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/smoothstep.xml">GLSL smoothstep man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
@@ -267,97 +297,123 @@ namespace glm
 		typename genType::value_type const & edge1, 
 		genType const & x);
 
-	//! Returns true if x holds a NaN (not a number)
+	/// Returns true if x holds a NaN (not a number)
-	//! representation in the underlying implementation's set of
+	/// representation in the underlying implementation's set of
-	//! floating point representations. Returns false otherwise,
+	/// floating point representations. Returns false otherwise,
-	//! including for implementations with no NaN
+	/// including for implementations with no NaN
-	//! representations.
+	/// representations.
-    //! 
+    /// 
+	/// @tparam genType Floating-point scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	typename genType::bool_type isnan(genType const & x);
 
-	//! Returns true if x holds a positive infinity or negative
+	/// Returns true if x holds a positive infinity or negative
-	//! infinity representation in the underlying implementation's
+	/// infinity representation in the underlying implementation's
-	//! set of floating point representations. Returns false
+	/// set of floating point representations. Returns false
-	//! otherwise, including for implementations with no infinity
+	/// otherwise, including for implementations with no infinity
-	//! representations.
+	/// representations.
-    //! 
+    /// 
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isinf.xml">GLSL isinf man page</a>
 	/// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType> 
 	typename genType::bool_type isinf(genType const & x);
 
-	//! Returns a signed integer value representing
+	/// Returns a signed integer value representing
-	//! the encoding of a floating-point value. The floatingpoint
+	/// the encoding of a floating-point value. The floatingpoint
-	//! value's bit-level representation is preserved.
+	/// value's bit-level representation is preserved.
-    //! 
+	///
+	/// @tparam genType Single-precision floating-point scalar or vector types.
+	/// @tparam genIType Signed integer scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType, typename genIType>
 	genIType floatBitsToInt(genType const & value);
 
-	//! Returns a unsigned integer value representing
+	/// Returns a unsigned integer value representing
-	//! the encoding of a floating-point value. The floatingpoint
+	/// the encoding of a floating-point value. The floatingpoint
-	//! value's bit-level representation is preserved.
+	/// value's bit-level representation is preserved.
-    //! 
+	///
+	/// @tparam genType Single-precision floating-point scalar or vector types.
+	/// @tparam genUType Unsigned integer scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType, typename genUType>
 	genUType floatBitsToUint(genType const & value);
 
-	//! Returns a floating-point value corresponding to a signed
+	/// Returns a floating-point value corresponding to a signed
-	//! integer encoding of a floating-point value.
+	/// integer encoding of a floating-point value.
-	//! If an inf or NaN is passed in, it will not signal, and the
+	/// If an inf or NaN is passed in, it will not signal, and the
-	//! resulting floating point value is unspecified. Otherwise,
+	/// resulting floating point value is unspecified. Otherwise,
-	//! the bit-level representation is preserved.
+	/// the bit-level representation is preserved.
-    //! 
+    /// 
+	/// @tparam genType Single-precision floating-point scalar or vector types.
+	/// @tparam genIType Signed integer scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
+	/// 
+	/// @todo - Clarify this declaration, we don't need to actually specify the return type
 	template <typename genType, typename genIType>
 	genType intBitsToFloat(genIType const & value);
         
-    //! Returns a floating-point value corresponding to a
+    /// Returns a floating-point value corresponding to a
-    //! unsigned integer encoding of a floating-point value.
+    /// unsigned integer encoding of a floating-point value.
-    //! If an inf or NaN is passed in, it will not signal, and the
+    /// If an inf or NaN is passed in, it will not signal, and the
-    //! resulting floating point value is unspecified. Otherwise,
+    /// resulting floating point value is unspecified. Otherwise,
-    //! the bit-level representation is preserved.
+    /// the bit-level representation is preserved.
-    //! 
+    /// 
+	/// @tparam genType Single-precision floating-point scalar or vector types.
+	/// @tparam genUType Unsigned integer scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
+	/// 
+	/// @todo - Clarify this declaration, we don't need to actually specify the return type
     template <typename genType, typename genUType>
     genType uintBitsToFloat(genUType const & value);
         
-	//! Computes and returns a * b + c.
+	/// Computes and returns a * b + c.
-    //! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fma.xml">GLSL fma man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType>
 	genType fma(genType const & a, genType const & b, genType const & c);
 
-	//! Splits x into a floating-point significand in the range
+	/// Splits x into a floating-point significand in the range
-	//! [0.5, 1.0) and an integral exponent of two, such that:
+	/// [0.5, 1.0) and an integral exponent of two, such that:
-	//! x = significand * exp(2, exponent)
+	/// x = significand * exp(2, exponent)
-	//! 
+	/// 
-	//! The significand is returned by the function and the
+	/// The significand is returned by the function and the
-	//! exponent is returned in the parameter exp. For a
+	/// exponent is returned in the parameter exp. For a
-	//! floating-point value of zero, the significant and exponent
+	/// floating-point value of zero, the significant and exponent
-	//! are both zero. For a floating-point value that is an
+	/// are both zero. For a floating-point value that is an
-	//! infinity or is not a number, the results are undefined.
+	/// infinity or is not a number, the results are undefined.
-	//! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
 	/// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/frexp.xml">GLSL frexp man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType, typename genIType>
 	genType frexp(genType const & x, genIType & exp);
 
-	//! Builds a floating-point number from x and the
+	/// Builds a floating-point number from x and the
-	//! corresponding integral exponent of two in exp, returning:
+	/// corresponding integral exponent of two in exp, returning:
-	//! significand * exp(2, exponent)
+	/// significand * exp(2, exponent)
-	//! 
+	/// 
-	//! If this product is too large to be represented in the
+	/// If this product is too large to be represented in the
-	//! floating-point type, the result is undefined.
+	/// floating-point type, the result is undefined.
-	//! 
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+	///  
 	/// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ldexp.xml">GLSL ldexp man page</a>; 
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3</a>
 	template <typename genType, typename genIType>

glm/core/func_common.inl

@@ -70,7 +70,7 @@ namespace detail
 		return detail::Abs_<genFIType, std::numeric_limits<genFIType>::is_signed>::get(x);
     }
 
-	VECTORIZE_1PARAM(abs)
+	VECTORIZE_VEC(abs)
 
     // sign
 	//Try something like based on x >> 31 to get the sign bit
@@ -94,7 +94,7 @@ namespace detail
         return result;
 	}
 	
-	VECTORIZE_1PARAM(sign)
+	VECTORIZE_VEC(sign)
 
     // floor
     template <>
@@ -111,7 +111,7 @@ namespace detail
         return ::std::floor(x);
     }
 
-	VECTORIZE_1PARAM(floor)
+	VECTORIZE_VEC(floor)
 
     // trunc
     template <typename genType>
@@ -121,7 +121,7 @@ namespace detail
         return x < 0 ? -floor(-x) : floor(x);
     }
 
-	VECTORIZE_1PARAM(trunc)
+	VECTORIZE_VEC(trunc)
 
     // round
     template <typename genType>
@@ -134,7 +134,7 @@ namespace detail
 		return genType(int(x + genType(0.5)));
     }
 
-	VECTORIZE_1PARAM(round)
+	VECTORIZE_VEC(round)
 
 /*
     // roundEven
@@ -161,7 +161,7 @@ namespace detail
 		return genType(int(x + RoundValue));
     }
 	
-	VECTORIZE_1PARAM(roundEven)
+	VECTORIZE_VEC(roundEven)
 
     // ceil
     template <typename genType>
@@ -172,7 +172,7 @@ namespace detail
         return ::std::ceil(x);
     }
 
-	VECTORIZE_1PARAM(ceil)
+	VECTORIZE_VEC(ceil)
 
     // fract
     template <typename genType>
@@ -186,7 +186,7 @@ namespace detail
         return x - ::std::floor(x);
     }
 
-	VECTORIZE_1PARAM(fract)
+	VECTORIZE_VEC(fract)
 
     // mod
     template <typename genType>
@@ -201,83 +201,8 @@ namespace detail
         return x - y * floor(x / y);
     }
 
-    template <typename T>
+	VECTORIZE_VEC_SCA(mod)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> mod
+	VECTORIZE_VEC_VEC(mod)
-	(
-		detail::tvec2<T> const & x, 
-		typename detail::tvec2<T>::value_type const & y
-	)
-    {
-        return detail::tvec2<T>(
-            mod(x.x, y),
-            mod(x.y, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> mod
-	(
-		detail::tvec3<T> const & x, 
-		typename detail::tvec3<T>::value_type const & y
-	)
-    {
-        return detail::tvec3<T>(
-            mod(x.x, y),
-            mod(x.y, y),
-            mod(x.z, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> mod
-	(
-		detail::tvec4<T> const & x, 
-		typename detail::tvec4<T>::value_type const & y
-	)
-    {
-        return detail::tvec4<T>(
-            mod(x.x, y),
-            mod(x.y, y),
-            mod(x.z, y),
-            mod(x.w, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec2<T> mod
-	(
-		detail::tvec2<T> const & x, 
-		detail::tvec2<T> const & y
-	)
-    {
-        return detail::tvec2<T>(
-            mod(x.x, y.x),
-            mod(x.y, y.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> mod
-	(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & y
-	)
-    {
-        return detail::tvec3<T>(
-            mod(x.x, y.x),
-            mod(x.y, y.y),
-            mod(x.z, y.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> mod
-	(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & y
-	)
-    {
-        return detail::tvec4<T>(
-            mod(x.x, y.x),
-            mod(x.y, y.y),
-            mod(x.z, y.z),
-            mod(x.w, y.w));
-    }
 
     // modf
     template <typename genType>
@@ -298,39 +223,39 @@ namespace detail
     GLM_FUNC_QUALIFIER detail::tvec2<valType> modf
 	(
 		detail::tvec2<valType> const & x, 
-		detail::tvec2<valType> const & y
+		detail::tvec2<valType> & i
 	)
     {
         return detail::tvec2<valType>(
-            modf(x.x, y.x),
+            modf(x.x, i.x),
-            modf(x.y, y.y));
+            modf(x.y, i.y));
     }
 
     template <typename valType>
     GLM_FUNC_QUALIFIER detail::tvec3<valType> modf
 	(
 		detail::tvec3<valType> const & x, 
-		detail::tvec3<valType> const & y
+		detail::tvec3<valType> & i
 	)
     {
         return detail::tvec3<valType>(
-            modf(x.x, y.x),
+            modf(x.x, i.x),
-            modf(x.y, y.y),
+            modf(x.y, i.y),
-            modf(x.z, y.z));
+            modf(x.z, i.z));
     }
 
     template <typename valType>
     GLM_FUNC_QUALIFIER detail::tvec4<valType> modf
 	(
 		detail::tvec4<valType> const & x, 
-		detail::tvec4<valType> const & y
+		detail::tvec4<valType> & i
 	)
     {
         return detail::tvec4<valType>(
-            modf(x.x, y.x),
+            modf(x.x, i.x),
-            modf(x.y, y.y),
+            modf(x.y, i.y),
-            modf(x.z, y.z),
+            modf(x.z, i.z),
-            modf(x.w, y.w));
+            modf(x.w, i.w));
     }
 
 	//// Only valid if (INT_MIN <= x-y <= INT_MAX)
@@ -357,83 +282,8 @@ namespace detail
         return x < y ? x : y;
     }
 
-    template <typename T>
+	VECTORIZE_VEC_SCA(min)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> min
+	VECTORIZE_VEC_VEC(min)
-	(
-		detail::tvec2<T> const & x, 
-		typename detail::tvec2<T>::value_type const & y
-	)
-    {
-        return detail::tvec2<T>(
-            min(x.x, y),
-            min(x.y, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> min
-	(
-		detail::tvec3<T> const & x, 
-		typename detail::tvec3<T>::value_type const & y
-	)
-    {
-        return detail::tvec3<T>(
-            min(x.x, y),
-            min(x.y, y),
-            min(x.z, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> min
-	(
-		detail::tvec4<T> const & x, 
-		typename detail::tvec4<T>::value_type const & y
-	)
-    {
-        return detail::tvec4<T>(
-            min(x.x, y),
-            min(x.y, y),
-            min(x.z, y),
-            min(x.w, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec2<T> min
-	(
-		detail::tvec2<T> const & x, 
-		detail::tvec2<T> const & y
-	)
-    {
-        return detail::tvec2<T>(
-            min(x.x, y.x),
-            min(x.y, y.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> min
-	(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & y
-	)
-    {
-        return detail::tvec3<T>(
-            min(x.x, y.x),
-            min(x.y, y.y),
-            min(x.z, y.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> min
-	(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & y
-	)
-    {
-        return detail::tvec4<T>(
-            min(x.x, y.x),
-            min(x.y, y.y),
-            min(x.z, y.z),
-            min(x.w, y.w));
-    }
 
     // max
     template <typename genType>
@@ -451,82 +301,8 @@ namespace detail
 		return x > y ? x : y;
     }
 
-    template <typename T>
+	VECTORIZE_VEC_SCA(max)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> max
+	VECTORIZE_VEC_VEC(max)
-	(
-		detail::tvec2<T> const & x, 
-		typename detail::tvec2<T>::value_type y
-	)
-    {
-        return detail::tvec2<T>(
-            max(x.x, y),
-            max(x.y, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> max
-	(
-		detail::tvec3<T> const & x, 
-		typename detail::tvec3<T>::value_type y
-	)
-    {
-        return detail::tvec3<T>(
-            max(x.x, y),
-            max(x.y, y),
-            max(x.z, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> max
-	(
-		detail::tvec4<T> const & x, 
-		typename detail::tvec4<T>::value_type y
-	)
-    {
-        return detail::tvec4<T>(
-            max(x.x, y),
-            max(x.y, y),
-            max(x.z, y),
-            max(x.w, y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec2<T> max
-	(
-		detail::tvec2<T> const & x, 
-		detail::tvec2<T> const & y
-	)
-    {
-        return detail::tvec2<T>(
-            max(x.x, y.x),
-            max(x.y, y.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> max
-	(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & y
-	)
-    {
-        return detail::tvec3<T>(
-            max(x.x, y.x),
-            max(x.y, y.y),
-            max(x.z, y.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> max
-	(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & y)
-    {
-        return detail::tvec4<T>(
-            max(x.x, y.x),
-            max(x.y, y.y),
-            max(x.z, y.z),
-            max(x.w, y.w));
-    }
 
     // clamp
     template <typename valType>

glm/core/func_exponential.hpp

@@ -42,6 +42,9 @@ namespace glm
 	/// @{
 
 	/// Returns x raised to the y power. 
+	///
+	/// @param x pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
@@ -49,6 +52,9 @@ namespace glm
 	genType pow(genType const & x, genType const & y);
 
 	/// Returns the natural exponentiation of x, i.e., e^x.
+	///
+	/// @param x exp function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp.xml">GLSL exp man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
@@ -58,6 +64,9 @@ namespace glm
 	/// Returns the natural logarithm of x, i.e., 
 	/// returns the value y which satisfies the equation x = e^y. 
 	/// Results are undefined if x <= 0.
+	///
+	/// @param x log function is defined for input values of x defined in the range (0, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log.xml">GLSL log man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
@@ -65,6 +74,9 @@ namespace glm
 	genType log(genType const & x);
 
 	/// Returns 2 raised to the x power.
+	/// 
+	/// @param x exp2 function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp2.xml">GLSL exp2 man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
@@ -74,6 +86,9 @@ namespace glm
 	/// Returns the base 2 log of x, i.e., returns the value y, 
 	/// which satisfies the equation x = 2 ^ y.
     /// 
+	/// @param x log2 function is defined for input values of x defined in the range (0, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log2.xml">GLSL log2 man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
 	template <typename genType> 
@@ -81,6 +96,9 @@ namespace glm
 
 	/// Returns the positive square root of x.
     /// 
+	/// @param x sqrt function is defined for input values of x defined in the range [0, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sqrt.xml">GLSL sqrt man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
 	template <typename genType> 
@@ -88,6 +106,9 @@ namespace glm
     
 	/// Returns the reciprocal of the positive square root of x.
     /// 
+	/// @param x inversesqrt function is defined for input values of x defined in the range [0, inf+) in the limit of the type precision.
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inversesqrt.xml">GLSL inversesqrt man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2</a>
 	template <typename genType> 

glm/core/func_exponential.inl

@@ -26,6 +26,8 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "_vectorize.hpp"
+
 namespace glm
 {
     // pow
@@ -41,44 +43,7 @@ namespace glm
         return ::std::pow(x, y);
     }
 
-    template <typename T>
+	VECTORIZE_VEC_VEC(pow)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> pow
-	(
-		detail::tvec2<T> const & x, 
-		detail::tvec2<T> const & y
-	)
-    {
-        return detail::tvec2<T>(
-            pow(x.x, y.x),
-            pow(x.y, y.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> pow
-	(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & y
-	)
-    {
-        return detail::tvec3<T>(
-            pow(x.x, y.x),
-            pow(x.y, y.y),
-            pow(x.z, y.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> pow
-	(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & y
-	)
-    {
-        return detail::tvec4<T>(
-            pow(x.x, y.x),
-            pow(x.y, y.y),
-            pow(x.z, y.z),
-            pow(x.w, y.w));
-    }
 
     // exp
     template <typename genType>
@@ -92,41 +57,7 @@ namespace glm
         return ::std::exp(x);
     }
 
-    template <typename T>
+	VECTORIZE_VEC(exp)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> exp
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            exp(x.x),
-            exp(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> exp
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            exp(x.x),
-            exp(x.y),
-            exp(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> exp
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            exp(x.x),
-            exp(x.y),
-            exp(x.z),
-            exp(x.w));
-    }
 
     // log
     template <typename genType>
@@ -140,41 +71,7 @@ namespace glm
         return ::std::log(x);
     }
 
-    template <typename T>
+	VECTORIZE_VEC(log)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> log
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            log(x.x),
-            log(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> log
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            log(x.x),
-            log(x.y),
-            log(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> log
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            log(x.x),
-            log(x.y),
-            log(x.z),
-            log(x.w));
-    }
 
     //exp2, ln2 = 0.69314718055994530941723212145818f
     template <typename genType>
@@ -188,41 +85,7 @@ namespace glm
         return ::std::exp(genType(0.69314718055994530941723212145818) * x);
     }
 
-    template <typename T>
+	VECTORIZE_VEC(exp2)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> exp2
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            exp2(x.x),
-            exp2(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> exp2
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            exp2(x.x),
-            exp2(x.y),
-            exp2(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> exp2
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            exp2(x.x),
-            exp2(x.y),
-            exp2(x.z),
-            exp2(x.w));
-    }
 
 namespace detail
 {
@@ -255,44 +118,11 @@ namespace detail
 		genType const & x
 	)
     {
+		assert(x > genType(0)); // log2 is only defined on the range (0, inf]
 		return detail::compute_log2<detail::float_or_int_trait<genType>::ID>()(x);
     }
 
-    template <typename T>
+	VECTORIZE_VEC(log2)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> log2
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            log2(x.x),
-            log2(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> log2
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            log2(x.x),
-            log2(x.y),
-            log2(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> log2
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            log2(x.x),
-            log2(x.y),
-            log2(x.z),
-            log2(x.w));
-    }
 
     // sqrt
     template <typename genType>
@@ -306,41 +136,7 @@ namespace detail
         return genType(::std::sqrt(x));
     }
 
-    template <typename T>
+	VECTORIZE_VEC(sqrt)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> sqrt
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            glm::sqrt(x.x),
-            glm::sqrt(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> sqrt
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            glm::sqrt(x.x),
-            glm::sqrt(x.y),
-            glm::sqrt(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> sqrt
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            glm::sqrt(x.x),
-            glm::sqrt(x.y),
-            glm::sqrt(x.z),
-            glm::sqrt(x.w));
-    }
 
     template <typename genType>
     GLM_FUNC_QUALIFIER genType inversesqrt
@@ -353,40 +149,6 @@ namespace detail
         return genType(1) / ::std::sqrt(x);
     }
 
-    template <typename T>
+	VECTORIZE_VEC(inversesqrt)
-    GLM_FUNC_QUALIFIER detail::tvec2<T> inversesqrt
-	(
-		detail::tvec2<T> const & x
-	)
-    {
-        return detail::tvec2<T>(
-            inversesqrt(x.x),
-            inversesqrt(x.y));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec3<T> inversesqrt
-	(
-		detail::tvec3<T> const & x
-	)
-    {
-        return detail::tvec3<T>(
-            inversesqrt(x.x),
-            inversesqrt(x.y),
-            inversesqrt(x.z));
-    }
-
-    template <typename T>
-    GLM_FUNC_QUALIFIER detail::tvec4<T> inversesqrt
-	(
-		detail::tvec4<T> const & x
-	)
-    {
-        return detail::tvec4<T>(
-            inversesqrt(x.x),
-            inversesqrt(x.y),
-            inversesqrt(x.z),
-            inversesqrt(x.w));
-    }
 
 }//namespace glm

glm/core/func_geometric.hpp

@@ -43,6 +43,8 @@ namespace glm
 
 	/// Returns the length of x, i.e., sqrt(x * x).
     /// 
+	/// @tparam genType Floating-point vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/length.xml">GLSL length man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
 	template <typename genType> 
@@ -50,6 +52,8 @@ namespace glm
 		genType const & x); 
 
 	/// Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
+	///
+	/// @tparam genType Floating-point vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/distance.xml">GLSL distance man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
@@ -59,6 +63,8 @@ namespace glm
 		genType const & p1);
 
 	/// Returns the dot product of x and y, i.e., result = x * y.
+	///
+	/// @tparam genType Floating-point vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/dot.xml">GLSL dot man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
@@ -68,13 +74,15 @@ namespace glm
 		genType const & y);
 
 	/// Returns the cross product of x and y.
+	///
+	/// @tparam valType Floating-point scalar types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cross.xml">GLSL cross man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
-    template <typename T> 
+    template <typename valType> 
-	detail::tvec3<T> cross(
+	detail::tvec3<valType> cross(
-		detail::tvec3<T> const & x, 
+		detail::tvec3<valType> const & x, 
-		detail::tvec3<T> const & y);
+		detail::tvec3<valType> const & y);
 
 	/// Returns a vector in the same direction as x but with length of 1.
     /// 
@@ -85,6 +93,8 @@ namespace glm
 		genType const & x);
 
 	/// If dot(Nref, I) < 0.0, return N, otherwise, return -N.
+	///
+	/// @tparam genType Floating-point vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/faceforward.xml">GLSL faceforward man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
@@ -96,6 +106,8 @@ namespace glm
   
 	/// For the incident vector I and surface orientation N, 
 	/// returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
+	///
+	/// @tparam genType Floating-point vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/reflect.xml">GLSL reflect man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>
@@ -107,6 +119,8 @@ namespace glm
 	/// For the incident vector I and surface normal N, 
 	/// and the ratio of indices of refraction eta, 
 	/// return the refraction vector.
+	///
+	/// @tparam genType Floating-point vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/refract.xml">GLSL refract man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5</a>

glm/core/func_geometric.inl

@@ -26,6 +26,8 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "_vectorize.hpp"
+
 namespace glm
 {
     // length

glm/core/func_integer.hpp

@@ -43,10 +43,12 @@ namespace glm
 	/// @addtogroup core_func_integer
 	/// @{
 
-	//! Adds 32-bit unsigned integer x and y, returning the sum
+	/// Adds 32-bit unsigned integer x and y, returning the sum
-	//! modulo pow(2, 32). The value carry is set to 0 if the sum was
+	/// modulo pow(2, 32). The value carry is set to 0 if the sum was
-	//! less than pow(2, 32), or to 1 otherwise.
+	/// less than pow(2, 32), or to 1 otherwise.
-	//!
+	///
+	/// @tparam genUType Unsigned integer scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uaddCarry.xml">GLSL uaddCarry man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genUType>
@@ -55,10 +57,12 @@ namespace glm
 		genUType const & y, 
 		genUType & carry);
 
-	//! Subtracts the 32-bit unsigned integer y from x, returning
+	/// Subtracts the 32-bit unsigned integer y from x, returning
-	//! the difference if non-negative, or pow(2, 32) plus the difference
+	/// the difference if non-negative, or pow(2, 32) plus the difference
-	//! otherwise. The value borrow is set to 0 if x >= y, or to 1 otherwise.
+	/// otherwise. The value borrow is set to 0 if x >= y, or to 1 otherwise.
-	//!
+	///
+	/// @tparam genUType Unsigned integer scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/usubBorrow.xml">GLSL usubBorrow man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genUType>
@@ -67,10 +71,12 @@ namespace glm
 		genUType const & y, 
 		genUType & borrow);
 		
-	//! Multiplies 32-bit integers x and y, producing a 64-bit
+	/// Multiplies 32-bit integers x and y, producing a 64-bit
-	//! result. The 32 least-significant bits are returned in lsb.
+	/// result. The 32 least-significant bits are returned in lsb.
-	//! The 32 most-significant bits are returned in msb.
+	/// The 32 most-significant bits are returned in msb.
-	//!
+	///
+	/// @tparam genUType Unsigned integer scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/umulExtended.xml">GLSL umulExtended man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genUType>
@@ -80,10 +86,12 @@ namespace glm
 		genUType & msb, 
 		genUType & lsb);
 		
-	//! Multiplies 32-bit integers x and y, producing a 64-bit
+	/// Multiplies 32-bit integers x and y, producing a 64-bit
-	//! result. The 32 least-significant bits are returned in lsb.
+	/// result. The 32 least-significant bits are returned in lsb.
-	//! The 32 most-significant bits are returned in msb.
+	/// The 32 most-significant bits are returned in msb.
-	//!
+	/// 
+	/// @tparam genIType Signed integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/imulExtended.xml">GLSL imulExtended man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genIType>
@@ -93,17 +101,19 @@ namespace glm
 		genIType & msb, 
 		genIType & lsb);
 
-	//! Extracts bits [offset, offset + bits - 1] from value,
+	/// Extracts bits [offset, offset + bits - 1] from value,
-	//! returning them in the least significant bits of the result.
+	/// returning them in the least significant bits of the result.
-	//! For unsigned data types, the most significant bits of the
+	/// For unsigned data types, the most significant bits of the
-	//! result will be set to zero. For signed data types, the
+	/// result will be set to zero. For signed data types, the
-	//! most significant bits will be set to the value of bit offset + base – 1.
+	/// most significant bits will be set to the value of bit offset + base – 1.
-	//!
+	///
-	//! If bits is zero, the result will be zero. The result will be
+	/// If bits is zero, the result will be zero. The result will be
-	//! undefined if offset or bits is negative, or if the sum of
+	/// undefined if offset or bits is negative, or if the sum of
-	//! offset and bits is greater than the number of bits used
+	/// offset and bits is greater than the number of bits used
-	//! to store the operand.
+	/// to store the operand.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldExtract.xml">GLSL bitfieldExtract man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genIUType>
@@ -112,16 +122,18 @@ namespace glm
 		int const & Offset, 
 		int const & Bits);
 
-	//! Returns the insertion the bits least-significant bits of insert into base.
+	/// Returns the insertion the bits least-significant bits of insert into base.
-	//!
+	///
-	//! The result will have bits [offset, offset + bits - 1] taken
+	/// The result will have bits [offset, offset + bits - 1] taken
-	//! from bits [0, bits – 1] of insert, and all other bits taken
+	/// from bits [0, bits – 1] of insert, and all other bits taken
-	//! directly from the corresponding bits of base. If bits is
+	/// directly from the corresponding bits of base. If bits is
-	//! zero, the result will simply be base. The result will be
+	/// zero, the result will simply be base. The result will be
-	//! undefined if offset or bits is negative, or if the sum of
+	/// undefined if offset or bits is negative, or if the sum of
-	//! offset and bits is greater than the number of bits used to
+	/// offset and bits is greater than the number of bits used to
-	//! store the operand.
+	/// store the operand.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldInsert.xml">GLSL bitfieldInsert man page</a>
 	/// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genIUType>
@@ -131,40 +143,54 @@ namespace glm
 		int const & Offset, 
 		int const & Bits);
 
-	//! Returns the reversal of the bits of value. 
+	/// Returns the reversal of the bits of value. 
-	//! The bit numbered n of the result will be taken from bit (bits - 1) - n of value, 
+	/// The bit numbered n of the result will be taken from bit (bits - 1) - n of value, 
-	//! where bits is the total number of bits used to represent value.
+	/// where bits is the total number of bits used to represent value.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldReverse.xml">GLSL bitfieldReverse man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
 	template <typename genIUType>
 	genIUType bitfieldReverse(genIUType const & value);
 		
-	//! Returns the number of bits set to 1 in the binary representation of value.
+	/// Returns the number of bits set to 1 in the binary representation of value.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
-	template <typename T, template <typename> class C>
+	///
-	typename C<T>::signed_type bitCount(C<T> const & Value);
+	/// @todo Clarify the declaration to specify that scalars are suported.
+	template <typename T, template <typename> class genIUType>
+	typename genIUType<T>::signed_type bitCount(genIUType<T> const & Value);
 
-	//! Returns the bit number of the least significant bit set to
+	/// Returns the bit number of the least significant bit set to
-	//! 1 in the binary representation of value. 
+	/// 1 in the binary representation of value. 
-	//! If value is zero, -1 will be returned.
+	/// If value is zero, -1 will be returned.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
-	template <typename T, template <typename> class C>
+	///
-	typename C<T>::signed_type findLSB(C<T> const & Value);
+	/// @todo Clarify the declaration to specify that scalars are suported.
+	template <typename T, template <typename> class genIUType>
+	typename genIUType<T>::signed_type findLSB(genIUType<T> const & Value);
 
-	//! Returns the bit number of the most significant bit in the binary representation of value.
+	/// Returns the bit number of the most significant bit in the binary representation of value.
-	//! For positive integers, the result will be the bit number of the most significant bit set to 1. 
+	/// For positive integers, the result will be the bit number of the most significant bit set to 1. 
-	//! For negative integers, the result will be the bit number of the most significant
+	/// For negative integers, the result will be the bit number of the most significant
-	//! bit set to 0. For a value of zero or negative one, -1 will be returned.
+	/// bit set to 0. For a value of zero or negative one, -1 will be returned.
-	//!
+	///
+	/// @tparam genIUType Signed or unsigned integer scalar or vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8</a>
-	template <typename T, template <typename> class C>
+	///
-	typename C<T>::signed_type findMSB(C<T> const & Value);
+	/// @todo Clarify the declaration to specify that scalars are suported.
+	template <typename T, template <typename> class genIUType>
+	typename genIUType<T>::signed_type findMSB(genIUType<T> const & Value);
 
 	/// @}
 }//namespace glm

glm/core/func_integer.inl

@@ -26,6 +26,7 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "_vectorize.hpp"
 #if(GLM_COMPILER & GLM_COMPILER_VC)
 #include <intrin.h>
 #pragma intrinsic(_BitScanReverse)
@@ -415,41 +416,7 @@ namespace glm
 		return Out;
 	}	
 
-	template <typename T>
+	VECTORIZE_VEC(bitfieldReverse)
-	GLM_FUNC_QUALIFIER detail::tvec2<T> bitfieldReverse
-	(
-		detail::tvec2<T> const & value
-	)
-	{
-		return detail::tvec2<T>(
-			bitfieldReverse(value[0]),
-			bitfieldReverse(value[1]));
-	}
-
-	template <typename T>
-	GLM_FUNC_QUALIFIER detail::tvec3<T> bitfieldReverse
-	(
-		detail::tvec3<T> const & value
-	)
-	{
-		return detail::tvec3<T>(
-			bitfieldReverse(value[0]),
-			bitfieldReverse(value[1]),
-			bitfieldReverse(value[2]));
-	}
-
-	template <typename T>
-	GLM_FUNC_QUALIFIER detail::tvec4<T> bitfieldReverse
-	(
-		detail::tvec4<T> const & value
-	)
-	{
-		return detail::tvec4<T>(
-			bitfieldReverse(value[0]),
-			bitfieldReverse(value[1]),
-			bitfieldReverse(value[2]),
-			bitfieldReverse(value[3]));
-	}
 
 	// bitCount
 	template <typename genIUType>

glm/core/func_matrix.hpp

@@ -47,6 +47,8 @@ namespace glm
 
 	/// Multiply matrix x by matrix y component-wise, i.e., 
 	/// result[i][j] is the scalar product of x[i][j] and y[i][j].
+	/// 
+	/// @tparam matType Floating-point matrix types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/matrixCompMult.xml">GLSL matrixCompMult man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>
@@ -58,15 +60,21 @@ namespace glm
 	/// Treats the first parameter c as a column vector 
 	/// and the second parameter r as a row vector
 	/// and does a linear algebraic matrix multiply c * r.
+	/// 
+	/// @tparam matType Floating-point matrix types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/outerProduct.xml">GLSL outerProduct man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>
+	/// 
+	/// @todo Clarify the declaration to specify that matType doesn't have to be provided when used.
     template <typename vecType, typename matType> 
 	matType outerProduct(
 		vecType const & c, 
 		vecType const & r);
 
 	/// Returns the transposed matrix of x
+	/// 
+	/// @tparam matType Floating-point matrix types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>	
@@ -75,52 +83,64 @@ namespace glm
 		matType const & x);
 	
 	/// Return the determinant of a mat2 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>	
-	template <typename T> 
+	template <typename valType> 
-	typename detail::tmat2x2<T>::value_type determinant(
+	typename detail::tmat2x2<valType>::value_type determinant(
-		detail::tmat2x2<T> const & m);
+		detail::tmat2x2<valType> const & m);
 
 	/// Return the determinant of a mat3 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>	
-	template <typename T> 
+	template <typename valType> 
-	typename detail::tmat3x3<T>::value_type determinant(
+	typename detail::tmat3x3<valType>::value_type determinant(
-		detail::tmat3x3<T> const & m);
+		detail::tmat3x3<valType> const & m);
 
 	/// Return the determinant of a mat4 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>		
-    template <typename T> 
+    template <typename valType> 
-	typename detail::tmat4x4<T>::value_type determinant(
+	typename detail::tmat4x4<valType>::value_type determinant(
-		detail::tmat4x4<T> const & m);
+		detail::tmat4x4<valType> const & m);
 
 	/// Return the inverse of a mat2 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>	 
-	template <typename T> 
+	template <typename valType> 
-	detail::tmat2x2<T> inverse(
+	detail::tmat2x2<valType> inverse(
-		detail::tmat2x2<T> const & m);
+		detail::tmat2x2<valType> const & m);
 
 	/// Return the inverse of a mat3 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a> 
-	template <typename T> 
+	template <typename valType> 
-	detail::tmat3x3<T> inverse(
+	detail::tmat3x3<valType> inverse(
-		detail::tmat3x3<T> const & m);
+		detail::tmat3x3<valType> const & m);
 
 	/// Return the inverse of a mat4 matrix. 
+	/// 
+	/// @tparam valType Floating-point scalar types.
     ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6</a>
-	template <typename T> 
+	template <typename valType> 
-	detail::tmat4x4<T> inverse(
+	detail::tmat4x4<valType> inverse(
-		detail::tmat4x4<T> const & m);
+		detail::tmat4x4<valType> const & m);
 
 	/// @}
 }//namespace glm

glm/core/func_matrix.inl

@@ -26,6 +26,8 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "_vectorize.hpp"
+
 namespace glm
 {
 	// matrixCompMult

glm/core/func_noise.hpp

@@ -44,6 +44,8 @@ namespace glm
 	/// @{
 
 	/// Returns a 1D noise value based on the input value x.
+	///
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise1.xml">GLSL noise1 man page</a>
 	/// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13</a>
@@ -51,6 +53,8 @@ namespace glm
 	typename genType::value_type noise1(genType const & x);
 
 	/// Returns a 2D noise value based on the input value x.
+	///
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise2.xml">GLSL noise2 man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13</a>
@@ -58,6 +62,8 @@ namespace glm
 	detail::tvec2<typename genType::value_type> noise2(genType const & x);
 
 	/// Returns a 3D noise value based on the input value x.
+	///
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise3.xml">GLSL noise3 man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13</a>
@@ -65,6 +71,8 @@ namespace glm
 	detail::tvec3<typename genType::value_type> noise3(genType const & x);
 
 	/// Returns a 4D noise value based on the input value x.
+	///
+	/// @tparam genType Floating-point scalar or vector types.
     /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise4.xml">GLSL noise4 man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.13</a>

glm/core/func_packing.inl

@@ -26,134 +26,133 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-GLM_FUNC_QUALIFIER detail::uint32 packUnorm2x16(detail::tvec2<detail::float32> const & v)
 {
-	detail::uint16 A(detail::uint16(round(clamp(v.x, 0.0f, 1.0f) * 65535.0f)));
+	GLM_FUNC_QUALIFIER detail::uint32 packUnorm2x16(detail::tvec2<detail::float32> const & v)
-	detail::uint16 B(detail::uint16(round(clamp(v.y, 0.0f, 1.0f) * 65535.0f)));
-	return detail::uint32((B << 16) | A);
-}
-
-GLM_FUNC_QUALIFIER detail::tvec2<detail::float32> unpackUnorm2x16(detail::uint32 const & p)
-{
-	detail::uint32 Mask16((1 << 16) - 1);
-	detail::uint32 A((p >>  0) & Mask16);
-	detail::uint32 B((p >> 16) & Mask16);
-	return detail::tvec2<detail::float32>(
-		A * 1.0f / 65535.0f, 
-		B * 1.0f / 65535.0f);
-}
-	
-GLM_FUNC_QUALIFIER detail::uint32 packSnorm2x16(detail::tvec2<detail::float32> const & v)
-{
-	union iu
 	{
-		detail::int16 i;
+		detail::uint16 A(detail::uint16(round(clamp(v.x, 0.0f, 1.0f) * 65535.0f)));
-		detail::uint16 u;
+		detail::uint16 B(detail::uint16(round(clamp(v.y, 0.0f, 1.0f) * 65535.0f)));
-	} A, B;
+		return detail::uint32((B << 16) | A);
+	}
 
-	detail::tvec2<detail::float32> Unpack = clamp(v ,-1.0f, 1.0f) * 32767.0f;
+	GLM_FUNC_QUALIFIER detail::tvec2<detail::float32> unpackUnorm2x16(detail::uint32 const & p)
-	A.i = detail::int16(round(Unpack.x));
-	B.i = detail::int16(round(Unpack.y));
-	detail::uint32 Pack = (detail::uint32(B.u) << 16) | (detail::uint32(A.u) << 0);
-	return Pack;
-}
-
-GLM_FUNC_QUALIFIER detail::tvec2<detail::float32> unpackSnorm2x16(detail::uint32 const & p)
-{
-	union iu
 	{
-		detail::int16 i;
+		detail::uint32 Mask16((1 << 16) - 1);
-		detail::uint16 u;
+		detail::uint32 A((p >>  0) & Mask16);
-	} A, B;
+		detail::uint32 B((p >> 16) & Mask16);
+		return detail::tvec2<detail::float32>(
+			A * 1.0f / 65535.0f, 
+			B * 1.0f / 65535.0f);
+	}
 	
-	detail::uint32 Mask16((1 << 16) - 1);
+	GLM_FUNC_QUALIFIER detail::uint32 packSnorm2x16(detail::tvec2<detail::float32> const & v)
-	A.u = detail::uint16((p >>  0) & Mask16);
-	B.u = detail::uint16((p >> 16) & Mask16);
-	detail::tvec2<detail::float32> Pack(A.i, B.i);
-		
-	return clamp(Pack * 1.0f / 32767.0f, -1.0f, 1.0f);
-}
-
-GLM_FUNC_QUALIFIER detail::uint32 packUnorm4x8(detail::tvec4<detail::float32> const & v)
-{
-	detail::uint8 A((detail::uint8)round(clamp(v.x, 0.0f, 1.0f) * 255.0f));
-	detail::uint8 B((detail::uint8)round(clamp(v.y, 0.0f, 1.0f) * 255.0f));
-	detail::uint8 C((detail::uint8)round(clamp(v.z, 0.0f, 1.0f) * 255.0f));
-	detail::uint8 D((detail::uint8)round(clamp(v.w, 0.0f, 1.0f) * 255.0f));
-	return detail::uint32((D << 24) | (C << 16) | (B << 8) | A);
-}
-
-GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p)
-{	
-	detail::uint32 Mask8((1 << 8) - 1);
-	detail::uint32 A((p >>  0) & Mask8);
-	detail::uint32 B((p >>  8) & Mask8);
-	detail::uint32 C((p >> 16) & Mask8);
-	detail::uint32 D((p >> 24) & Mask8);
-	return detail::tvec4<detail::float32>(
-		A * 1.0f / 255.0f, 
-		B * 1.0f / 255.0f, 
-		C * 1.0f / 255.0f, 
-		D * 1.0f / 255.0f);
-}
-	
-GLM_FUNC_QUALIFIER detail::uint32 packSnorm4x8(detail::tvec4<detail::float32> const & v)
-{
-	union iu
 	{
-		detail::int8 i;
+		union iu
-		detail::uint8 u;
+		{
-	} A, B, C, D;
+			detail::int16 i;
+			detail::uint16 u;
+		} A, B;
 		
-	detail::tvec4<detail::float32> Unpack = clamp(v ,-1.0f, 1.0f) * 127.0f;
+		detail::tvec2<detail::float32> Unpack = clamp(v ,-1.0f, 1.0f) * 32767.0f;
-	A.i = detail::int8(round(Unpack.x));
+		A.i = detail::int16(round(Unpack.x));
-	B.i = detail::int8(round(Unpack.y));
+		B.i = detail::int16(round(Unpack.y));
-	C.i = detail::int8(round(Unpack.z));
+		detail::uint32 Pack = (detail::uint32(B.u) << 16) | (detail::uint32(A.u) << 0);
-	D.i = detail::int8(round(Unpack.w));
+		return Pack;
-	detail::uint32 Pack = (detail::uint32(D.u) << 24) | (detail::uint32(C.u) << 16) | (detail::uint32(B.u) << 8) | (detail::uint32(A.u) << 0);
+	}
-	return Pack;
-}
 
-GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p)
+	GLM_FUNC_QUALIFIER detail::tvec2<detail::float32> unpackSnorm2x16(detail::uint32 const & p)
-{	
-	union iu
 	{
-		detail::int8 i;
+		union iu
-		detail::uint8 u;
+		{
-	} A, B, C, D;
+			detail::int16 i;
+			detail::uint16 u;
+		} A, B;
 		
-	detail::uint32 Mask8((1 << 8) - 1);
+		detail::uint32 Mask16((1 << 16) - 1);
-	A.u = detail::uint8((p >>  0) & Mask8);
+		A.u = detail::uint16((p >>  0) & Mask16);
-	B.u = detail::uint8((p >>  8) & Mask8);
+		B.u = detail::uint16((p >> 16) & Mask16);
-	C.u = detail::uint8((p >> 16) & Mask8);
+		detail::tvec2<detail::float32> Pack(A.i, B.i);
-	D.u = detail::uint8((p >> 24) & Mask8);
-	detail::tvec4<detail::float32> Pack(A.i, B.i, C.i, D.i);
 		
-	return clamp(Pack * 1.0f / 127.0f, -1.0f, 1.0f);
+		return clamp(Pack * 1.0f / 32767.0f, -1.0f, 1.0f);
-}
+	}
 
-GLM_FUNC_QUALIFIER double packDouble2x32(detail::tvec2<detail::uint32> const & v)
+	GLM_FUNC_QUALIFIER detail::uint32 packUnorm4x8(detail::tvec4<detail::float32> const & v)
-{
+	{
-	return *(double*)&v;
+		detail::uint8 A((detail::uint8)round(clamp(v.x, 0.0f, 1.0f) * 255.0f));
-}
+		detail::uint8 B((detail::uint8)round(clamp(v.y, 0.0f, 1.0f) * 255.0f));
+		detail::uint8 C((detail::uint8)round(clamp(v.z, 0.0f, 1.0f) * 255.0f));
+		detail::uint8 D((detail::uint8)round(clamp(v.w, 0.0f, 1.0f) * 255.0f));
+		return detail::uint32((D << 24) | (C << 16) | (B << 8) | A);
+	}
 
-GLM_FUNC_QUALIFIER detail::tvec2<uint> unpackDouble2x32(double const & v)
+	GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p)
-{
+	{	
-	return *(detail::tvec2<uint>*)&v;
+		detail::uint32 Mask8((1 << 8) - 1);
-}
+		detail::uint32 A((p >>  0) & Mask8);
+		detail::uint32 B((p >>  8) & Mask8);
+		detail::uint32 C((p >> 16) & Mask8);
+		detail::uint32 D((p >> 24) & Mask8);
+		return detail::tvec4<detail::float32>(
+			A * 1.0f / 255.0f, 
+			B * 1.0f / 255.0f, 
+			C * 1.0f / 255.0f, 
+			D * 1.0f / 255.0f);
+	}
 	
-GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2<float> const & v)
+	GLM_FUNC_QUALIFIER detail::uint32 packSnorm4x8(detail::tvec4<detail::float32> const & v)
-{
+	{
-	detail::tvec2<detail::hdata> Pack(detail::toFloat16(v.x), detail::toFloat16(v.y));
+		union iu
-	return *(uint*)&Pack;
+		{
-}
+			detail::int8 i;
+			detail::uint8 u;
+		} A, B, C, D;
 	
-GLM_FUNC_QUALIFIER vec2 unpackHalf2x16(uint const & v)
+		detail::tvec4<detail::float32> Unpack = clamp(v ,-1.0f, 1.0f) * 127.0f;
-{
+		A.i = detail::int8(round(Unpack.x));
-	detail::tvec2<detail::hdata> Unpack = *(detail::tvec2<detail::hdata>*)&v;
+		B.i = detail::int8(round(Unpack.y));
-	return vec2(detail::toFloat32(Unpack.x), detail::toFloat32(Unpack.y));
+		C.i = detail::int8(round(Unpack.z));
-}
+		D.i = detail::int8(round(Unpack.w));
+		detail::uint32 Pack = (detail::uint32(D.u) << 24) | (detail::uint32(C.u) << 16) | (detail::uint32(B.u) << 8) | (detail::uint32(A.u) << 0);
+		return Pack;
+	}
 	
+	GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p)
+	{	
+		union iu
+		{
+			detail::int8 i;
+			detail::uint8 u;
+		} A, B, C, D;
+	
+		detail::uint32 Mask8((1 << 8) - 1);
+		A.u = detail::uint8((p >>  0) & Mask8);
+		B.u = detail::uint8((p >>  8) & Mask8);
+		C.u = detail::uint8((p >> 16) & Mask8);
+		D.u = detail::uint8((p >> 24) & Mask8);
+		detail::tvec4<detail::float32> Pack(A.i, B.i, C.i, D.i);
+	
+		return clamp(Pack * 1.0f / 127.0f, -1.0f, 1.0f);
+	}
+
+	GLM_FUNC_QUALIFIER double packDouble2x32(detail::tvec2<detail::uint32> const & v)
+	{
+		return *(double*)&v;
+	}
+
+	GLM_FUNC_QUALIFIER detail::tvec2<uint> unpackDouble2x32(double const & v)
+	{
+		return *(detail::tvec2<uint>*)&v;
+	}
+
+	GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2<float> const & v)
+	{
+		detail::tvec2<detail::hdata> Pack(detail::toFloat16(v.x), detail::toFloat16(v.y));
+		return *(uint*)&Pack;
+	}
+
+	GLM_FUNC_QUALIFIER vec2 unpackHalf2x16(uint const & v)
+	{
+		detail::tvec2<detail::hdata> Unpack = *(detail::tvec2<detail::hdata>*)&v;
+		return vec2(detail::toFloat32(Unpack.x), detail::toFloat32(Unpack.y));
+	}
 }//namespace glm

glm/core/func_trigonometric.hpp

@@ -45,119 +45,149 @@ namespace glm
 	/// @addtogroup core_func_trigonometric
 	/// @{
 
-	//! Converts degrees to radians and returns the result.
+	/// Converts degrees to radians and returns the result.
-    //!
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/radians.xml">GLSL radians man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType radians(genType const & degrees);
 
-	//! Converts radians to degrees and returns the result.
+	/// Converts radians to degrees and returns the result.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/degrees.xml">GLSL degrees man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType degrees(genType const & radians);
 
-	//! The standard trigonometric sine function. 
+	/// The standard trigonometric sine function. 
-	//! The values returned by this function will range from [-1, 1].
+	/// The values returned by this function will range from [-1, 1].
-    //!
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sin.xml">GLSL sin man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType sin(genType const & angle);
 
-	//! The standard trigonometric cosine function. 
+	/// The standard trigonometric cosine function. 
-	//! The values returned by this function will range from [-1, 1].
+	/// The values returned by this function will range from [-1, 1].
-    //!
+	/// 
+	/// @tparam genType Floating-point scalar or vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cos.xml">GLSL cos man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType cos(genType const & angle);
 
-	//! The standard trigonometric tangent function.
+	/// The standard trigonometric tangent function.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tan.xml">GLSL tan man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType tan(genType const & angle); 
 
-	//! Arc sine. Returns an angle whose sine is x. 
+	/// Arc sine. Returns an angle whose sine is x. 
-	//! The range of values returned by this function is [-PI/2, PI/2]. 
+	/// The range of values returned by this function is [-PI/2, PI/2]. 
-	//! Results are undefined if |x| > 1.
+	/// Results are undefined if |x| > 1.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asin.xml">GLSL asin man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType asin(genType const & x);
 
-	//! Arc cosine. Returns an angle whose sine is x. 
+	/// Arc cosine. Returns an angle whose sine is x. 
-	//! The range of values returned by this function is [0, PI]. 
+	/// The range of values returned by this function is [0, PI]. 
-	//! Results are undefined if |x| > 1.
+	/// Results are undefined if |x| > 1.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acos.xml">GLSL acos man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType acos(genType const & x);
 
-	//! Arc tangent. Returns an angle whose tangent is y/x. 
+	/// Arc tangent. Returns an angle whose tangent is y/x. 
-	//! The signs of x and y are used to determine what 
+	/// The signs of x and y are used to determine what 
-	//! quadrant the angle is in. The range of values returned 
+	/// quadrant the angle is in. The range of values returned 
-	//! by this function is [-PI, PI]. Results are undefined 
+	/// by this function is [-PI, PI]. Results are undefined 
-	//! if x and y are both 0. 
+	/// if x and y are both 0. 
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType atan(genType const & y, genType const & x);
 
-	//! Arc tangent. Returns an angle whose tangent is y_over_x. 
+	/// Arc tangent. Returns an angle whose tangent is y_over_x. 
-	//! The range of values returned by this function is [-PI/2, PI/2].
+	/// The range of values returned by this function is [-PI/2, PI/2].
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
 	/// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType atan(genType const & y_over_x);
 
-	//! Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
+	/// Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sinh.xml">GLSL sinh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType sinh(genType const & angle);
 
-	//! Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
+	/// Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cosh.xml">GLSL cosh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType cosh(genType const & angle);
 
-	//! Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
+	/// Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tanh.xml">GLSL tanh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType tanh(genType const & angle);
 
-	//! Arc hyperbolic sine; returns the inverse of sinh.
+	/// Arc hyperbolic sine; returns the inverse of sinh.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asinh.xml">GLSL asinh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType asinh(genType const & x);
 	
-	//! Arc hyperbolic cosine; returns the non-negative inverse
+	/// Arc hyperbolic cosine; returns the non-negative inverse
-	//! of cosh. Results are undefined if x < 1.
+	/// of cosh. Results are undefined if x < 1.
-    //!
+    ///
+	/// @tparam genType Floating-point scalar or vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acosh.xml">GLSL acosh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 
 	genType acosh(genType const & x);
 
-	//! Arc hyperbolic tangent; returns the inverse of tanh.
+	/// Arc hyperbolic tangent; returns the inverse of tanh.
-	//! Results are undefined if abs(x) >= 1.
+	/// Results are undefined if abs(x) >= 1.
-    //!
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atanh.xml">GLSL atanh man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1</a>
 	template <typename genType> 

glm/core/func_trigonometric.inl

@@ -26,732 +26,221 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "_vectorize.hpp"
 
-// radians
+namespace glm
-template <typename genType>
-GLM_FUNC_QUALIFIER genType radians
-(
-	genType const & degrees
-)
 {
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'radians' only accept floating-point input");
+	// radians
-
+	template <typename genType>
-    const genType pi = genType(3.1415926535897932384626433832795);
+	GLM_FUNC_QUALIFIER genType radians
-    return degrees * (pi / genType(180));
+	(
-}
+		genType const & degrees
-
+	)
-template <typename T>
+	{
-GLM_FUNC_QUALIFIER detail::tvec2<T> radians
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'radians' only accept floating-point input");
-(
+
-	detail::tvec2<T> const & degrees
+		genType const pi = genType(3.1415926535897932384626433832795);
-)
+		return degrees * (pi / genType(180));
-{
+	}
-    return detail::tvec2<T>(
+
-        radians(degrees.x),
+	VECTORIZE_VEC(radians)
-        radians(degrees.y));
+	
-}
+	// degrees
-
+	template <typename genType>
-template <typename T>
+	GLM_FUNC_QUALIFIER genType degrees
-GLM_FUNC_QUALIFIER detail::tvec3<T> radians
+	(
-(
+		genType const & radians
-	detail::tvec3<T> const & degrees
+	)
-)
+	{
-{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'degrees' only accept floating-point input");
-    return detail::tvec3<T>(
+
-        radians(degrees.x),
+		const genType pi = genType(3.1415926535897932384626433832795);
-        radians(degrees.y),
+		return radians * (genType(180) / pi);
-        radians(degrees.z));
+	}
-}
+
-
+	VECTORIZE_VEC(degrees)
-template <typename T>
+
-GLM_FUNC_QUALIFIER detail::tvec4<T> radians
+	// sin
-(
+	template <typename genType>
-	detail::tvec4<T> const & degrees
+	GLM_FUNC_QUALIFIER genType sin
-)
+	(
-{
+		genType const & angle
-    return detail::tvec4<T>(
+	)
-        radians(degrees.x),
+	{
-        radians(degrees.y),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sin' only accept floating-point input");
-        radians(degrees.z),
+
-        radians(degrees.w));
+		return ::std::sin(angle);
-}
+	}
-
+
-// degrees
+	VECTORIZE_VEC(sin)
-template <typename genType>
+
-GLM_FUNC_QUALIFIER genType degrees
+	// cos
-(
+	template <typename genType>
-	genType const & radians
+	GLM_FUNC_QUALIFIER genType cos(genType const & angle)
-)
+	{
-{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cos' only accept floating-point input");
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'degrees' only accept floating-point input");
+
-
+		return ::std::cos(angle);
-    const genType pi = genType(3.1415926535897932384626433832795);
+	}
-    return radians * (genType(180) / pi);
+
-}
+	VECTORIZE_VEC(cos)
-
+
-template <typename T>
+	// tan
-GLM_FUNC_QUALIFIER detail::tvec2<T> degrees
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType tan
-	detail::tvec2<T> const & radians
+	(
-)
+		genType const & angle
-{
+	)
-    return detail::tvec2<T>(
+	{
-        degrees(radians.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'tan' only accept floating-point input");
-        degrees(radians.y));
+
-}
+		return ::std::tan(angle);
-
+	}
-template <typename T>
+
-GLM_FUNC_QUALIFIER detail::tvec3<T> degrees
+	VECTORIZE_VEC(tan)
-(	
+
-	detail::tvec3<T> const & radians
+	// asin
-)
+	template <typename genType>
-{
+	GLM_FUNC_QUALIFIER genType asin
-    return detail::tvec3<T>(
+	(
-        degrees(radians.x),
+		genType const & x
-        degrees(radians.y),
+	)
-        degrees(radians.z));
+	{
-}
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asin' only accept floating-point input");
-
+
-template <typename T>
+		return ::std::asin(x);
-GLM_FUNC_QUALIFIER detail::tvec4<T> degrees
+	}
-(
+
-	detail::tvec4<T> const & radians
+	VECTORIZE_VEC(asin)
-)
+
-{
+	// acos
-    return detail::tvec4<T>(
+	template <typename genType>
-        degrees(radians.x),
+	GLM_FUNC_QUALIFIER genType acos
-        degrees(radians.y),
+	(
-        degrees(radians.z),
+		genType const & x
-        degrees(radians.w));
+	)
-}
+	{
-
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acos' only accept floating-point input");
-// sin
+
-template <typename genType>
+		return ::std::acos(x);
-GLM_FUNC_QUALIFIER genType sin
+	}
-(
+
-	genType const & angle
+	VECTORIZE_VEC(acos)
-)
+
-{
+	// atan
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sin' only accept floating-point input");
+	template <typename genType>
-
+	GLM_FUNC_QUALIFIER genType atan
-	return ::std::sin(angle);
+	(
-}
+		genType const & y, 
-
+		genType const & x
-template <typename T>
+	)
-GLM_FUNC_QUALIFIER detail::tvec2<T> sin
+	{
-(
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atan' only accept floating-point input");
-	detail::tvec2<T> const & angle
+
-)
+		return ::std::atan2(y, x);
-{
+	}
-    return detail::tvec2<T>(
+
-        sin(angle.x),
+	VECTORIZE_VEC_VEC(atan)
-        sin(angle.y));
+
-}
+	template <typename genType>
-
+	GLM_FUNC_QUALIFIER genType atan
-template <typename T>
+	(
-GLM_FUNC_QUALIFIER detail::tvec3<T> sin
+		genType const & x
-(
+	)
-	detail::tvec3<T> const & angle
+	{
-)
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atan' only accept floating-point input");
-{
+
-    return detail::tvec3<T>(
+		return ::std::atan(x);
-        sin(angle.x),
+	}
-        sin(angle.y),
+
-        sin(angle.z));
+	VECTORIZE_VEC(atan)
-}
+
-
+	// sinh
-template <typename T>
+	template <typename genType> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> sin
+	GLM_FUNC_QUALIFIER genType sinh
-(
+	(
-	detail::tvec4<T> const & angle
+		genType const & angle
-)
+	)
-{
+	{
-    return detail::tvec4<T>(
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sinh' only accept floating-point input");
-        sin(angle.x),
+
-        sin(angle.y),
+		return std::sinh(angle);
-        sin(angle.z),
+	}
-        sin(angle.w));
+
-}
+	VECTORIZE_VEC(sinh)
-
+
-// cos
+	// cosh
-template <typename genType>
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType cos(genType const & angle)
+	GLM_FUNC_QUALIFIER genType cosh
-{
+	(
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cos' only accept floating-point input");
+		genType const & angle
-
+	)
-    return ::std::cos(angle);
+	{
-}
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cosh' only accept floating-point input");
-
+
-template <typename T>
+		return std::cosh(angle);
-GLM_FUNC_QUALIFIER detail::tvec2<T> cos
+	}
-(
+
-	detail::tvec2<T> const & angle
+	VECTORIZE_VEC(cosh)
-)
+
-{
+	// tanh
-    return detail::tvec2<T>(
+	template <typename genType>
-        cos(angle.x),
+	GLM_FUNC_QUALIFIER genType tanh
-        cos(angle.y));
+	(
-}
+		genType const & angle
-
+	)
-template <typename T>
+	{
-GLM_FUNC_QUALIFIER detail::tvec3<T> cos
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'tanh' only accept floating-point input");
-(
+
-	detail::tvec3<T> const & angle
+		return std::tanh(angle);
-)
+	}
-{
+
-    return detail::tvec3<T>(
+	VECTORIZE_VEC(tanh)
-        cos(angle.x),
+
-        cos(angle.y),
+	// asinh
-        cos(angle.z));
+	template <typename genType> 
-}
+	GLM_FUNC_QUALIFIER genType asinh
-
+	(
-template <typename T>
+		genType const & x
-GLM_FUNC_QUALIFIER detail::tvec4<T> cos
+	)
-(	
+	{
-	detail::tvec4<T> const & angle
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asinh' only accept floating-point input");
-)
+		
-{
+		return (x < genType(0) ? genType(-1) : (x > genType(0) ? genType(1) : genType(0))) * log(abs(x) + sqrt(genType(1) + x * x));
-    return detail::tvec4<T>(
+	}
-        cos(angle.x),
+
-        cos(angle.y),
+	VECTORIZE_VEC(asinh)
-        cos(angle.z),
+
-        cos(angle.w));
+	// acosh
-}
+	template <typename genType> 
-
+	GLM_FUNC_QUALIFIER genType acosh
-// tan
+	(
-template <typename genType>
+		genType const & x
-GLM_FUNC_QUALIFIER genType tan
+	)
-(
+	{
-	genType const & angle
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acosh' only accept floating-point input");
-)
+
-{
+		if(x < genType(1))
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'tan' only accept floating-point input");
+			return genType(0);
-
+		return log(x + sqrt(x * x - genType(1)));
-    return ::std::tan(angle);
+	}
-}
+
-
+	VECTORIZE_VEC(acosh)
-template <typename T>
+
-GLM_FUNC_QUALIFIER detail::tvec2<T> tan
+	// atanh
-(
+	template <typename genType>
-	detail::tvec2<T> const & angle
+	GLM_FUNC_QUALIFIER genType atanh
-)
+	(
-{
+		genType const & x
-    return detail::tvec2<T>(
+	)
-        tan(angle.x),
+	{
-        tan(angle.y));
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atanh' only accept floating-point input");
-}
+		
-
+		if(abs(x) >= genType(1))
-template <typename T>
+			return 0;
-GLM_FUNC_QUALIFIER detail::tvec3<T> tan
+		return genType(0.5) * log((genType(1) + x) / (genType(1) - x));
-(
+	}
-	detail::tvec3<T> const & angle
+
-)
+	VECTORIZE_VEC(atanh)
-{
-    return detail::tvec3<T>(
-        tan(angle.x),
-        tan(angle.y),
-        tan(angle.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> tan
-(
-	detail::tvec4<T> const & angle
-)
-{
-    return detail::tvec4<T>(
-        tan(angle.x),
-        tan(angle.y),
-        tan(angle.z),
-        tan(angle.w));
-}
-
-// asin
-template <typename genType>
-GLM_FUNC_QUALIFIER genType asin
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asin' only accept floating-point input");
-
-    return ::std::asin(x);
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> asin
-(
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        asin(x.x),
-        asin(x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> asin
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        asin(x.x),
-        asin(x.y),
-        asin(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> asin
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        asin(x.x),
-        asin(x.y),
-        asin(x.z),
-        asin(x.w));
-}
-
-// acos
-template <typename genType>
-GLM_FUNC_QUALIFIER genType acos
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acos' only accept floating-point input");
-
-    return ::std::acos(x);
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> acos
-(
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        acos(x.x),
-        acos(x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> acos
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        acos(x.x),
-        acos(x.y),
-        acos(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> acos
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        acos(x.x),
-        acos(x.y),
-        acos(x.z),
-        acos(x.w));
-}
-
-// atan
-template <typename genType>
-GLM_FUNC_QUALIFIER genType atan
-(
-	genType const & y, 
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atan' only accept floating-point input");
-
-    return ::std::atan2(y, x);
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> atan
-(
-	detail::tvec2<T> const & y, 
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        atan(y.x, x.x),
-        atan(y.y, x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> atan
-(
-	detail::tvec3<T> const & y, 
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        atan(y.x, x.x),
-        atan(y.y, x.y),
-        atan(y.z, x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> atan
-(
-	detail::tvec4<T> const & y, 
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        atan(y.x, x.x),
-        atan(y.y, x.y),
-        atan(y.z, x.z),
-        atan(y.w, x.w));
-}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType atan
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atan' only accept floating-point input");
-
-    return ::std::atan(x);
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> atan
-(
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        atan(x.x),
-        atan(x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> atan
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        atan(x.x),
-        atan(x.y),
-        atan(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> atan
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        atan(x.x),
-        atan(x.y),
-        atan(x.z),
-        atan(x.w));
-}
-
-// sinh
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType sinh
-(
-	genType const & angle
-)
-{
-    GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sinh' only accept floating-point input");
-
-	return std::sinh(angle);
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> sinh
-(
-	detail::tvec2<T> const & angle
-)
-{
-    return detail::tvec2<T>(
-        sinh(angle.x),
-        sinh(angle.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> sinh
-(
-	detail::tvec3<T> const & angle
-)
-{
-    return detail::tvec3<T>(
-        sinh(angle.x),
-        sinh(angle.y),
-        sinh(angle.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> sinh
-(
-	detail::tvec4<T> const & angle
-)
-{
-    return detail::tvec4<T>(
-        sinh(angle.x),
-        sinh(angle.y),
-        sinh(angle.z),
-        sinh(angle.w));
-}
-
-// cosh
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType cosh
-(
-	genType const & angle
-)
-{
-    GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cosh' only accept floating-point input");
-
-	return std::cosh(angle);
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> cosh
-(
-	detail::tvec2<T> const & angle
-)
-{
-    return detail::tvec2<T>(
-        cosh(angle.x),
-        cosh(angle.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> cosh
-(
-	detail::tvec3<T> const & angle
-)
-{
-    return detail::tvec3<T>(
-        cosh(angle.x),
-        cosh(angle.y),
-        cosh(angle.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> cosh
-(
-	detail::tvec4<T> const & angle
-)
-{
-    return detail::tvec4<T>(
-        cosh(angle.x),
-        cosh(angle.y),
-        cosh(angle.z),
-        cosh(angle.w));
-}
-
-// tanh
-template <typename genType>
-GLM_FUNC_QUALIFIER genType tanh
-(
-	genType const & angle
-)
-{
-    GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'tanh' only accept floating-point input");
-
-	return std::tanh(angle);
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> tanh
-(
-	detail::tvec2<T> const & angle
-)
-{
-    return detail::tvec2<T>(
-        tanh(angle.x),
-        tanh(angle.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> tanh
-(
-	detail::tvec3<T> const & angle
-)
-{
-    return detail::tvec3<T>(
-        tanh(angle.x),
-        tanh(angle.y),
-        tanh(angle.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> tanh
-(
-	detail::tvec4<T> const & angle
-)
-{
-    return detail::tvec4<T>(
-        tanh(angle.x),
-        tanh(angle.y),
-        tanh(angle.z),
-        tanh(angle.w));
-}
-
-// asinh
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType asinh
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asinh' only accept floating-point input");
-		
-	return (x < genType(0) ? genType(-1) : (x > genType(0) ? genType(1) : genType(0))) * log(abs(x) + sqrt(genType(1) + x * x));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> asinh
-(
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        asinh(x.x),
-        asinh(x.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> asinh
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        asinh(x.x),
-        asinh(x.y),
-        asinh(x.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> asinh
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        asinh(x.x),
-        asinh(x.y),
-        asinh(x.z),
-        asinh(x.w));
-}
-
-// acosh
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType acosh
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acosh' only accept floating-point input");
-
-	if(x < genType(1))
-		return genType(0);
-	return log(x + sqrt(x * x - genType(1)));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> acosh
-(
-	detail::tvec2<T> const & x
-)
-{
-	return detail::tvec2<T>(
-		acosh(x.x),
-		acosh(x.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> acosh
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        acosh(x.x),
-        acosh(x.y),
-        acosh(x.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> acosh
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        acosh(x.x),
-        acosh(x.y),
-        acosh(x.z),
-        acosh(x.w));
-}
-
-// atanh
-template <typename genType>
-GLM_FUNC_QUALIFIER genType atanh
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'atanh' only accept floating-point input");
-		
-	if(abs(x) >= genType(1))
-		return 0;
-	return genType(0.5) * log((genType(1) + x) / (genType(1) - x));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> atanh
-(
-	detail::tvec2<T> const & x
-)
-{
-    return detail::tvec2<T>(
-        atanh(x.x),
-        atanh(x.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> atanh
-(
-	detail::tvec3<T> const & x
-)
-{
-    return detail::tvec3<T>(
-        atanh(x.x),
-        atanh(x.y),
-        atanh(x.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> atanh
-(
-	detail::tvec4<T> const & x
-)
-{
-    return detail::tvec4<T>(
-        atanh(x.x),
-        atanh(x.y),
-        atanh(x.z),
-        atanh(x.w));
-}
 
 }//namespace glm

glm/core/func_vector_relational.hpp

@@ -48,65 +48,83 @@ namespace glm
 	/// @addtogroup core_func_vector_relational
 	/// @{
 
-	//! Returns the component-wise comparison result of x < y.
+	/// Returns the component-wise comparison result of x < y.
-    //!
+	/// 
+	/// @tparam vecType Floating-point or integer vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThan.xml">GLSL lessThan man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
-    //template <typename T, template <typename> class vecType> 
+    template <typename vecType> 
-	//GLM_FUNC_QUALIFIER typename vecType<T>::bool_type lessThan(vecType<T> const & x, vecType<T> const & y);
+	GLM_FUNC_QUALIFIER typename vecType::bool_type lessThan(vecType const & x, vecType const & y);
 
-	//! Returns the component-wise comparison of result x <= y.
+	/// Returns the component-wise comparison of result x <= y.
-    //!
+    ///
+	/// @tparam vecType Floating-point or integer vector types.
+	///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThanEqual.xml">GLSL lessThanEqual man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <typename T, template <typename> class vecType> 
 	GLM_FUNC_QUALIFIER typename vecType<T>::bool_type lessThanEqual(vecType<T> const & x, vecType<T> const & y);
 
-	//! Returns the component-wise comparison of result x > y.
+	/// Returns the component-wise comparison of result x > y.
-    //!
+    ///
+	/// @tparam vecType Floating-point or integer vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThan.xml">GLSL greaterThan man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <typename T, template <typename> class vecType> 
 	GLM_FUNC_QUALIFIER typename vecType<T>::bool_type greaterThan(vecType<T> const & x, vecType<T> const & y);
 
-	//! Returns the component-wise comparison of result x >= y.
+	/// Returns the component-wise comparison of result x >= y.
-    //!
+    ///
+	/// @tparam vecType Floating-point or integer vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThanEqual.xml">GLSL greaterThanEqual man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <typename T, template <typename> class vecType> 
 	typename vecType<T>::bool_type greaterThanEqual(vecType<T> const & x, vecType<T> const & y);
 
-	//! Returns the component-wise comparison of result x == y.
+	/// Returns the component-wise comparison of result x == y.
-    //!
+    ///
+	/// @tparam vecType Floating-point, integer or boolean vector types.
+	/// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/equal.xml">GLSL equal man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
-	//template <typename T, template <typename> class vecType> 
+	template <typename T, template <typename> class vecType> 
-	//GLM_FUNC_QUALIFIER typename vecType<T>::bool_type equal(vecType<T> const & x, vecType<T> const & y);
+	GLM_FUNC_QUALIFIER typename vecType<T>::bool_type equal(vecType<T> const & x, vecType<T> const & y);
 
-	//! Returns the component-wise comparison of result x != y.
+	/// Returns the component-wise comparison of result x != y.
-    //!
+	/// 
+	/// @tparam vecType Floating-point, integer or boolean vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/notEqual.xml">GLSL notEqual man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <typename T, template <typename> class vecType> 
 	typename vecType<T>::bool_type notEqual(vecType<T> const & x, vecType<T> const & y);
 
-	//! Returns true if any component of x is true.
+	/// Returns true if any component of x is true.
-    //!
+	///
+	/// @tparam vecType Boolean vector types.
+    /// 
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/any.xml">GLSL any man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <template <typename> class vecType> 
 	bool any(vecType<bool> const & v);
 
-	//! Returns true if all components of x are true.
+	/// Returns true if all components of x are true.
-    //!
+	///
+	/// @tparam vecType Boolean vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/all.xml">GLSL all man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <template <typename> class vecType> 
 	bool all(vecType<bool> const & v);
 
-	//! Returns the component-wise logical complement of x.
+	/// Returns the component-wise logical complement of x.
-    //! /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
+    /// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
-    //!
+	///
+	/// @tparam vecType Boolean vector types.
+    ///
     /// @see - <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/not.xml">GLSL not man page</a>
     /// @see - <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7</a>
 	template <template <typename> class vecType> 

glm/gtc/matrix_access.inl

@@ -26,49 +26,55 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType row(
-	genType const & m, 
-	int index, 
-	typename genType::row_type const & x)
 {
-    genType Result = m;
+	template <typename genType>
-    for(typename genType::size_type i = 0; i < genType::row_size(); ++i)
+	GLM_FUNC_QUALIFIER genType row
-		Result[i][index] = x[i];
+	(
-    return Result;
+		genType const & m, 
-}
+		int index, 
+		typename genType::row_type const & x
+	)
+	{
+		genType Result = m;
+		for(typename genType::size_type i = 0; i < genType::row_size(); ++i)
+			Result[i][index] = x[i];
+		return Result;
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER typename genType::row_type row(
+	GLM_FUNC_QUALIFIER typename genType::row_type row
-	genType const & m, 
+	(
-	int index)
+		genType const & m, 
-{
+		int index
-	typename genType::row_type Result;
+	)
-	for(typename genType::size_type i = 0; i < genType::row_size(); ++i)
+	{
-		Result[i] = m[i][index];
+		typename genType::row_type Result;
-	return Result;
+		for(typename genType::size_type i = 0; i < genType::row_size(); ++i)
-}
+			Result[i] = m[i][index];
+		return Result;
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType column(
+	GLM_FUNC_QUALIFIER genType column
-	genType const & m, 
+	(
-	int index, 
+		genType const & m, 
-	typename genType::col_type const & x)
+		int index, 
-{
+		typename genType::col_type const & x
-    genType Result = m;
+	)
-    Result[index] = x;
+	{
-    return Result;
+		genType Result = m;
-}
+		Result[index] = x;
-
+		return Result;
-template <typename genType>
+	}
-GLM_FUNC_QUALIFIER typename genType::col_type column(
-	genType const & m, 
-	int index)
-{
-    return m[index];
-}
 
+	template <typename genType>
+	GLM_FUNC_QUALIFIER typename genType::col_type column
+	(
+		genType const & m, 
+		int index
+	)
+	{
+		return m[index];
+	}
 }//namespace glm
-

glm/gtc/matrix_inverse.inl

@@ -26,129 +26,134 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> affineInverse
-(
-	detail::tmat3x3<T> const & m
-)
 {
-	detail::tmat3x3<T> Result(m);
+	template <typename T> 
-	Result[2] = detail::tvec3<T>(0, 0, 1);
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> affineInverse
-	Result = transpose(Result);
+	(
-	detail::tvec3<T> Translation = Result * detail::tvec3<T>(-detail::tvec2<T>(m[2]), m[2][2]);
+		detail::tmat3x3<T> const & m
-	Result[2] = Translation;
+	)
-	return Result;
+	{
-}
+		detail::tmat3x3<T> Result(m);
+		Result[2] = detail::tvec3<T>(0, 0, 1);
+		Result = transpose(Result);
+		detail::tvec3<T> Translation = Result * detail::tvec3<T>(-detail::tvec2<T>(m[2]), m[2][2]);
+		Result[2] = Translation;
+		return Result;
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> affineInverse
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> affineInverse
-(
+	(
-	detail::tmat4x4<T> const & m
+		detail::tmat4x4<T> const & m
-)
+	)
-{
+	{
-	detail::tmat4x4<T> Result(m);
+		detail::tmat4x4<T> Result(m);
-	Result[3] = detail::tvec4<T>(0, 0, 0, 1);
+		Result[3] = detail::tvec4<T>(0, 0, 0, 1);
-	Result = transpose(Result);
+		Result = transpose(Result);
-	detail::tvec4<T> Translation = Result * detail::tvec4<T>(-detail::tvec3<T>(m[3]), m[3][3]);
+		detail::tvec4<T> Translation = Result * detail::tvec4<T>(-detail::tvec3<T>(m[3]), m[3][3]);
-	Result[3] = Translation;
+		Result[3] = Translation;
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<valType> inverseTranspose(
+	GLM_FUNC_QUALIFIER detail::tmat2x2<valType> inverseTranspose
-	detail::tmat2x2<valType> const & m)
+	(
-{
+		detail::tmat2x2<valType> const & m
-	valType Determinant = m[0][0] * m[1][1] - m[1][0] * m[0][1];
+	)
+	{
+		valType Determinant = m[0][0] * m[1][1] - m[1][0] * m[0][1];
 
-	detail::tmat2x2<valType> Inverse(
+		detail::tmat2x2<valType> Inverse(
-		+ m[1][1] / Determinant,
+			+ m[1][1] / Determinant,
-		- m[0][1] / Determinant,
+			- m[0][1] / Determinant,
-		- m[1][0] / Determinant, 
+			- m[1][0] / Determinant, 
-		+ m[0][0] / Determinant);
+			+ m[0][0] / Determinant);
 
-	return Inverse;
+		return Inverse;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<valType> inverseTranspose(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<valType> inverseTranspose
-	detail::tmat3x3<valType> const & m)
+	(
-{
+		detail::tmat3x3<valType> const & m
-	valType Determinant = 
+	)
-		+ m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1])
+	{
-		- m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0])
+		valType Determinant = 
-		+ m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]);
+			+ m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1])
+			- m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0])
+			+ m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]);
 
-	detail::tmat3x3<valType> Inverse;
+		detail::tmat3x3<valType> Inverse;
-	Inverse[0][0] = + (m[1][1] * m[2][2] - m[2][1] * m[1][2]);
+		Inverse[0][0] = + (m[1][1] * m[2][2] - m[2][1] * m[1][2]);
-	Inverse[0][1] = - (m[1][0] * m[2][2] - m[2][0] * m[1][2]);
+		Inverse[0][1] = - (m[1][0] * m[2][2] - m[2][0] * m[1][2]);
-	Inverse[0][2] = + (m[1][0] * m[2][1] - m[2][0] * m[1][1]);
+		Inverse[0][2] = + (m[1][0] * m[2][1] - m[2][0] * m[1][1]);
-	Inverse[1][0] = - (m[0][1] * m[2][2] - m[2][1] * m[0][2]);
+		Inverse[1][0] = - (m[0][1] * m[2][2] - m[2][1] * m[0][2]);
-	Inverse[1][1] = + (m[0][0] * m[2][2] - m[2][0] * m[0][2]);
+		Inverse[1][1] = + (m[0][0] * m[2][2] - m[2][0] * m[0][2]);
-	Inverse[1][2] = - (m[0][0] * m[2][1] - m[2][0] * m[0][1]);
+		Inverse[1][2] = - (m[0][0] * m[2][1] - m[2][0] * m[0][1]);
-	Inverse[2][0] = + (m[0][1] * m[1][2] - m[1][1] * m[0][2]);
+		Inverse[2][0] = + (m[0][1] * m[1][2] - m[1][1] * m[0][2]);
-	Inverse[2][1] = - (m[0][0] * m[1][2] - m[1][0] * m[0][2]);
+		Inverse[2][1] = - (m[0][0] * m[1][2] - m[1][0] * m[0][2]);
-	Inverse[2][2] = + (m[0][0] * m[1][1] - m[1][0] * m[0][1]);
+		Inverse[2][2] = + (m[0][0] * m[1][1] - m[1][0] * m[0][1]);
-	Inverse /= Determinant;
+		Inverse /= Determinant;
 
-	return Inverse;
+		return Inverse;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> inverseTranspose(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> inverseTranspose
-	detail::tmat4x4<valType> const & m)
+	(
-{
+		detail::tmat4x4<valType> const & m
-	valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
+	)
-	valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
+	{
-	valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
+		valType SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
-	valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
+		valType SubFactor01 = m[2][1] * m[3][3] - m[3][1] * m[2][3];
-	valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
+		valType SubFactor02 = m[2][1] * m[3][2] - m[3][1] * m[2][2];
-	valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
+		valType SubFactor03 = m[2][0] * m[3][3] - m[3][0] * m[2][3];
-	valType SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
+		valType SubFactor04 = m[2][0] * m[3][2] - m[3][0] * m[2][2];
-	valType SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
+		valType SubFactor05 = m[2][0] * m[3][1] - m[3][0] * m[2][1];
-	valType SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
+		valType SubFactor06 = m[1][2] * m[3][3] - m[3][2] * m[1][3];
-	valType SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
+		valType SubFactor07 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
-	valType SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
+		valType SubFactor08 = m[1][1] * m[3][2] - m[3][1] * m[1][2];
-	valType SubFactor11 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
+		valType SubFactor09 = m[1][0] * m[3][3] - m[3][0] * m[1][3];
-	valType SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
+		valType SubFactor10 = m[1][0] * m[3][2] - m[3][0] * m[1][2];
-	valType SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
+		valType SubFactor11 = m[1][1] * m[3][3] - m[3][1] * m[1][3];
-	valType SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
+		valType SubFactor12 = m[1][0] * m[3][1] - m[3][0] * m[1][1];
-	valType SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
+		valType SubFactor13 = m[1][2] * m[2][3] - m[2][2] * m[1][3];
-	valType SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
+		valType SubFactor14 = m[1][1] * m[2][3] - m[2][1] * m[1][3];
-	valType SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
+		valType SubFactor15 = m[1][1] * m[2][2] - m[2][1] * m[1][2];
-	valType SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
+		valType SubFactor16 = m[1][0] * m[2][3] - m[2][0] * m[1][3];
+		valType SubFactor17 = m[1][0] * m[2][2] - m[2][0] * m[1][2];
+		valType SubFactor18 = m[1][0] * m[2][1] - m[2][0] * m[1][1];
 
-	detail::tmat4x4<valType> Inverse;
+		detail::tmat4x4<valType> Inverse;
-	Inverse[0][0] = + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02);
+		Inverse[0][0] = + (m[1][1] * SubFactor00 - m[1][2] * SubFactor01 + m[1][3] * SubFactor02);
-	Inverse[0][1] = - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04);
+		Inverse[0][1] = - (m[1][0] * SubFactor00 - m[1][2] * SubFactor03 + m[1][3] * SubFactor04);
-	Inverse[0][2] = + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05);
+		Inverse[0][2] = + (m[1][0] * SubFactor01 - m[1][1] * SubFactor03 + m[1][3] * SubFactor05);
-	Inverse[0][3] = - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05);
+		Inverse[0][3] = - (m[1][0] * SubFactor02 - m[1][1] * SubFactor04 + m[1][2] * SubFactor05);
 
-	Inverse[1][0] = - (m[0][1] * SubFactor00 - m[0][2] * SubFactor01 + m[0][3] * SubFactor02);
+		Inverse[1][0] = - (m[0][1] * SubFactor00 - m[0][2] * SubFactor01 + m[0][3] * SubFactor02);
-	Inverse[1][1] = + (m[0][0] * SubFactor00 - m[0][2] * SubFactor03 + m[0][3] * SubFactor04);
+		Inverse[1][1] = + (m[0][0] * SubFactor00 - m[0][2] * SubFactor03 + m[0][3] * SubFactor04);
-	Inverse[1][2] = - (m[0][0] * SubFactor01 - m[0][1] * SubFactor03 + m[0][3] * SubFactor05);
+		Inverse[1][2] = - (m[0][0] * SubFactor01 - m[0][1] * SubFactor03 + m[0][3] * SubFactor05);
-	Inverse[1][3] = + (m[0][0] * SubFactor02 - m[0][1] * SubFactor04 + m[0][2] * SubFactor05);
+		Inverse[1][3] = + (m[0][0] * SubFactor02 - m[0][1] * SubFactor04 + m[0][2] * SubFactor05);
 
-	Inverse[2][0] = + (m[0][1] * SubFactor06 - m[0][2] * SubFactor07 + m[0][3] * SubFactor08);
+		Inverse[2][0] = + (m[0][1] * SubFactor06 - m[0][2] * SubFactor07 + m[0][3] * SubFactor08);
-	Inverse[2][1] = - (m[0][0] * SubFactor06 - m[0][2] * SubFactor09 + m[0][3] * SubFactor10);
+		Inverse[2][1] = - (m[0][0] * SubFactor06 - m[0][2] * SubFactor09 + m[0][3] * SubFactor10);
-	Inverse[2][2] = + (m[0][0] * SubFactor11 - m[0][1] * SubFactor09 + m[0][3] * SubFactor12);
+		Inverse[2][2] = + (m[0][0] * SubFactor11 - m[0][1] * SubFactor09 + m[0][3] * SubFactor12);
-	Inverse[2][3] = - (m[0][0] * SubFactor08 - m[0][1] * SubFactor10 + m[0][2] * SubFactor12);
+		Inverse[2][3] = - (m[0][0] * SubFactor08 - m[0][1] * SubFactor10 + m[0][2] * SubFactor12);
 
-	Inverse[3][0] = - (m[0][1] * SubFactor13 - m[0][2] * SubFactor14 + m[0][3] * SubFactor15);
+		Inverse[3][0] = - (m[0][1] * SubFactor13 - m[0][2] * SubFactor14 + m[0][3] * SubFactor15);
-	Inverse[3][1] = + (m[0][0] * SubFactor13 - m[0][2] * SubFactor16 + m[0][3] * SubFactor17);
+		Inverse[3][1] = + (m[0][0] * SubFactor13 - m[0][2] * SubFactor16 + m[0][3] * SubFactor17);
-	Inverse[3][2] = - (m[0][0] * SubFactor14 - m[0][1] * SubFactor16 + m[0][3] * SubFactor18);
+		Inverse[3][2] = - (m[0][0] * SubFactor14 - m[0][1] * SubFactor16 + m[0][3] * SubFactor18);
-	Inverse[3][3] = + (m[0][0] * SubFactor15 - m[0][1] * SubFactor17 + m[0][2] * SubFactor18);
+		Inverse[3][3] = + (m[0][0] * SubFactor15 - m[0][1] * SubFactor17 + m[0][2] * SubFactor18);
 
-	valType Determinant = 
+		valType Determinant = 
-		+ m[0][0] * Inverse[0][0] 
+			+ m[0][0] * Inverse[0][0] 
-		+ m[0][1] * Inverse[0][1] 
+			+ m[0][1] * Inverse[0][1] 
-		+ m[0][2] * Inverse[0][2] 
+			+ m[0][2] * Inverse[0][2] 
-		+ m[0][3] * Inverse[0][3];
+			+ m[0][3] * Inverse[0][3];
 
-	Inverse /= Determinant;
+		Inverse /= Determinant;
-    
-	return Inverse;
-}
     
+		return Inverse;
+	}
 }//namespace glm

glm/gtc/matrix_transform.inl

@@ -26,388 +26,387 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate
-(
-	detail::tmat4x4<T> const & m,
-	detail::tvec3<T> const & v
-)
 {
-	detail::tmat4x4<T> Result(m);
+	template <typename T> 
-	Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate
-	return Result;
+	(
-}
+		detail::tmat4x4<T> const & m,
+		detail::tvec3<T> const & v
+	)
+	{
+		detail::tmat4x4<T> Result(m);
+		Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
+		return Result;
+	}
 		
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate
-(
+	(
-	detail::tmat4x4<T> const & m,
+		detail::tmat4x4<T> const & m,
-	T const & angle, 
+		T const & angle, 
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-    T a = radians(angle);
+		T a = radians(angle);
-    T c = cos(a);
+		T c = cos(a);
-    T s = sin(a);
+		T s = sin(a);
 
-    detail::tvec3<T> axis = normalize(v);
+		detail::tvec3<T> axis = normalize(v);
 
-	detail::tvec3<T> temp = (T(1) - c) * axis;
+		detail::tvec3<T> temp = (T(1) - c) * axis;
 
-    detail::tmat4x4<T> Rotate(detail::tmat4x4<T>::null);
+		detail::tmat4x4<T> Rotate(detail::tmat4x4<T>::null);
-	Rotate[0][0] = c + temp[0] * axis[0];
+		Rotate[0][0] = c + temp[0] * axis[0];
-	Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
+		Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
-	Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
+		Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
 
-	Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
+		Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
-	Rotate[1][1] = c + temp[1] * axis[1];
+		Rotate[1][1] = c + temp[1] * axis[1];
-	Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
+		Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
 
-	Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
+		Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
-	Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
+		Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
-	Rotate[2][2] = c + temp[2] * axis[2];
+		Rotate[2][2] = c + temp[2] * axis[2];
 
-	detail::tmat4x4<T> Result(detail::tmat4x4<T>::null);
+		detail::tmat4x4<T> Result(detail::tmat4x4<T>::null);
-	Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
+		Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
-	Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
+		Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
-	Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
+		Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
-	Result[3] = m[3];
+		Result[3] = m[3];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale
-(
+	(
-	detail::tmat4x4<T> const & m,
+		detail::tmat4x4<T> const & m,
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-    detail::tmat4x4<T> Result(detail::tmat4x4<T>::null);
+		detail::tmat4x4<T> Result(detail::tmat4x4<T>::null);
-	Result[0] = m[0] * v[0];
+		Result[0] = m[0] * v[0];
-	Result[1] = m[1] * v[1];
+		Result[1] = m[1] * v[1];
-	Result[2] = m[2] * v[2];
+		Result[2] = m[2] * v[2];
-	Result[3] = m[3];
+		Result[3] = m[3];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate_slow
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> translate_slow
-(
+	(
-	detail::tmat4x4<T> const & m,
+		detail::tmat4x4<T> const & m,
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-    detail::tmat4x4<T> Result(T(1));
+		detail::tmat4x4<T> Result(T(1));
-    Result[3] = detail::tvec4<T>(v, T(1));
+		Result[3] = detail::tvec4<T>(v, T(1));
-    return m * Result;
+		return m * Result;
 
-	//detail::tmat4x4<valType> Result(m);
+		//detail::tmat4x4<valType> Result(m);
-	Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
+		Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
-	//Result[3][0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2] + m[3][0];
+		//Result[3][0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2] + m[3][0];
-	//Result[3][1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2] + m[3][1];
+		//Result[3][1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2] + m[3][1];
-	//Result[3][2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2];
+		//Result[3][2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2];
-	//Result[3][3] = m[0][3] * v[0] + m[1][3] * v[1] + m[2][3] * v[2] + m[3][3];
+		//Result[3][3] = m[0][3] * v[0] + m[1][3] * v[1] + m[2][3] * v[2] + m[3][3];
-	//return Result;
+		//return Result;
-}
+	}
 		
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate_slow
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> rotate_slow
-(
+	(
-	detail::tmat4x4<T> const & m,
+		detail::tmat4x4<T> const & m,
-	T const & angle, 
+		T const & angle, 
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-    T a = radians(angle);
+		T a = radians(angle);
-    T c = cos(a);
+		T c = cos(a);
-    T s = sin(a);
+		T s = sin(a);
-    detail::tmat4x4<T> Result;
+		detail::tmat4x4<T> Result;
 
-    detail::tvec3<T> axis = normalize(v);
+		detail::tvec3<T> axis = normalize(v);
 
-    Result[0][0] = c + (1 - c)      * axis.x     * axis.x;
+		Result[0][0] = c + (1 - c)      * axis.x     * axis.x;
-	Result[0][1] = (1 - c) * axis.x * axis.y + s * axis.z;
+		Result[0][1] = (1 - c) * axis.x * axis.y + s * axis.z;
-	Result[0][2] = (1 - c) * axis.x * axis.z - s * axis.y;
+		Result[0][2] = (1 - c) * axis.x * axis.z - s * axis.y;
-	Result[0][3] = 0;
+		Result[0][3] = 0;
 
-	Result[1][0] = (1 - c) * axis.y * axis.x - s * axis.z;
+		Result[1][0] = (1 - c) * axis.y * axis.x - s * axis.z;
-	Result[1][1] = c + (1 - c) * axis.y * axis.y;
+		Result[1][1] = c + (1 - c) * axis.y * axis.y;
-	Result[1][2] = (1 - c) * axis.y * axis.z + s * axis.x;
+		Result[1][2] = (1 - c) * axis.y * axis.z + s * axis.x;
-	Result[1][3] = 0;
+		Result[1][3] = 0;
 
-	Result[2][0] = (1 - c) * axis.z * axis.x + s * axis.y;
+		Result[2][0] = (1 - c) * axis.z * axis.x + s * axis.y;
-	Result[2][1] = (1 - c) * axis.z * axis.y - s * axis.x;
+		Result[2][1] = (1 - c) * axis.z * axis.y - s * axis.x;
-	Result[2][2] = c + (1 - c) * axis.z * axis.z;
+		Result[2][2] = c + (1 - c) * axis.z * axis.z;
-	Result[2][3] = 0;
+		Result[2][3] = 0;
 
-    Result[3] = detail::tvec4<T>(0, 0, 0, 1);
+		Result[3] = detail::tvec4<T>(0, 0, 0, 1);
-    return m * Result;
+		return m * Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale_slow
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> scale_slow
-(
+	(
-	detail::tmat4x4<T> const & m,
+		detail::tmat4x4<T> const & m,
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-    detail::tmat4x4<T> Result(T(1));
+		detail::tmat4x4<T> Result(T(1));
-    Result[0][0] = v.x;
+		Result[0][0] = v.x;
-    Result[1][1] = v.y;
+		Result[1][1] = v.y;
-    Result[2][2] = v.z;
+		Result[2][2] = v.z;
-    return m * Result;
+		return m * Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> ortho
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> ortho
-(
+	(
-	valType const & left, 
+		valType const & left, 
-	valType const & right, 
+		valType const & right, 
-	valType const & bottom, 
+		valType const & bottom, 
-	valType const & top, 
+		valType const & top, 
-	valType const & zNear, 
+		valType const & zNear, 
-	valType const & zFar
+		valType const & zFar
-)
+	)
-{
+	{
-	detail::tmat4x4<valType> Result(1);
+		detail::tmat4x4<valType> Result(1);
-	Result[0][0] = valType(2) / (right - left);
+		Result[0][0] = valType(2) / (right - left);
-	Result[1][1] = valType(2) / (top - bottom);
+		Result[1][1] = valType(2) / (top - bottom);
-	Result[2][2] = - valType(2) / (zFar - zNear);
+		Result[2][2] = - valType(2) / (zFar - zNear);
-	Result[3][0] = - (right + left) / (right - left);
+		Result[3][0] = - (right + left) / (right - left);
-	Result[3][1] = - (top + bottom) / (top - bottom);
+		Result[3][1] = - (top + bottom) / (top - bottom);
-	Result[3][2] = - (zFar + zNear) / (zFar - zNear);
+		Result[3][2] = - (zFar + zNear) / (zFar - zNear);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> ortho(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> ortho(
-	valType const & left, 
+		valType const & left, 
-	valType const & right, 
+		valType const & right, 
-	valType const & bottom, 
+		valType const & bottom, 
-	valType const & top)
+		valType const & top)
-{
+	{
-	detail::tmat4x4<valType> Result(1);
+		detail::tmat4x4<valType> Result(1);
-	Result[0][0] = valType(2) / (right - left);
+		Result[0][0] = valType(2) / (right - left);
-	Result[1][1] = valType(2) / (top - bottom);
+		Result[1][1] = valType(2) / (top - bottom);
-	Result[2][2] = - valType(1);
+		Result[2][2] = - valType(1);
-	Result[3][0] = - (right + left) / (right - left);
+		Result[3][0] = - (right + left) / (right - left);
-	Result[3][1] = - (top + bottom) / (top - bottom);
+		Result[3][1] = - (top + bottom) / (top - bottom);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> frustum
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> frustum
-(
+	(
-	valType const & left, 
+		valType const & left, 
-	valType const & right, 
+		valType const & right, 
-	valType const & bottom, 
+		valType const & bottom, 
-	valType const & top, 
+		valType const & top, 
-	valType const & nearVal, 
+		valType const & nearVal, 
-	valType const & farVal
+		valType const & farVal
-)
+	)
-{
+	{
-	detail::tmat4x4<valType> Result(0);
+		detail::tmat4x4<valType> Result(0);
-	Result[0][0] = (valType(2) * nearVal) / (right - left);
+		Result[0][0] = (valType(2) * nearVal) / (right - left);
-	Result[1][1] = (valType(2) * nearVal) / (top - bottom);
+		Result[1][1] = (valType(2) * nearVal) / (top - bottom);
-	Result[2][0] = (right + left) / (right - left);
+		Result[2][0] = (right + left) / (right - left);
-	Result[2][1] = (top + bottom) / (top - bottom);
+		Result[2][1] = (top + bottom) / (top - bottom);
-	Result[2][2] = -(farVal + nearVal) / (farVal - nearVal);
+		Result[2][2] = -(farVal + nearVal) / (farVal - nearVal);
-	Result[2][3] = valType(-1);
+		Result[2][3] = valType(-1);
-	Result[3][2] = -(valType(2) * farVal * nearVal) / (farVal - nearVal);
+		Result[3][2] = -(valType(2) * farVal * nearVal) / (farVal - nearVal);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> perspective
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> perspective
-(
+	(
-	valType const & fovy, 
+		valType const & fovy, 
-	valType const & aspect, 
+		valType const & aspect, 
-	valType const & zNear, 
+		valType const & zNear, 
-	valType const & zFar
+		valType const & zFar
-)
+	)
-{
+	{
-	valType range = tan(radians(fovy / valType(2))) * zNear;	
+		valType range = tan(radians(fovy / valType(2))) * zNear;	
-	valType left = -range * aspect;
+		valType left = -range * aspect;
-	valType right = range * aspect;
+		valType right = range * aspect;
-	valType bottom = -range;
+		valType bottom = -range;
-	valType top = range;
+		valType top = range;
 
-	detail::tmat4x4<valType> Result(valType(0));
+		detail::tmat4x4<valType> Result(valType(0));
-	Result[0][0] = (valType(2) * zNear) / (right - left);
+		Result[0][0] = (valType(2) * zNear) / (right - left);
-	Result[1][1] = (valType(2) * zNear) / (top - bottom);
+		Result[1][1] = (valType(2) * zNear) / (top - bottom);
-	Result[2][2] = - (zFar + zNear) / (zFar - zNear);
+		Result[2][2] = - (zFar + zNear) / (zFar - zNear);
-	Result[2][3] = - valType(1);
+		Result[2][3] = - valType(1);
-	Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear);
+		Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> perspectiveFov
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> perspectiveFov
-(
+	(
-	valType const & fov, 
+		valType const & fov, 
-	valType const & width, 
+		valType const & width, 
-	valType const & height, 
+		valType const & height, 
-	valType const & zNear, 
+		valType const & zNear, 
-	valType const & zFar
+		valType const & zFar
-)
+	)
-{
+	{
-	valType rad = glm::radians(fov);
+		valType rad = glm::radians(fov);
-	valType h = glm::cos(valType(0.5) * rad) / glm::sin(valType(0.5) * rad);
+		valType h = glm::cos(valType(0.5) * rad) / glm::sin(valType(0.5) * rad);
-	valType w = h * height / width;
+		valType w = h * height / width;
 
-	detail::tmat4x4<valType> Result(valType(0));
+		detail::tmat4x4<valType> Result(valType(0));
-	Result[0][0] = w;
+		Result[0][0] = w;
-	Result[1][1] = h;
+		Result[1][1] = h;
-	Result[2][2] = (zFar + zNear) / (zFar - zNear);
+		Result[2][2] = (zFar + zNear) / (zFar - zNear);
-	Result[2][3] = valType(1);
+		Result[2][3] = valType(1);
-	Result[3][2] = -(valType(2) * zFar * zNear) / (zFar - zNear);
+		Result[3][2] = -(valType(2) * zFar * zNear) / (zFar - zNear);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> infinitePerspective
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> infinitePerspective
-(
+	(
-	T fovy, 
+		T fovy, 
-	T aspect, 
+		T aspect, 
-	T zNear
+		T zNear
-)
+	)
-{
+	{
-	T range = tan(radians(fovy / T(2))) * zNear;	
+		T range = tan(radians(fovy / T(2))) * zNear;	
-	T left = -range * aspect;
+		T left = -range * aspect;
-	T right = range * aspect;
+		T right = range * aspect;
-	T bottom = -range;
+		T bottom = -range;
-	T top = range;
+		T top = range;
 
-	detail::tmat4x4<T> Result(T(0));
+		detail::tmat4x4<T> Result(T(0));
-	Result[0][0] = (T(2) * zNear) / (right - left);
+		Result[0][0] = (T(2) * zNear) / (right - left);
-	Result[1][1] = (T(2) * zNear) / (top - bottom);
+		Result[1][1] = (T(2) * zNear) / (top - bottom);
-	Result[2][2] = - T(1);
+		Result[2][2] = - T(1);
-	Result[2][3] = - T(1);
+		Result[2][3] = - T(1);
-	Result[3][2] = - T(2) * zNear;
+		Result[3][2] = - T(2) * zNear;
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> tweakedInfinitePerspective
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> tweakedInfinitePerspective
-(
+	(
-	T fovy, 
+		T fovy, 
-	T aspect, 
+		T aspect, 
-	T zNear
+		T zNear
-)
+	)
-{
+	{
-	T range = tan(radians(fovy / T(2))) * zNear;	
+		T range = tan(radians(fovy / T(2))) * zNear;	
-	T left = -range * aspect;
+		T left = -range * aspect;
-	T right = range * aspect;
+		T right = range * aspect;
-	T bottom = -range;
+		T bottom = -range;
-	T top = range;
+		T top = range;
 
-	detail::tmat4x4<T> Result(T(0));
+		detail::tmat4x4<T> Result(T(0));
-	Result[0][0] = (T(2) * zNear) / (right - left);
+		Result[0][0] = (T(2) * zNear) / (right - left);
-	Result[1][1] = (T(2) * zNear) / (top - bottom);
+		Result[1][1] = (T(2) * zNear) / (top - bottom);
-	Result[2][2] = T(0.0001) - T(1);
+		Result[2][2] = T(0.0001) - T(1);
-	Result[2][3] = T(-1);
+		Result[2][3] = T(-1);
-	Result[3][2] = - (T(0.0001) - T(2)) * zNear;
+		Result[3][2] = - (T(0.0001) - T(2)) * zNear;
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T, typename U>
+	template <typename T, typename U>
-GLM_FUNC_QUALIFIER detail::tvec3<T> project
+	GLM_FUNC_QUALIFIER detail::tvec3<T> project
-(
+	(
-	detail::tvec3<T> const & obj, 
+		detail::tvec3<T> const & obj, 
-	detail::tmat4x4<T> const & model, 
+		detail::tmat4x4<T> const & model, 
-	detail::tmat4x4<T> const & proj, 
+		detail::tmat4x4<T> const & proj, 
-	detail::tvec4<U> const & viewport
+		detail::tvec4<U> const & viewport
-)
+	)
-{
+	{
-	detail::tvec4<T> tmp = detail::tvec4<T>(obj, T(1));
+		detail::tvec4<T> tmp = detail::tvec4<T>(obj, T(1));
-	tmp = model * tmp;
+		tmp = model * tmp;
-	tmp = proj * tmp;
+		tmp = proj * tmp;
 
-	tmp /= tmp.w;
+		tmp /= tmp.w;
-	tmp = tmp * T(0.5) + T(0.5);
+		tmp = tmp * T(0.5) + T(0.5);
-	tmp[0] = tmp[0] * T(viewport[2]) + T(viewport[0]);
+		tmp[0] = tmp[0] * T(viewport[2]) + T(viewport[0]);
-	tmp[1] = tmp[1] * T(viewport[3]) + T(viewport[1]);
+		tmp[1] = tmp[1] * T(viewport[3]) + T(viewport[1]);
 
-	return detail::tvec3<T>(tmp);
+		return detail::tvec3<T>(tmp);
-}
+	}
 
-template <typename T, typename U>
+	template <typename T, typename U>
-GLM_FUNC_QUALIFIER detail::tvec3<T> unProject
+	GLM_FUNC_QUALIFIER detail::tvec3<T> unProject
-(
+	(
-	detail::tvec3<T> const & win, 
+		detail::tvec3<T> const & win, 
-	detail::tmat4x4<T> const & model, 
+		detail::tmat4x4<T> const & model, 
-	detail::tmat4x4<T> const & proj, 
+		detail::tmat4x4<T> const & proj, 
-	detail::tvec4<U> const & viewport
+		detail::tvec4<U> const & viewport
-)
+	)
-{
+	{
-	detail::tmat4x4<T> inverse = glm::inverse(proj * model);
+		detail::tmat4x4<T> inverse = glm::inverse(proj * model);
 
-	detail::tvec4<T> tmp = detail::tvec4<T>(win, T(1));
+		detail::tvec4<T> tmp = detail::tvec4<T>(win, T(1));
-	tmp.x = (tmp.x - T(viewport[0])) / T(viewport[2]);
+		tmp.x = (tmp.x - T(viewport[0])) / T(viewport[2]);
-	tmp.y = (tmp.y - T(viewport[1])) / T(viewport[3]);
+		tmp.y = (tmp.y - T(viewport[1])) / T(viewport[3]);
-	tmp = tmp * T(2) - T(1);
+		tmp = tmp * T(2) - T(1);
 
-	detail::tvec4<T> obj = inverse * tmp;
+		detail::tvec4<T> obj = inverse * tmp;
-	obj /= obj.w;
+		obj /= obj.w;
 
-	return detail::tvec3<T>(obj);
+		return detail::tvec3<T>(obj);
-}
+	}
 
-template <typename T, typename U> 
+	template <typename T, typename U> 
-detail::tmat4x4<T> pickMatrix
+	detail::tmat4x4<T> pickMatrix
-(
+	(
-	detail::tvec2<T> const & center, 
+		detail::tvec2<T> const & center, 
-	detail::tvec2<T> const & delta, 
+		detail::tvec2<T> const & delta, 
-	detail::tvec4<U> const & viewport
+		detail::tvec4<U> const & viewport
-)
+	)
-{
+	{
-	assert(delta.x > T(0) && delta.y > T(0));
+		assert(delta.x > T(0) && delta.y > T(0));
-	detail::tmat4x4<T> Result(1.0f);
+		detail::tmat4x4<T> Result(1.0f);
 
-	if(!(delta.x > T(0) && delta.y > T(0))) 
+		if(!(delta.x > T(0) && delta.y > T(0))) 
-		return Result; // Error
+			return Result; // Error
 
-	detail::tvec3<T> Temp(
+		detail::tvec3<T> Temp(
-		(T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x,
+			(T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x,
-		(T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y,
+			(T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y,
-		T(0));
+			T(0));
 
-	// Translate and scale the picked region to the entire window
+		// Translate and scale the picked region to the entire window
-	Result = translate(Result, Temp);
+		Result = translate(Result, Temp);
-	return scale(Result, detail::tvec3<T>(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)));
+		return scale(Result, detail::tvec3<T>(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)));
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> lookAt
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> lookAt
-(
+	(
-	detail::tvec3<T> const & eye,
+		detail::tvec3<T> const & eye,
-	detail::tvec3<T> const & center,
+		detail::tvec3<T> const & center,
-	detail::tvec3<T> const & up
+		detail::tvec3<T> const & up
-)
+	)
-{
+	{
-    detail::tvec3<T> f = normalize(center - eye);
+		detail::tvec3<T> f = normalize(center - eye);
-    detail::tvec3<T> u = normalize(up);
+		detail::tvec3<T> u = normalize(up);
-    detail::tvec3<T> s = normalize(cross(f, u));
+		detail::tvec3<T> s = normalize(cross(f, u));
-    u = cross(s, f);
+		u = cross(s, f);
-
-    detail::tmat4x4<T> Result(1);
-    Result[0][0] = s.x;
-    Result[1][0] = s.y;
-    Result[2][0] = s.z;
-    Result[0][1] = u.x;
-    Result[1][1] = u.y;
-    Result[2][1] = u.z;
-    Result[0][2] =-f.x;
-    Result[1][2] =-f.y;
-    Result[2][2] =-f.z;
-/*  Test this instead of translate3D
-    Result[3][0] =-dot(s, eye);
-    Result[3][1] =-dot(y, eye);
-    Result[3][2] = dot(f, eye);
-*/  
-	return translate(Result, -eye);
-}
 
+		detail::tmat4x4<T> Result(1);
+		Result[0][0] = s.x;
+		Result[1][0] = s.y;
+		Result[2][0] = s.z;
+		Result[0][1] = u.x;
+		Result[1][1] = u.y;
+		Result[2][1] = u.z;
+		Result[0][2] =-f.x;
+		Result[1][2] =-f.y;
+		Result[2][2] =-f.z;
+	/*  Test this instead of translate3D
+		Result[3][0] =-dot(s, eye);
+		Result[3][1] =-dot(y, eye);
+		Result[3][2] = dot(f, eye);
+	*/  
+		return translate(Result, -eye);
+	}
 }//namespace glm

glm/gtc/quaternion.inl

@@ -29,8 +29,8 @@
 #include <limits>
 
 namespace glm{
-namespace detail{
+namespace detail
-
+{
     template <typename T> 
     GLM_FUNC_QUALIFIER tquat<T>::tquat() : 
         x(0),

glm/gtc/random.inl

@@ -9,200 +9,136 @@
 
 #include <ctime>
 #include <cassert>
+#include "../core/_vectorize.hpp"
 
 namespace glm{
-
+namespace detail
-template <> 
-GLM_FUNC_QUALIFIER glm::half linearRand
-(
-	glm::half const & Min, 
-	glm::half const & Max
-)
 {
-	return glm::half(float(std::rand()) / float(RAND_MAX) * (float(Max) - float(Min)) + float(Min));
+	struct compute_linearRand
-}
-	
-template <> 
-GLM_FUNC_QUALIFIER float linearRand
-(
-	float const & Min, 
-	float const & Max
-)
-{
-	return float(std::rand()) / float(RAND_MAX) * (Max - Min) + Min;
-}
-	
-template <> 
-GLM_FUNC_QUALIFIER double linearRand
-(
-	double const & Min, 
-	double const & Max
-)
-{
-	return double(std::rand()) / double(RAND_MAX) * (Max - Min) + Min;
-}
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> linearRand
-(
-	detail::tvec2<T> const & Min, 
-	detail::tvec2<T> const & Max
-)
-{
-	return detail::tvec2<T>(
-		linearRand(Min.x, Max.x),
-		linearRand(Min.y, Max.y));
-}
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> linearRand
-(
-	detail::tvec3<T> const & Min, 
-	detail::tvec3<T> const & Max
-)
-{
-	return detail::tvec3<T>(
-		linearRand(Min.x, Max.x),
-		linearRand(Min.y, Max.y),
-		linearRand(Min.z, Max.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> linearRand
-(
-	detail::tvec4<T> const & Min, 
-	detail::tvec4<T> const & Max
-)
-{
-	return detail::tvec4<T>(
-		linearRand(Min.x, Max.x),
-		linearRand(Min.y, Max.y),
-		linearRand(Min.z, Max.z),
-		linearRand(Min.w, Max.w));
-}
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType gaussRand
-(
-	genType const & Mean,	
-	genType const & Deviation
-)
-{
-    genType w, x1, x2;
-	
-    do
-    {
-        x1 = linearRand(genType(-1), genType(1));
-        x2 = linearRand(genType(-1), genType(1));
-		
-        w = x1 * x1 + x2 * x2;
-    } while(w > genType(1));
-	
-    return x2 * Deviation * Deviation * sqrt((genType(-2) * log(w)) / w) + Mean;
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> gaussRand
-(
-	detail::tvec2<T> const & Mean, 
-	detail::tvec2<T> const & Deviation
-)
-{
-	return detail::tvec2<T>(
-		gaussRand(Mean.x, Deviation.x),
-		gaussRand(Mean.y, Deviation.y));
-}
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> gaussRand
-(
-	detail::tvec3<T> const & Mean, 
-	detail::tvec3<T> const & Deviation
-)
-{
-	return detail::tvec3<T>(
-		gaussRand(Mean.x, Deviation.x),
-		gaussRand(Mean.y, Deviation.y),
-		gaussRand(Mean.z, Deviation.z));
-}
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> gaussRand
-(
-	detail::tvec4<T> const & Mean, 
-	detail::tvec4<T> const & Deviation
-)
-{
-	return detail::tvec4<T>(
-		gaussRand(Mean.x, Deviation.x),
-		gaussRand(Mean.y, Deviation.y),
-		gaussRand(Mean.z, Deviation.z),
-		gaussRand(Mean.w, Deviation.w));
-}
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> diskRand
-(
-	T const & Radius
-)
-{		
-	detail::tvec2<T> Result(T(0));
-	T LenRadius(T(0));
-		
-	do
 	{
-		Result = linearRand(detail::tvec2<T>(-Radius), detail::tvec2<T>(Radius));
+		template <typename T>
-		LenRadius = length(Result);
+		GLM_FUNC_QUALIFIER T operator() (T const & Min, T const & Max) const
-	}
+		{
-	while(LenRadius > Radius);
+			GLM_STATIC_ASSERT(0, "'linearRand' invalid template parameter type. GLM_GTC_random only supports floating-point template types.");
+			return Min;
+		}
+	};
 
-	return Result;
+	template <>
-}
+	GLM_FUNC_QUALIFIER half compute_linearRand::operator()<half> (half const & Min, half const & Max) const
-	
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> ballRand
-(
-	T const & Radius
-)
-{		
-	detail::tvec3<T> Result(T(0));
-	T LenRadius(T(0));
-		
-	do
 	{
-		Result = linearRand(detail::tvec3<T>(-Radius), detail::tvec3<T>(Radius));
+		return half(float(std::rand()) / float(RAND_MAX) * (float(Max) - float(Min)) + float(Min));
-		LenRadius = length(Result);
 	}
-	while(LenRadius > Radius);
 
-	return Result;
+	template <>
-}
+	GLM_FUNC_QUALIFIER float compute_linearRand::operator()<float> (float const & Min, float const & Max) const
+	{
+		return float(std::rand()) / float(RAND_MAX) * (Max - Min) + Min;
+	}
 
-template <typename T> 
+	template <>
-GLM_FUNC_QUALIFIER detail::tvec2<T> circularRand
+	GLM_FUNC_QUALIFIER double compute_linearRand::operator()<double> (double const & Min, double const & Max) const
-(
+	{
-	T const & Radius
+		return double(std::rand()) / double(RAND_MAX) * (Max - Min) + Min;
-)
+	}
-{
+}//namespace detail
-	T a = linearRand(T(0), T(6.283185307179586476925286766559f));
-	return detail::tvec2<T>(cos(a), sin(a)) * Radius;		
-}
 
-template <typename T> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> sphericalRand
+	GLM_FUNC_QUALIFIER genType linearRand
-(
+	(
-	T const & Radius
+		genType const & Min, 
-)
+		genType const & Max
-{
+	)
-	T z = linearRand(T(-1), T(1));
+	{
-	T a = linearRand(T(0), T(6.283185307179586476925286766559f));
+		return detail::compute_linearRand()(Min, Max);
+	}
 
-	T r = sqrt(T(1) - z * z);
+	VECTORIZE_VEC_VEC(linearRand)
 
-	T x = r * cos(a);
+	template <typename genType> 
-	T y = r * sin(a);
+	GLM_FUNC_QUALIFIER genType gaussRand
+	(
+		genType const & Mean,	
+		genType const & Deviation
+	)
+	{
+		genType w, x1, x2;
 	
-	return detail::tvec3<T>(x, y, z) * Radius;	
+		do
-}
+		{
+			x1 = linearRand(genType(-1), genType(1));
+			x2 = linearRand(genType(-1), genType(1));
 		
+			w = x1 * x1 + x2 * x2;
+		} while(w > genType(1));
+	
+		return x2 * Deviation * Deviation * sqrt((genType(-2) * log(w)) / w) + Mean;
+	}
+
+	VECTORIZE_VEC_VEC(gaussRand)
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tvec2<T> diskRand
+	(
+		T const & Radius
+	)
+	{		
+		detail::tvec2<T> Result(T(0));
+		T LenRadius(T(0));
+		
+		do
+		{
+			Result = linearRand(detail::tvec2<T>(-Radius), detail::tvec2<T>(Radius));
+			LenRadius = length(Result);
+		}
+		while(LenRadius > Radius);
+		
+		return Result;
+	}
+	
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tvec3<T> ballRand
+	(
+		T const & Radius
+	)
+	{		
+		detail::tvec3<T> Result(T(0));
+		T LenRadius(T(0));
+		
+		do
+		{
+			Result = linearRand(detail::tvec3<T>(-Radius), detail::tvec3<T>(Radius));
+			LenRadius = length(Result);
+		}
+		while(LenRadius > Radius);
+		
+		return Result;
+	}
+	
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec2<T> circularRand
+	(
+		T const & Radius
+	)
+	{
+		T a = linearRand(T(0), T(6.283185307179586476925286766559f));
+		return detail::tvec2<T>(cos(a), sin(a)) * Radius;		
+	}
+	
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec3<T> sphericalRand
+	(
+		T const & Radius
+	)
+	{
+		T z = linearRand(T(-1), T(1));
+		T a = linearRand(T(0), T(6.283185307179586476925286766559f));
+	
+		T r = sqrt(T(1) - z * z);
+	
+		T x = r * cos(a);
+		T y = r * sin(a);
+	
+		return detail::tvec3<T>(x, y, z) * Radius;	
+	}
 }//namespace glm

glm/gtc/swizzle.inl

@@ -26,165 +26,91 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T, template <typename> class vecType>
-GLM_FUNC_QUALIFIER T swizzle
-(	
-	vecType<T> const & v,
-	comp x
-)
 {
-	assert(int(x) < int(vecType<T>::value_size));
+	template <typename T, template <typename> class vecType>
-	return v[x];
+	GLM_FUNC_QUALIFIER T swizzle
-}
+	(	
+		vecType<T> const & v,
+		comp x
+	)
+	{
+		assert(int(x) < int(vecType<T>::value_size));
+		return v[x];
+	}
 
-template <typename T, template <typename> class vecType>
+	template <typename T, template <typename> class vecType>
-GLM_FUNC_QUALIFIER detail::tvec2<T> swizzle
+	GLM_FUNC_QUALIFIER detail::tvec2<T> swizzle
-(
+	(
-	vecType<T> const & v,
+		vecType<T> const & v,
-	comp x, comp y
+		comp x, comp y
-)
+	)
-{
+	{
-	return detail::tvec2<T>(
+		return detail::tvec2<T>(
-		v[x],
+			v[x],
-		v[y]);
+			v[y]);
-}
+	}
 
-template <typename T, template <typename> class vecType>
+	template <typename T, template <typename> class vecType>
-GLM_FUNC_QUALIFIER detail::tvec3<T> swizzle
+	GLM_FUNC_QUALIFIER detail::tvec3<T> swizzle
-(
+	(
-	vecType<T> const & v,
+		vecType<T> const & v,
-	comp x, comp y, comp z
+		comp x, comp y, comp z
-)
+	)
-{
+	{
-	return detail::tvec3<T>(
+		return detail::tvec3<T>(
-		v[x],
+			v[x],
-		v[y],
+			v[y],
-		v[z]);
+			v[z]);
-}
+	}
 
-template <typename T, template <typename> class vecType>
+	template <typename T, template <typename> class vecType>
-GLM_FUNC_QUALIFIER detail::tvec4<T> swizzle
+	GLM_FUNC_QUALIFIER detail::tvec4<T> swizzle
-(
+	(
-	vecType<T> const & v,
+		vecType<T> const & v,
-	comp x, comp y, comp z, comp w
+		comp x, comp y, comp z, comp w
-)
+	)
-{
+	{
-	return detail::tvec4<T>(v[x], v[y],	v[z], v[w]);
+		return detail::tvec4<T>(v[x], v[y],	v[z], v[w]);
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T& swizzle
+	GLM_FUNC_QUALIFIER T& swizzle
-(
+	(
-	detail::tvec4<T> & v,
+		detail::tvec4<T> & v,
-	comp x
+		comp x
-)
+	)
-{
+	{
-	return v[x];
+		return v[x];
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tref2<T> swizzle
+	GLM_FUNC_QUALIFIER detail::tref2<T> swizzle
-(
+	(
-	detail::tvec4<T> & v,
+		detail::tvec4<T> & v,
-	comp x, comp y
+		comp x, comp y
-)
+	)
-{
+	{
-	return detail::tref2<T>(v[x], v[y]);
+		return detail::tref2<T>(v[x], v[y]);
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tref3<T> swizzle
+	GLM_FUNC_QUALIFIER detail::tref3<T> swizzle
-(
+	(
-	detail::tvec4<T> & v,
+		detail::tvec4<T> & v,
-	comp x, comp y, comp z
+		comp x, comp y, comp z
-)
+	)
-{
+	{
-	return detail::tref3<T>(v[x], v[y],	v[z]);
+		return detail::tref3<T>(v[x], v[y],	v[z]);
-}
+	}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tref4<T> swizzle
-(
-	detail::tvec4<T> & v,
-	comp x, comp y, comp z, comp w
-)
-{
-	return detail::tref4<T>(v[x], v[y],	v[z], v[w]);
-}
-/*
-template <comp x>
-GLM_FUNC_QUALIFIER float& swizzle
-(
-	detail::tvec4<float> & v
-)
-{
-	return v[x];
-}
-
-template <comp x>
-GLM_FUNC_QUALIFIER int& swizzle
-(
-	detail::tvec4<int> & v
-)
-{
-	return v[x];
-}
-
-template <comp x, comp y>
-GLM_FUNC_QUALIFIER detail::tref2<float> swizzle
-(
-	detail::tvec4<float> & v
-)
-{
-	return detail::tref2<float>(v[x], v[y]);
-}
-
-template <comp x, comp y>
-GLM_FUNC_QUALIFIER detail::tref2<int> swizzle
-(
-	detail::tvec4<int> & v
-)
-{
-	return detail::tref2<int>(v[x], v[y]);
-}
-
-template <comp x, comp y, comp z>
-GLM_FUNC_QUALIFIER detail::tref3<float> swizzle
-(
-	detail::tvec4<float> & v
-)
-{
-	return detail::tref3<float>(v[x], v[y],	v[z]);
-}
-	
-template <comp x, comp y, comp z>
-GLM_FUNC_QUALIFIER detail::tref3<int> swizzle
-(
-	detail::tvec4<int> & v
-)
-{
-	return detail::tref3<int>(v[x], v[y], v[z]);
-}
-
-template <comp x, comp y, comp z, comp w>
-GLM_FUNC_QUALIFIER detail::tref4<float> swizzle
-(
-	detail::tvec4<float> & v
-)
-{
-	return detail::tref4<float>(v[x], v[y],	v[z], v[w]);
-}
-
-template <comp x, comp y, comp z, comp w>
-GLM_FUNC_QUALIFIER detail::tref4<int> swizzle
-(
-	detail::tvec4<int> & v
-)
-{
-	return detail::tref4<int>(v[x], v[y],	v[z], v[w]);
-}
-*/
 
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tref4<T> swizzle
+	(
+		detail::tvec4<T> & v,
+		comp x, comp y, comp z, comp w
+	)
+	{
+		return detail::tref4<T>(v[x], v[y],	v[z], v[w]);
+	}
 }//namespace glm

glm/gtx/closest_point.inl

@@ -10,28 +10,27 @@
 #ifndef glm_gtx_closest_point
 #define glm_gtx_closest_point
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> closestPointOnLine
-(
-	detail::tvec3<valType> const & point, 
-	detail::tvec3<valType> const & a, 
-	detail::tvec3<valType> const & b
-)
 {
-    valType LineLength = distance(a, b);
+	template <typename valType> 
-    detail::tvec3<valType> Vector = point - a;
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> closestPointOnLine
-    detail::tvec3<valType> LineDirection = (b - a) / LineLength;
+	(
+		detail::tvec3<valType> const & point, 
+		detail::tvec3<valType> const & a, 
+		detail::tvec3<valType> const & b
+	)
+	{
+		valType LineLength = distance(a, b);
+		detail::tvec3<valType> Vector = point - a;
+		detail::tvec3<valType> LineDirection = (b - a) / LineLength;
 
-    // Project Vector to LineDirection to get the distance of point from a
+		// Project Vector to LineDirection to get the distance of point from a
-    valType Distance = dot(Vector, LineDirection);
+		valType Distance = dot(Vector, LineDirection);
-
-    if(Distance <= valType(0)) return a;
-    if(Distance >= LineLength) return b;
-    return a + LineDirection * Distance;
-}
 
+		if(Distance <= valType(0)) return a;
+		if(Distance >= LineLength) return b;
+		return a + LineDirection * Distance;
+	}
 }//namespace glm
 
 #endif//glm_gtx_closest_point

glm/gtx/color_space.inl

@@ -7,144 +7,143 @@
 // File    : glm/gtx/color_space.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> rgbColor(const detail::tvec3<T>& hsvColor)
 {
-	detail::tvec3<T> hsv = hsvColor;
+	template <typename T> 
-    detail::tvec3<T> rgbColor;
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rgbColor(const detail::tvec3<T>& hsvColor)
-
-	if(hsv.y == T(0))
-		// achromatic (grey)
-        rgbColor = detail::tvec3<T>(hsv.z);
-	else
 	{
-        T sector = floor(hsv.x / T(60));
+		detail::tvec3<T> hsv = hsvColor;
-		T frac = (hsv.x / T(60)) - sector;
+		detail::tvec3<T> rgbColor;
-        // factorial part of h
-        T o = hsv.z * (T(1) - hsv.y);
-        T p = hsv.z * (T(1) - hsv.y * frac);
-        T q = hsv.z * (T(1) - hsv.y * (T(1) - frac));
 
-        switch(int(sector))
+		if(hsv.y == T(0))
-        {
+			// achromatic (grey)
-        default:
+			rgbColor = detail::tvec3<T>(hsv.z);
-        case 0:
-            rgbColor.r = hsv.z;
-            rgbColor.g = q;
-            rgbColor.b = o;
-            break;
-        case 1:
-            rgbColor.r = p;
-            rgbColor.g = hsv.z;
-            rgbColor.b = o;
-            break;
-        case 2:
-            rgbColor.r = o;
-            rgbColor.g = hsv.z;
-            rgbColor.b = q;
-            break;
-        case 3:
-            rgbColor.r = o;
-            rgbColor.g = p;
-            rgbColor.b = hsv.z;
-            break;
-        case 4:
-            rgbColor.r = q; 
-            rgbColor.g = o; 
-            rgbColor.b = hsv.z;
-            break;
-		case 5:
-            rgbColor.r = hsv.z; 
-            rgbColor.g = o; 
-            rgbColor.b = p;
-            break;
-        }
-	}
-
-	return rgbColor;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> hsvColor(const detail::tvec3<T>& rgbColor)
-{
-    detail::tvec3<T> hsv = rgbColor;
-	float Min   = min(min(rgbColor.r, rgbColor.g), rgbColor.b);
-	float Max   = max(max(rgbColor.r, rgbColor.g), rgbColor.b);
-	float Delta = Max - Min;
-
-	hsv.z = Max;                               
-    	
-	if(Max != T(0))
-	{
-		hsv.y = Delta / hsv.z;    
-		T h = T(0);
-
-		if(rgbColor.r == Max)
-			// between yellow & magenta
-			h = T(0) + T(60) * (rgbColor.g - rgbColor.b) / Delta;
-		else if(rgbColor.g == Max)
-			// between cyan & yellow
-			h = T(120) + T(60) * (rgbColor.b - rgbColor.r) / Delta;
 		else
-			// between magenta & cyan
+		{
-			h = T(240) + T(60) * (rgbColor.r - rgbColor.g) / Delta;
+			T sector = floor(hsv.x / T(60));
+			T frac = (hsv.x / T(60)) - sector;
+			// factorial part of h
+			T o = hsv.z * (T(1) - hsv.y);
+			T p = hsv.z * (T(1) - hsv.y * frac);
+			T q = hsv.z * (T(1) - hsv.y * (T(1) - frac));
 
-		if(h < T(0)) 
+			switch(int(sector))
-            hsv.x = h + T(360);
+			{
-		else
+			default:
-			hsv.x = h;
+			case 0:
+				rgbColor.r = hsv.z;
+				rgbColor.g = q;
+				rgbColor.b = o;
+				break;
+			case 1:
+				rgbColor.r = p;
+				rgbColor.g = hsv.z;
+				rgbColor.b = o;
+				break;
+			case 2:
+				rgbColor.r = o;
+				rgbColor.g = hsv.z;
+				rgbColor.b = q;
+				break;
+			case 3:
+				rgbColor.r = o;
+				rgbColor.g = p;
+				rgbColor.b = hsv.z;
+				break;
+			case 4:
+				rgbColor.r = q; 
+				rgbColor.g = o; 
+				rgbColor.b = hsv.z;
+				break;
+			case 5:
+				rgbColor.r = hsv.z; 
+				rgbColor.g = o; 
+				rgbColor.b = p;
+				break;
+			}
+		}
+
+		return rgbColor;
 	}
-	else
+
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec3<T> hsvColor(const detail::tvec3<T>& rgbColor)
 	{
-		// If r = g = b = 0 then s = 0, h is undefined
+		detail::tvec3<T> hsv = rgbColor;
-		hsv.y = T(0);
+		float Min   = min(min(rgbColor.r, rgbColor.g), rgbColor.b);
-		hsv.x = T(0);
+		float Max   = max(max(rgbColor.r, rgbColor.g), rgbColor.b);
+		float Delta = Max - Min;
+
+		hsv.z = Max;                               
+    	
+		if(Max != T(0))
+		{
+			hsv.y = Delta / hsv.z;    
+			T h = T(0);
+
+			if(rgbColor.r == Max)
+				// between yellow & magenta
+				h = T(0) + T(60) * (rgbColor.g - rgbColor.b) / Delta;
+			else if(rgbColor.g == Max)
+				// between cyan & yellow
+				h = T(120) + T(60) * (rgbColor.b - rgbColor.r) / Delta;
+			else
+				// between magenta & cyan
+				h = T(240) + T(60) * (rgbColor.r - rgbColor.g) / Delta;
+            
+			if(h < T(0)) 
+				hsv.x = h + T(360);
+			else
+				hsv.x = h;
+		}
+		else
+		{
+			// If r = g = b = 0 then s = 0, h is undefined
+			hsv.y = T(0);
+			hsv.x = T(0);
+		}
+
+		return hsv;
 	}
 
-	return hsv;
+	template <typename T> 
-}
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> saturation(const T s)
+	{
+		detail::tvec3<T> rgbw = detail::tvec3<T>(T(0.2126), T(0.7152), T(0.0722));
 
-template <typename T> 
+		T col0 = (T(1) - s) * rgbw.r;
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> saturation(const T s)
+		T col1 = (T(1) - s) * rgbw.g;
-{
+		T col2 = (T(1) - s) * rgbw.b;
-	detail::tvec3<T> rgbw = detail::tvec3<T>(T(0.2126), T(0.7152), T(0.0722));
 
-	T col0 = (T(1) - s) * rgbw.r;
+		detail::tmat4x4<T> result(T(1));
-	T col1 = (T(1) - s) * rgbw.g;
+		result[0][0] = col0 + s;
-	T col2 = (T(1) - s) * rgbw.b;
+		result[0][1] = col0;
+		result[0][2] = col0;
+		result[1][0] = col1;
+		result[1][1] = col1 + s;
+		result[1][2] = col1;
+		result[2][0] = col2;
+		result[2][1] = col2;
+		result[2][2] = col2 + s;
+		return result;
+	}
 
-	detail::tmat4x4<T> result(T(1));
+	template <typename T> 
-	result[0][0] = col0 + s;
+	GLM_FUNC_QUALIFIER detail::tvec3<T> saturation(const T s, const detail::tvec3<T>& color)
-	result[0][1] = col0;
+	{
-	result[0][2] = col0;
+		return detail::tvec3<T>(saturation(s) * detail::tvec4<T>(color, T(0)));
-	result[1][0] = col1;
+	}
-	result[1][1] = col1 + s;
-	result[1][2] = col1;
-	result[2][0] = col2;
-	result[2][1] = col2;
-	result[2][2] = col2 + s;
-	return result;
-}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> saturation(const T s, const detail::tvec3<T>& color)
+	GLM_FUNC_QUALIFIER detail::tvec4<T> saturation(const T s, const detail::tvec4<T>& color)
-{
+	{
-	return detail::tvec3<T>(saturation(s) * detail::tvec4<T>(color, T(0)));
+		return saturation(s) * color;
-}
+	}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> saturation(const T s, const detail::tvec4<T>& color)
-{
-	return saturation(s) * color;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER T luminosity(const detail::tvec3<T>& color)
-{
-	const detail::tvec3<T> tmp = detail::tvec3<T>(0.33, 0.59, 0.11);
-	return dot(color, tmp);
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER T luminosity(const detail::tvec3<T>& color)
+	{
+		const detail::tvec3<T> tmp = detail::tvec3<T>(0.33, 0.59, 0.11);
+		return dot(color, tmp);
+	}
 }//namespace glm

glm/gtx/color_space_YCoCg.inl

@@ -7,59 +7,58 @@
 // File    : glm/gtx/color_space_YCoCg.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> rgb2YCoCg
-(
-	detail::tvec3<valType> const & rgbColor
-)
 {
-	detail::tvec3<valType> result;
+	template <typename valType> 
-	result.x/*Y */ =   rgbColor.r / valType(4) + rgbColor.g / valType(2) + rgbColor.b / valType(4);
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> rgb2YCoCg
-	result.y/*Co*/ =   rgbColor.r / valType(2) + rgbColor.g * valType(0) - rgbColor.b / valType(2);
+	(
-	result.z/*Cg*/ = - rgbColor.r / valType(4) + rgbColor.g / valType(2) - rgbColor.b / valType(4);
+		detail::tvec3<valType> const & rgbColor
-	return result;
+	)
-}
+	{
+		detail::tvec3<valType> result;
+		result.x/*Y */ =   rgbColor.r / valType(4) + rgbColor.g / valType(2) + rgbColor.b / valType(4);
+		result.y/*Co*/ =   rgbColor.r / valType(2) + rgbColor.g * valType(0) - rgbColor.b / valType(2);
+		result.z/*Cg*/ = - rgbColor.r / valType(4) + rgbColor.g / valType(2) - rgbColor.b / valType(4);
+		return result;
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> rgb2YCoCgR
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> rgb2YCoCgR
-(
+	(
-	detail::tvec3<valType> const & rgbColor
+		detail::tvec3<valType> const & rgbColor
-)
+	)
-{
+	{
-	detail::tvec3<valType> result;
+		detail::tvec3<valType> result;
-	result.x/*Y */ = rgbColor.g / valType(2) + (rgbColor.r + rgbColor.b) / valType(4);
+		result.x/*Y */ = rgbColor.g / valType(2) + (rgbColor.r + rgbColor.b) / valType(4);
-	result.y/*Co*/ = rgbColor.r - rgbColor.b;
+		result.y/*Co*/ = rgbColor.r - rgbColor.b;
-	result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) / valType(2);
+		result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) / valType(2);
-	return result;
+		return result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> YCoCg2rgb
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> YCoCg2rgb
-(
+	(
-	detail::tvec3<valType> const & YCoCgColor
+		detail::tvec3<valType> const & YCoCgColor
-)
+	)
-{
+	{
-	detail::tvec3<valType> result;
+		detail::tvec3<valType> result;
-	result.r = YCoCgColor.x + YCoCgColor.y - YCoCgColor.z;
+		result.r = YCoCgColor.x + YCoCgColor.y - YCoCgColor.z;
-	result.g = YCoCgColor.x                + YCoCgColor.z;
+		result.g = YCoCgColor.x                + YCoCgColor.z;
-	result.b = YCoCgColor.x - YCoCgColor.y - YCoCgColor.z;
+		result.b = YCoCgColor.x - YCoCgColor.y - YCoCgColor.z;
-	return result;
+		return result;
-}
+	}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> YCoCgR2rgb
-(
-	detail::tvec3<valType> const & YCoCgRColor
-)
-{
-	detail::tvec3<valType> result;
-	valType tmp = YCoCgRColor.x - (YCoCgRColor.z / valType(2));
-	result.g = YCoCgRColor.z + tmp;
-	result.b = tmp - (YCoCgRColor.y / valType(2));
-	result.r = result.b + YCoCgRColor.y;
-	return result;
-}
 
+	template <typename valType> 
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> YCoCgR2rgb
+	(
+		detail::tvec3<valType> const & YCoCgRColor
+	)
+	{
+		detail::tvec3<valType> result;
+		valType tmp = YCoCgRColor.x - (YCoCgRColor.z / valType(2));
+		result.g = YCoCgRColor.z + tmp;
+		result.b = tmp - (YCoCgRColor.y / valType(2));
+		result.r = result.b + YCoCgRColor.y;
+		return result;
+	}
 }//namespace glm

glm/gtx/compatibility.inl

@@ -7,131 +7,130 @@
 // File    : glm/gtx/compatibility.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-// isfinite
-template <typename genType> 
-GLM_FUNC_QUALIFIER bool isfinite(
-	genType const & x)
 {
-#if(GLM_COMPILER & GLM_COMPILER_VC)
+	// isfinite
-	return _finite(x);
+	template <typename genType> 
-#else//(GLM_COMPILER & GLM_COMPILER_GCC)
+	GLM_FUNC_QUALIFIER bool isfinite(
-	return std::isfinite(x) != 0;
+		genType const & x)
-#endif
+	{
-}
+	#if(GLM_COMPILER & GLM_COMPILER_VC)
+		return _finite(x);
+	#else//(GLM_COMPILER & GLM_COMPILER_GCC)
+		return std::isfinite(x) != 0;
+	#endif
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec2<bool> isfinite(
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> isfinite(
-	detail::tvec2<valType> const & x)
+		detail::tvec2<valType> const & x)
-{
+	{
-	return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-		isfinite(x.x),
+			isfinite(x.x),
-		isfinite(x.y));
+			isfinite(x.y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<bool> isfinite(
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> isfinite(
-	detail::tvec3<valType> const & x)
+		detail::tvec3<valType> const & x)
-{
+	{
-	return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-		isfinite(x.x),
+			isfinite(x.x),
-		isfinite(x.y),
+			isfinite(x.y),
-		isfinite(x.z));
+			isfinite(x.z));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec4<bool> isfinite(
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> isfinite(
-	detail::tvec4<valType> const & x)
+		detail::tvec4<valType> const & x)
-{
+	{
-	return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-		isfinite(x.x),
+			isfinite(x.x),
-		isfinite(x.y),
+			isfinite(x.y),
-		isfinite(x.z),
+			isfinite(x.z),
-		isfinite(x.w));
+			isfinite(x.w));
-}
+	}
 
-// isinf
+	// isinf
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER bool isinf(
+	GLM_FUNC_QUALIFIER bool isinf(
-	genType const & x)
+		genType const & x)
-{
+	{
-#if(GLM_COMPILER & GLM_COMPILER_VC)
+	#if(GLM_COMPILER & GLM_COMPILER_VC)
-	return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
+		return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
-#else
+	#else
-	return std::isinf(x) != 0;
+		return std::isinf(x) != 0;
-#endif
+	#endif
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec2<bool> isinf(
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> isinf(
-	detail::tvec2<valType> const & x)
+		detail::tvec2<valType> const & x)
-{
+	{
-	return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-		isinf(x.x),
+			isinf(x.x),
-		isinf(x.y));
+			isinf(x.y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<bool> isinf(
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> isinf(
-	detail::tvec3<valType> const & x)
+		detail::tvec3<valType> const & x)
-{
+	{
-	return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-		isinf(x.x),
+			isinf(x.x),
-		isinf(x.y),
+			isinf(x.y),
-		isinf(x.z));
+			isinf(x.z));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec4<bool> isinf(
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> isinf(
-	detail::tvec4<valType> const & x)
+		detail::tvec4<valType> const & x)
-{
+	{
-	return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-		isinf(x.x),
+			isinf(x.x),
-		isinf(x.y),
+			isinf(x.y),
-		isinf(x.z),
+			isinf(x.z),
-		isinf(x.w));
+			isinf(x.w));
-}
+	}
 
-// isnan
+	// isnan
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER bool isnan(genType const & x)
+	GLM_FUNC_QUALIFIER bool isnan(genType const & x)
-{
+	{
-#if(GLM_COMPILER & GLM_COMPILER_VC)
+	#if(GLM_COMPILER & GLM_COMPILER_VC)
-	return _isnan(x);
+		return _isnan(x);
-#else
+	#else
-	return std::isnan(x) != 0;
+		return std::isnan(x) != 0;
-#endif
+	#endif
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec2<bool> isnan(
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> isnan(
-	detail::tvec2<valType> const & x)
+		detail::tvec2<valType> const & x)
-{
+	{
-	return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-		isnan(x.x),
+			isnan(x.x),
-		isnan(x.y));
+			isnan(x.y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<bool> isnan(
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> isnan(
-	detail::tvec3<valType> const & x)
+		detail::tvec3<valType> const & x)
-{
+	{
-	return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-		isnan(x.x),
+			isnan(x.x),
-		isnan(x.y),
+			isnan(x.y),
-		isnan(x.z));
+			isnan(x.z));
-}
+	}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec4<bool> isnan(
-	detail::tvec4<valType> const & x)
-{
-	return detail::tvec4<bool>(
-		isnan(x.x),
-		isnan(x.y),
-		isnan(x.z),
-		isnan(x.w));
-}
 
+	template <typename valType> 
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> isnan(
+		detail::tvec4<valType> const & x)
+	{
+		return detail::tvec4<bool>(
+			isnan(x.x),
+			isnan(x.y),
+			isnan(x.z),
+			isnan(x.w));
+	}
 }//namespace glm

glm/gtx/component_wise.inl

@@ -7,42 +7,41 @@
 // File    : gtx_component_wise.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-GLM_FUNC_QUALIFIER typename genType::value_type compAdd(genType const & v)
 {
-    typename genType::size_type result = typename genType::value_type(0);
+	template <typename genType>
-	for(typename genType::size_type i = 0; i < genType::value_size(); ++i)
+	GLM_FUNC_QUALIFIER typename genType::value_type compAdd(genType const & v)
-		result += v[i];
+	{
-	return result;
+		typename genType::size_type result = typename genType::value_type(0);
-}
+		for(typename genType::size_type i = 0; i < genType::value_size(); ++i)
+			result += v[i];
+		return result;
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER typename genType::value_type compMul(genType const & v)
+	GLM_FUNC_QUALIFIER typename genType::value_type compMul(genType const & v)
-{
+	{
-    typename genType::value_type result = typename genType::value_type(1);
+		typename genType::value_type result = typename genType::value_type(1);
-	for(typename genType::size_type i = 0; i < genType::value_size(); ++i)
+		for(typename genType::size_type i = 0; i < genType::value_size(); ++i)
-		result *= v[i];
+			result *= v[i];
-	return result;
+		return result;
-}
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER typename genType::value_type compMin(genType const & v)
+	GLM_FUNC_QUALIFIER typename genType::value_type compMin(genType const & v)
-{
+	{
-    typename genType::value_type result = typename genType::value_type(v[0]);
+		typename genType::value_type result = typename genType::value_type(v[0]);
-	for(typename genType::size_type i = 1; i < genType::value_size(); ++i)
+		for(typename genType::size_type i = 1; i < genType::value_size(); ++i)
-		result = min(result, v[i]);
+			result = min(result, v[i]);
-	return result;
+		return result;
-}
+	}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER typename genType::value_type compMax(genType const & v)
-{
-    typename genType::value_type result = typename genType::value_type(v[0]);
-	for(typename genType::size_type i = 1; i < genType::value_size(); ++i)
-		result = max(result, v[i]);
-	return result;
-}
 
+	template <typename genType>
+	GLM_FUNC_QUALIFIER typename genType::value_type compMax(genType const & v)
+	{
+		typename genType::value_type result = typename genType::value_type(v[0]);
+		for(typename genType::size_type i = 1; i < genType::value_size(); ++i)
+			result = max(result, v[i]);
+		return result;
+	}
 }//namespace glm

glm/gtx/constants.inl

@@ -20,773 +20,8 @@
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// THE SOFTWARE.
 ///
-/// @ref gtc_half_float
+/// @ref gtx_constants
-/// @file glm/gtc/half_float.inl
+/// @file glm/gtx/constants.inl
-/// @date 2009-04-29 / 2011-06-05
+/// @date 2011-10-14 / 2011-10-14
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
-
-#include "../core/_detail.hpp"
-
-namespace glm{
-
-template <typename genIType>
-GLM_FUNC_QUALIFIER genIType mask
-(
-	genIType const & count
-)
-{
-	return ((genIType(1) << (count)) - genIType(1));
-}
-
-template <typename valIType>
-GLM_FUNC_QUALIFIER detail::tvec2<valIType> mask
-(
-	detail::tvec2<valIType> const & count
-)
-{
-	return detail::tvec2<valIType>(
-		mask(count[0]),
-		mask(count[1]));
-}
-
-template <typename valIType>
-GLM_FUNC_QUALIFIER detail::tvec3<valIType> mask
-(
-	detail::tvec3<valIType> const & count
-)
-{
-	return detail::tvec3<valIType>(
-		mask(count[0]),
-		mask(count[1]),
-		mask(count[2]));
-}
-
-template <typename valIType>
-GLM_FUNC_QUALIFIER detail::tvec4<valIType> mask
-(
-	detail::tvec4<valIType> const & count
-)
-{
-	return detail::tvec4<valIType>(
-		mask(count[0]),
-		mask(count[1]),
-		mask(count[2]),
-		mask(count[3]));
-}
-
-// extractField
-template <typename genIType>
-GLM_FUNC_QUALIFIER genIType extractField
-(
-	half const & value, 
-	genIType const & first, 
-	genIType const & count
-)
-{
-	assert(first + count < sizeof(half));
-	return (value._data() << first) >> ((sizeof(half) << 3) - count);
-}
-
-template <typename genIType>
-GLM_FUNC_QUALIFIER genIType extractField
-(
-	float const & value, 
-	genIType const & first, 
-	genIType const & count
-)
-{
-	assert(first + count < sizeof(float));
-	return (detail::uif32(value).i << first) >> ((sizeof(float) << 3) - count);
-}
-
-template <typename genIType>
-GLM_FUNC_QUALIFIER genIType extractField
-(
-	double const & value, 
-	genIType const & first, 
-	genIType const & count
-)
-{
-	assert(first + count < sizeof(double));
-	return (detail::uif64(value).i << first) >> ((sizeof(double) << genIType(3)) - count);
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER genIUType extractField
-(
-	genIUType const & Value, 
-	sizeType const & First, 
-	sizeType const & Count
-)
-{
-	sizeType GenSize = sizeof(genIUType) << 3;
-
-	assert(First + Count <= GenSize);
-
-	genIUType ShiftLeft = Count ? Value << (GenSize - (Count + First)) : 0;
-	genIUType ShiftBack = ShiftLeft >> genIUType(GenSize - Count);
-
-	return ShiftBack;
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec2<genIUType> extractField
-(
-	detail::tvec2<genIUType> const & value, 
-	sizeType const & first, 
-	sizeType const & count
-)
-{
-	return detail::tvec2<genIUType>(
-		extractField(value[0], first, count),
-		extractField(value[1], first, count));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec3<genIUType> extractField
-(
-	detail::tvec3<genIUType> const & value, 
-	sizeType const & first, 
-	sizeType const & count
-)
-{
-	return detail::tvec3<genIUType>(
-		extractField(value[0], first, count),
-		extractField(value[1], first, count),
-		extractField(value[2], first, count));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec4<genIUType> extractField
-(
-	detail::tvec4<genIUType> const & value, 
-	sizeType const & first, 
-	sizeType const & count
-)
-{
-	return detail::tvec4<genIUType>(
-		extractField(value[0], first, count),
-		extractField(value[1], first, count),
-		extractField(value[2], first, count),
-		extractField(value[3], first, count));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec2<genIUType> extractField
-(
-	detail::tvec2<genIUType> const & value, 
-	detail::tvec2<sizeType> const & first, 
-	detail::tvec2<sizeType> const & count
-)
-{
-	return detail::tvec2<genIUType>(
-		extractField(value[0], first[0], count[0]),
-		extractField(value[1], first[1], count[1]));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec3<genIUType> extractField
-(
-	detail::tvec3<genIUType> const & value, 
-	detail::tvec3<sizeType> const & first, 
-	detail::tvec3<sizeType> const & count
-)
-{
-	return detail::tvec3<genIUType>(
-		extractField(value[0], first[0], count[0]),
-		extractField(value[1], first[1], count[1]),
-		extractField(value[2], first[2], count[2]));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec4<genIUType> extractField
-(
-	detail::tvec4<genIUType> const & value, 
-	detail::tvec4<sizeType> const & first, 
-	detail::tvec4<sizeType> const & count
-)
-{
-	return detail::tvec4<genIUType>(
-		extractField(value[0], first[0], count[0]),
-		extractField(value[1], first[1], count[1]),
-		extractField(value[2], first[2], count[2]),
-		extractField(value[3], first[3], count[3]));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec2<genIUType> extractField
-(
-	genIUType const & value, 
-	detail::tvec2<sizeType> const & first, 
-	detail::tvec2<sizeType> const & count
-)
-{
-	return detail::tvec2<genIUType>(
-		extractField(value, first[0], count[0]),
-		extractField(value, first[1], count[1]));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec3<genIUType> extractField
-(
-	genIUType const & value, 
-	detail::tvec3<sizeType> const & first, 
-	detail::tvec3<sizeType> const & count
-)
-{
-	return detail::tvec3<genIUType>(
-		extractField(value, first[0], count[0]),
-		extractField(value, first[1], count[1]),
-		extractField(value, first[2], count[2]));
-}
-
-template <typename genIUType, typename sizeType>
-GLM_FUNC_QUALIFIER detail::tvec4<genIUType> extractField
-(
-	genIUType const & value, 
-	detail::tvec4<sizeType> const & first, 
-	detail::tvec4<sizeType> const & count
-)
-{
-	return detail::tvec4<genIUType>(
-		extractField(value, first[0], count[0]),
-		extractField(value, first[1], count[1]),
-		extractField(value, first[2], count[2]),
-		extractField(value, first[3], count[3]));
-}
-
-// lowestBit
-template <typename genType>
-GLM_FUNC_QUALIFIER int lowestBit
-(
-	genType const & Value
-)
-{
-	assert(Value != genType(0)); // not valid call
-
-	genType Bit;
-	for(Bit = genType(0); !(Value & (1 << Bit)); ++Bit){}
-	return Bit;
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<int> lowestBit
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<int>(
-		lowestBit(value[0]),
-		lowestBit(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<int> lowestBit
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<int>(
-		lowestBit(value[0]),
-		lowestBit(value[1]),
-		lowestBit(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<int> lowestBit
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<int>(
-		lowestBit(value[0]),
-		lowestBit(value[1]),
-		lowestBit(value[2]),
-		lowestBit(value[3]));
-}
-
-// highestBit
-template <typename genType>
-GLM_FUNC_QUALIFIER int highestBit
-(
-	genType const & value
-)
-{
-	assert(value != genType(0)); // not valid call
-
-	genType bit = genType(-1);
-	for(genType tmp = value; tmp; tmp >>= 1, ++bit){}
-	return bit;
-}
-
-//template <>
-//GLM_FUNC_QUALIFIER int highestBit<int>
-//(
-//	int value
-//)
-//{
-//	int bit = -1;
-//	for(int tmp = value; tmp; tmp >>= 1, ++bit);
-//	return bit;
-//}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<int> highestBit
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<int>(
-		highestBit(value[0]),
-		highestBit(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<int> highestBit
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<int>(
-		highestBit(value[0]),
-		highestBit(value[1]),
-		highestBit(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<int> highestBit
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<int>(
-		highestBit(value[0]),
-		highestBit(value[1]),
-		highestBit(value[2]),
-		highestBit(value[3]));
-}
-
-// highestBitValue
-template <typename genType>
-GLM_FUNC_QUALIFIER genType highestBitValue
-(
-	genType const & value
-)
-{
-	genType tmp = value;
-	genType result = genType(0);
-	while(tmp)
-	{
-		result = (tmp & (~tmp + 1)); // grab lowest bit
-		tmp &= ~result; // clear lowest bit
-	}
-	return result;
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<int> highestBitValue
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<int>(
-		highestBitValue(value[0]),
-		highestBitValue(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<int> highestBitValue
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<int>(
-		highestBitValue(value[0]),
-		highestBitValue(value[1]),
-		highestBitValue(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<int> highestBitValue
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<int>(
-		highestBitValue(value[0]),
-		highestBitValue(value[1]),
-		highestBitValue(value[2]),
-		highestBitValue(value[3]));
-}
-
-// isPowerOfTwo
-template <typename genType>
-GLM_FUNC_QUALIFIER bool isPowerOfTwo(genType const & Value)
-{
-	//detail::If<std::numeric_limits<genType>::is_signed>::apply(abs, Value);
-	//return !(Value & (Value - 1));
-
-    // For old complier?
-	genType Result = Value;
-	if(std::numeric_limits<genType>::is_signed)
-		Result = abs(Result);
-	return !(Result & (Result - 1));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<bool> isPowerOfTwo
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<bool>(
-		isPowerOfTwo(value[0]),
-		isPowerOfTwo(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<bool> isPowerOfTwo
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<bool>(
-		isPowerOfTwo(value[0]),
-		isPowerOfTwo(value[1]),
-		isPowerOfTwo(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> isPowerOfTwo
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<bool>(
-		isPowerOfTwo(value[0]),
-		isPowerOfTwo(value[1]),
-		isPowerOfTwo(value[2]),
-		isPowerOfTwo(value[3]));
-}
-
-// powerOfTwoAbove
-template <typename genType>
-GLM_FUNC_QUALIFIER genType powerOfTwoAbove(genType const & value)
-{
-	return isPowerOfTwo(value) ? value : highestBitValue(value) << 1;
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> powerOfTwoAbove
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<valType>(
-		powerOfTwoAbove(value[0]),
-		powerOfTwoAbove(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> powerOfTwoAbove
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<valType>(
-		powerOfTwoAbove(value[0]),
-		powerOfTwoAbove(value[1]),
-		powerOfTwoAbove(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> powerOfTwoAbove
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<valType>(
-		powerOfTwoAbove(value[0]),
-		powerOfTwoAbove(value[1]),
-		powerOfTwoAbove(value[2]),
-		powerOfTwoAbove(value[3]));
-}
-
-// powerOfTwoBelow
-template <typename genType>
-GLM_FUNC_QUALIFIER genType powerOfTwoBelow
-(
-	genType const & value
-)
-{
-	return isPowerOfTwo(value) ? value : highestBitValue(value);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> powerOfTwoBelow
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<valType>(
-		powerOfTwoBelow(value[0]),
-		powerOfTwoBelow(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> powerOfTwoBelow
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<valType>(
-		powerOfTwoBelow(value[0]),
-		powerOfTwoBelow(value[1]),
-		powerOfTwoBelow(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> powerOfTwoBelow
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<valType>(
-		powerOfTwoBelow(value[0]),
-		powerOfTwoBelow(value[1]),
-		powerOfTwoBelow(value[2]),
-		powerOfTwoBelow(value[3]));
-}
-
-// powerOfTwoNearest
-template <typename genType>
-GLM_FUNC_QUALIFIER genType powerOfTwoNearest
-(
-	genType const & value
-)
-{
-	if(isPowerOfTwo(value))
-		return value;
-
-	genType prev = highestBitValue(value);
-	genType next = prev << 1;
-	return (next - value) < (value - prev) ? next : prev;
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> powerOfTwoNearest
-(
-	detail::tvec2<valType> const & value
-)
-{
-	return detail::tvec2<valType>(
-		powerOfTwoNearest(value[0]),
-		powerOfTwoNearest(value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> powerOfTwoNearest
-(
-	detail::tvec3<valType> const & value
-)
-{
-	return detail::tvec3<valType>(
-		powerOfTwoNearest(value[0]),
-		powerOfTwoNearest(value[1]),
-		powerOfTwoNearest(value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> powerOfTwoNearest
-(
-	detail::tvec4<valType> const & value
-)
-{
-	return detail::tvec4<valType>(
-		powerOfTwoNearest(value[0]),
-		powerOfTwoNearest(value[1]),
-		powerOfTwoNearest(value[2]),
-		powerOfTwoNearest(value[3]));
-}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType bitRevert(genType const & In)
-{
-	GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRevert' only accept integer values");
-
-	genType Out = 0;
-	std::size_t BitSize = sizeof(genType) * 8;
-	for(std::size_t i = 0; i < BitSize; ++i)
-		if(In & (genType(1) << i))
-			Out |= genType(1) << (BitSize - 1 - i);
-	return Out;
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> bitRevert
-(
-	detail::tvec2<valType> const & Value
-)
-{
-	return detail::tvec2<valType>(
-		bitRevert(Value[0]),
-		bitRevert(Value[1]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> bitRevert
-(
-	detail::tvec3<valType> const & Value
-)
-{
-	return detail::tvec3<valType>(
-		bitRevert(Value[0]),
-		bitRevert(Value[1]),
-		bitRevert(Value[2]));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> bitRevert
-(
-	detail::tvec4<valType> const & Value
-)
-{
-	return detail::tvec4<valType>(
-		bitRevert(Value[0]),
-		bitRevert(Value[1]),
-		bitRevert(Value[2]),
-		bitRevert(Value[3]));
-}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType bitRotateRight(genType const & In, std::size_t Shift)
-{
-	GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateRight' only accept integer values");
-
-	std::size_t BitSize = sizeof(genType) * 8;
-	return (In << Shift) | (In >> (BitSize - Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> bitRotateRight
-(
-	detail::tvec2<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec2<valType>(
-		bitRotateRight(Value[0], Shift),
-		bitRotateRight(Value[1], Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> bitRotateRight
-(
-	detail::tvec3<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec3<valType>(
-		bitRotateRight(Value[0], Shift),
-		bitRotateRight(Value[1], Shift),
-		bitRotateRight(Value[2], Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> bitRotateRight
-(
-	detail::tvec4<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec4<valType>(
-		bitRotateRight(Value[0], Shift),
-		bitRotateRight(Value[1], Shift),
-		bitRotateRight(Value[2], Shift),
-		bitRotateRight(Value[3], Shift));
-}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType bitRotateLeft(genType const & In, std::size_t Shift)
-{
-	GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateLeft' only accept integer values");
-
-	std::size_t BitSize = sizeof(genType) * 8;
-	return (In >> Shift) | (In << (BitSize - Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> bitRotateLeft
-(
-	detail::tvec2<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec2<valType>(
-		bitRotateLeft(Value[0], Shift),
-		bitRotateLeft(Value[1], Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> bitRotateLeft
-(
-	detail::tvec3<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec3<valType>(
-		bitRotateLeft(Value[0], Shift),
-		bitRotateLeft(Value[1], Shift),
-		bitRotateLeft(Value[2], Shift));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> bitRotateLeft
-(
-	detail::tvec4<valType> const & Value, 
-	std::size_t Shift
-)
-{
-	return detail::tvec4<valType>(
-		bitRotateLeft(Value[0], Shift),
-		bitRotateLeft(Value[1], Shift),
-		bitRotateLeft(Value[2], Shift),
-		bitRotateLeft(Value[3], Shift));
-}
-
-template <typename genIUType>
-GLM_FUNC_QUALIFIER genIUType fillBitfieldWithOne
-(
-	genIUType const & Value,
-	int const & FromBit, 
-	int const & ToBit
-)
-{
-	assert(FromBit <= ToBit);
-	assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
-	genIUType Result = Value;
-	for(std::size_t i = 0; i <= ToBit; ++i)
-		Result |= (1 << i);
-	return Result;
-}
-
-template <typename genIUType>
-GLM_FUNC_QUALIFIER genIUType fillBitfieldWithZero
-(
-	genIUType const & Value,
-	int const & FromBit, 
-	int const & ToBit
-)
-{
-	assert(FromBit <= ToBit);
-	assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
-	genIUType Result = Value;
-	for(std::size_t i = 0; i <= ToBit; ++i)
-		Result &= ~(1 << i);
-	return Result;
-}
-
-}//namespace glm

glm/gtx/epsilon.inl

@@ -7,224 +7,223 @@
 // File    : glm/gtx/epsilon.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-GLM_FUNC_QUALIFIER bool equalEpsilon
-(
-	genType const & x, 
-	genType const & y, 
-	genType const & epsilon
-)
 {
-    return abs(x - y) < epsilon;
+	template <typename genType>
-}
+	GLM_FUNC_QUALIFIER bool equalEpsilon
+	(
+		genType const & x, 
+		genType const & y, 
+		genType const & epsilon
+	)
+	{
+		return abs(x - y) < epsilon;
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER bool notEqualEpsilon
+	GLM_FUNC_QUALIFIER bool notEqualEpsilon
-(
+	(
-	genType const & x, 
+		genType const & x, 
-	genType const & y, 
+		genType const & y, 
-	genType const & epsilon
+		genType const & epsilon
-)
+	)
-{
+	{
-    return abs(x - y) >= epsilon;
+		return abs(x - y) >= epsilon;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> equalEpsilon
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y, 
+		detail::tvec2<valType> const & y, 
-	valType const & epsilon)
+		valType const & epsilon)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        abs(x.x - y.x) < epsilon,
+			abs(x.x - y.x) < epsilon,
-        abs(x.y - y.y) < epsilon);
+			abs(x.y - y.y) < epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> equalEpsilon
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y, 
+		detail::tvec3<valType> const & y, 
-	valType const & epsilon)
+		valType const & epsilon)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        abs(x.x - y.x) < epsilon,
+			abs(x.x - y.x) < epsilon,
-        abs(x.y - y.y) < epsilon,
+			abs(x.y - y.y) < epsilon,
-        abs(x.z - y.z) < epsilon);
+			abs(x.z - y.z) < epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
-(
+	(
-	detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y, 
+		detail::tvec4<valType> const & y, 
-	valType const & epsilon
+		valType const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(x.x - y.x) < epsilon,
+			abs(x.x - y.x) < epsilon,
-        abs(x.y - y.y) < epsilon,
+			abs(x.y - y.y) < epsilon,
-        abs(x.z - y.z) < epsilon,
+			abs(x.z - y.z) < epsilon,
-        abs(x.w - y.w) < epsilon);
+			abs(x.w - y.w) < epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> notEqualEpsilon
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y, 
+		detail::tvec2<valType> const & y, 
-	valType const & epsilon
+		valType const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        abs(x.x - y.x) >= epsilon,
+			abs(x.x - y.x) >= epsilon,
-        abs(x.y - y.y) >= epsilon);
+			abs(x.y - y.y) >= epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> notEqualEpsilon
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y, 
+		detail::tvec3<valType> const & y, 
-	valType const & epsilon
+		valType const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        abs(x.x - y.x) >= epsilon,
+			abs(x.x - y.x) >= epsilon,
-        abs(x.y - y.y) >= epsilon,
+			abs(x.y - y.y) >= epsilon,
-        abs(x.z - y.z) >= epsilon);
+			abs(x.z - y.z) >= epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
-(
+	(
-	detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y, 
+		detail::tvec4<valType> const & y, 
-	valType const & epsilon
+		valType const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(x.x - y.x) >= epsilon,
+			abs(x.x - y.x) >= epsilon,
-        abs(x.y - y.y) >= epsilon,
+			abs(x.y - y.y) >= epsilon,
-        abs(x.z - y.z) >= epsilon,
+			abs(x.z - y.z) >= epsilon,
-        abs(x.w - y.w) >= epsilon);
+			abs(x.w - y.w) >= epsilon);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> equalEpsilon
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y, 
+		detail::tvec2<valType> const & y, 
-	detail::tvec2<valType> const & epsilon
+		detail::tvec2<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        abs(x.x - y.x) < epsilon.x,
+			abs(x.x - y.x) < epsilon.x,
-        abs(x.y - y.y) < epsilon.y);
+			abs(x.y - y.y) < epsilon.y);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> equalEpsilon
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y, 
+		detail::tvec3<valType> const & y, 
-	detail::tvec3<valType> const & epsilon
+		detail::tvec3<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        abs(x.x - y.x) < epsilon.x,
+			abs(x.x - y.x) < epsilon.x,
-        abs(x.y - y.y) < epsilon.y,
+			abs(x.y - y.y) < epsilon.y,
-        abs(x.z - y.z) < epsilon.z);
+			abs(x.z - y.z) < epsilon.z);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
-(
+	(
-	detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y, 
+		detail::tvec4<valType> const & y, 
-	detail::tvec4<valType> const & epsilon
+		detail::tvec4<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(x.x - y.x) < epsilon.x,
+			abs(x.x - y.x) < epsilon.x,
-        abs(x.y - y.y) < epsilon.y,
+			abs(x.y - y.y) < epsilon.y,
-        abs(x.z - y.z) < epsilon.z,
+			abs(x.z - y.z) < epsilon.z,
-        abs(x.w - y.w) < epsilon.w);
+			abs(x.w - y.w) < epsilon.w);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> equalEpsilon
-(
+	(
-	detail::tquat<valType> const & x, 
+		detail::tquat<valType> const & x, 
-	detail::tquat<valType> const & y, 
+		detail::tquat<valType> const & y, 
-	detail::tquat<valType> const & epsilon
+		detail::tquat<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(x.x - y.x) < epsilon.x,
+			abs(x.x - y.x) < epsilon.x,
-        abs(x.y - y.y) < epsilon.y,
+			abs(x.y - y.y) < epsilon.y,
-        abs(x.z - y.z) < epsilon.z,
+			abs(x.z - y.z) < epsilon.z,
-        abs(x.w - y.w) < epsilon.w);
+			abs(x.w - y.w) < epsilon.w);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> notEqualEpsilon
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y, 
+		detail::tvec2<valType> const & y, 
-	detail::tvec2<valType> const & epsilon
+		detail::tvec2<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        abs(x.x - y.x) >= epsilon.x,
+			abs(x.x - y.x) >= epsilon.x,
-        abs(x.y - y.y) >= epsilon.y);
+			abs(x.y - y.y) >= epsilon.y);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> notEqualEpsilon
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y, 
+		detail::tvec3<valType> const & y, 
-	detail::tvec3<valType> const & epsilon
+		detail::tvec3<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        abs(x.x - y.x) >= epsilon.x,
+			abs(x.x - y.x) >= epsilon.x,
-        abs(x.y - y.y) >= epsilon.y,
+			abs(x.y - y.y) >= epsilon.y,
-        abs(x.z - y.z) >= epsilon.z);
+			abs(x.z - y.z) >= epsilon.z);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
-(
+	(
-	detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y, 
+		detail::tvec4<valType> const & y, 
-	detail::tvec4<valType> const & epsilon
+		detail::tvec4<valType> const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(x.x - y.x) >= epsilon.x,
+			abs(x.x - y.x) >= epsilon.x,
-        abs(x.y - y.y) >= epsilon.y,
+			abs(x.y - y.y) >= epsilon.y,
-        abs(x.z - y.z) >= epsilon.z,
+			abs(x.z - y.z) >= epsilon.z,
-        abs(x.w - y.w) >= epsilon.w);
+			abs(x.w - y.w) >= epsilon.w);
-}
+	}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
-(
-	detail::tquat<valType> const & x, 
-	detail::tquat<valType> const & y, 
-	detail::tquat<valType> const & epsilon
-)
-{
-    return detail::tvec4<bool>(
-        abs(x.x - y.x) >= epsilon.x,
-        abs(x.y - y.y) >= epsilon.y,
-        abs(x.z - y.z) >= epsilon.z,
-        abs(x.w - y.w) >= epsilon.w);
-}
 
+	template <typename valType>
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> notEqualEpsilon
+	(
+		detail::tquat<valType> const & x, 
+		detail::tquat<valType> const & y, 
+		detail::tquat<valType> const & epsilon
+	)
+	{
+		return detail::tvec4<bool>(
+			abs(x.x - y.x) >= epsilon.x,
+			abs(x.y - y.y) >= epsilon.y,
+			abs(x.z - y.z) >= epsilon.z,
+			abs(x.w - y.w) >= epsilon.w);
+	}
 }//namespace glm

glm/gtx/euler_angles.inl

@@ -7,239 +7,238 @@
 // File    : glm/gtx/euler_angles.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleX
-(
-	valType const & angleX
-)
 {
-	valType cosX = glm::cos(angleX);
+	template <typename valType> 
-	valType sinX = glm::sin(angleX);
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleX
+	(
+		valType const & angleX
+	)
+	{
+		valType cosX = glm::cos(angleX);
+		valType sinX = glm::sin(angleX);
 	
-	return detail::tmat4x4<valType>(
+		return detail::tmat4x4<valType>(
-		valType(1), valType(0), valType(0), valType(0),
+			valType(1), valType(0), valType(0), valType(0),
-		valType(0), cosX,		sinX,		valType(0),
+			valType(0), cosX,		sinX,		valType(0),
-		valType(0),-sinX,		cosX,		valType(0),
+			valType(0),-sinX,		cosX,		valType(0),
-		valType(0), valType(0), valType(0), valType(1));
+			valType(0), valType(0), valType(0), valType(1));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleY
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleY
-(
+	(
-	valType const & angleY
+		valType const & angleY
-)
+	)
-{
+	{
-	valType cosY = glm::cos(angleY);
+		valType cosY = glm::cos(angleY);
-	valType sinY = glm::sin(angleY);
+		valType sinY = glm::sin(angleY);
 
-	return detail::tmat4x4<valType>(
+		return detail::tmat4x4<valType>(
-		cosY,		valType(0),	sinY,		valType(0),
+			cosY,		valType(0),	sinY,		valType(0),
-		valType(0),	valType(1),	valType(0), 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));
+			valType(0),	valType(0),	valType(0), valType(1));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleZ
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleZ
-(
+	(
-	valType const & angleZ
+		valType const & angleZ
-)
+	)
-{
+	{
-	valType cosZ = glm::cos(angleZ); 
+		valType cosZ = glm::cos(angleZ); 
-	valType sinZ = glm::sin(angleZ);
+		valType sinZ = glm::sin(angleZ);
 
-	return detail::tmat4x4<valType>(
+		return detail::tmat4x4<valType>(
-		cosZ,		sinZ,		valType(0), valType(0),
+			cosZ,		sinZ,		valType(0), valType(0),
-		-sinZ,		cosZ,		valType(0), valType(0),
+			-sinZ,		cosZ,		valType(0), valType(0),
-		valType(0),	valType(0),	valType(1), valType(0),
+			valType(0),	valType(0),	valType(1), valType(0),
-		valType(0),	valType(0),	valType(0), valType(1));
+			valType(0),	valType(0),	valType(0), valType(1));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleXY
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleXY
-(
+	(
-	valType const & angleX, 
+		valType const & angleX, 
-	valType const & angleY
+		valType const & angleY
-)
+	)
-{
+	{
-	valType cosX = glm::cos(angleX);
+		valType cosX = glm::cos(angleX);
-	valType sinX = glm::sin(angleX);
+		valType sinX = glm::sin(angleX);
-	valType cosY = glm::cos(angleY);
+		valType cosY = glm::cos(angleY);
-	valType sinY = glm::sin(angleY);
+		valType sinY = glm::sin(angleY);
 
-	return detail::tmat4x4<valType>(
+		return detail::tmat4x4<valType>(
-		cosY,		-sinX * sinY,	cosX * sinY,	valType(0),
+			cosY,		-sinX * sinY,	cosX * sinY,	valType(0),
-		valType(0), cosX,			sinX,			valType(0),
+			valType(0), cosX,			sinX,			valType(0),
-		-sinY ,		-sinX * cosY,	cosX * cosY,	valType(0),
+			-sinY ,		-sinX * cosY,	cosX * cosY,	valType(0),
-		valType(0), valType(0),     valType(0),		valType(1));
+			valType(0), valType(0),     valType(0),		valType(1));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleYX
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleYX
-(
+	(
-	valType const & angleY, 
+		valType const & angleY, 
-	valType const & angleX
+		valType const & angleX
-)
+	)
-{
+	{
-	valType cosX = glm::cos(angleX); 
+		valType cosX = glm::cos(angleX); 
-	valType sinX = glm::sin(angleX); 
+		valType sinX = glm::sin(angleX); 
-	valType cosY = glm::cos(angleY); 
+		valType cosY = glm::cos(angleY); 
-	valType sinY = glm::sin(angleY);
+		valType sinY = glm::sin(angleY);
 
-	return detail::tmat4x4<valType>(
+		return detail::tmat4x4<valType>(
-		cosY,			valType(0),		sinY,			valType(0),
+			cosY,			valType(0),		sinY,			valType(0),
-		-sinX * sinY,	cosX,			sinX * cosY,	valType(0),
+			-sinX * sinY,	cosX,			sinX * cosY,	valType(0),
-		-cosX * sinY,	-sinX,			cosX * cosY,	valType(0),
+			-cosX * sinY,	-sinX,			cosX * cosY,	valType(0),
-		valType(0),		valType(0),		valType(0),		valType(1));
+			valType(0),		valType(0),		valType(0),		valType(1));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleXZ
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleXZ
-(
+	(
-	valType const & angleX, 
+		valType const & angleX, 
-	valType const & angleZ
+		valType const & angleZ
-)
+	)
-{
+	{
-	return eulerAngleX(angleX) * eulerAngleZ(angleZ);
+		return eulerAngleX(angleX) * eulerAngleZ(angleZ);
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleZX
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleZX
-(
+	(
-	valType const & angleZ, 
+		valType const & angleZ, 
-	valType const & angleX
+		valType const & angleX
-)
+	)
-{
+	{
-	return eulerAngleZ(angleZ) * eulerAngleX(angleX);
+		return eulerAngleZ(angleZ) * eulerAngleX(angleX);
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleYXZ
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> eulerAngleYXZ
-(
+	(
-	valType const & yaw, 
+		valType const & yaw, 
-	valType const & pitch, 
+		valType const & pitch, 
-	valType const & roll
+		valType const & roll
-)
+	)
-{
+	{
-    valType tmp_ch = glm::cos(yaw);
+		valType tmp_ch = glm::cos(yaw);
-    valType tmp_sh = glm::sin(yaw);
+		valType tmp_sh = glm::sin(yaw);
-    valType tmp_cp = glm::cos(pitch);
+		valType tmp_cp = glm::cos(pitch);
-    valType tmp_sp = glm::sin(pitch);
+		valType tmp_sp = glm::sin(pitch);
-    valType tmp_cb = glm::cos(roll);
+		valType tmp_cb = glm::cos(roll);
-    valType tmp_sb = glm::sin(roll);
+		valType tmp_sb = glm::sin(roll);
 
-    detail::tmat4x4<valType> Result;
+		detail::tmat4x4<valType> Result;
-    Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
+		Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
-    Result[0][1] = tmp_sb * tmp_cp;
+		Result[0][1] = tmp_sb * tmp_cp;
-    Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
+		Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
-    Result[0][3] = valType(0);
+		Result[0][3] = valType(0);
-    Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
+		Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
-    Result[1][1] = tmp_cb * tmp_cp;
+		Result[1][1] = tmp_cb * tmp_cp;
-    Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
+		Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
-    Result[1][3] = valType(0);
+		Result[1][3] = valType(0);
-    Result[2][0] = tmp_sh * tmp_cp;
+		Result[2][0] = tmp_sh * tmp_cp;
-    Result[2][1] = -tmp_sp;
+		Result[2][1] = -tmp_sp;
-    Result[2][2] = tmp_ch * tmp_cp;
+		Result[2][2] = tmp_ch * tmp_cp;
-    Result[2][3] = valType(0);
+		Result[2][3] = valType(0);
-    Result[3][0] = valType(0);
+		Result[3][0] = valType(0);
-    Result[3][1] = valType(0);
+		Result[3][1] = valType(0);
-    Result[3][2] = valType(0);
+		Result[3][2] = valType(0);
-    Result[3][3] = valType(1);
+		Result[3][3] = valType(1);
-    return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> yawPitchRoll
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> yawPitchRoll
-(
+	(
-	valType const & yaw, 
+		valType const & yaw, 
-	valType const & pitch, 
+		valType const & pitch, 
-	valType const & roll
+		valType const & roll
-)
+	)
-{
+	{
-    valType tmp_ch = glm::cos(yaw);
+		valType tmp_ch = glm::cos(yaw);
-    valType tmp_sh = glm::sin(yaw);
+		valType tmp_sh = glm::sin(yaw);
-    valType tmp_cp = glm::cos(pitch);
+		valType tmp_cp = glm::cos(pitch);
-    valType tmp_sp = glm::sin(pitch);
+		valType tmp_sp = glm::sin(pitch);
-    valType tmp_cb = glm::cos(roll);
+		valType tmp_cb = glm::cos(roll);
-    valType tmp_sb = glm::sin(roll);
+		valType tmp_sb = glm::sin(roll);
 
-    detail::tmat4x4<valType> Result;
+		detail::tmat4x4<valType> Result;
-    Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
+		Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
-    Result[0][1] = tmp_sb * tmp_cp;
+		Result[0][1] = tmp_sb * tmp_cp;
-    Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
+		Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
-    Result[0][3] = valType(0);
+		Result[0][3] = valType(0);
-    Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
+		Result[1][0] = -tmp_ch * tmp_sb + tmp_sh * tmp_sp * tmp_cb;
-    Result[1][1] = tmp_cb * tmp_cp;
+		Result[1][1] = tmp_cb * tmp_cp;
-    Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
+		Result[1][2] = tmp_sb * tmp_sh + tmp_ch * tmp_sp * tmp_cb;
-    Result[1][3] = valType(0);
+		Result[1][3] = valType(0);
-    Result[2][0] = tmp_sh * tmp_cp;
+		Result[2][0] = tmp_sh * tmp_cp;
-    Result[2][1] = -tmp_sp;
+		Result[2][1] = -tmp_sp;
-    Result[2][2] = tmp_ch * tmp_cp;
+		Result[2][2] = tmp_ch * tmp_cp;
-    Result[2][3] = valType(0);
+		Result[2][3] = valType(0);
-    Result[3][0] = valType(0);
+		Result[3][0] = valType(0);
-    Result[3][1] = valType(0);
+		Result[3][1] = valType(0);
-    Result[3][2] = valType(0);
+		Result[3][2] = valType(0);
-    Result[3][3] = valType(1);
+		Result[3][3] = valType(1);
-    return Result;
+		return Result;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tmat2x2<valType> orientate2
+	GLM_FUNC_QUALIFIER detail::tmat2x2<valType> orientate2
-(
+	(
-	valType const & angle
+		valType const & angle
-)
+	)
-{
+	{
-    valType c = glm::cos(angle);
+		valType c = glm::cos(angle);
-    valType s = glm::sin(angle);
+		valType s = glm::sin(angle);
 
-	detail::tmat2x2<valType> Result;
+		detail::tmat2x2<valType> Result;
-    Result[0][0] = c;
+		Result[0][0] = c;
-    Result[0][1] = s;
+		Result[0][1] = s;
-    Result[1][0] = -s;
+		Result[1][0] = -s;
-    Result[1][1] = c;
+		Result[1][1] = c;
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tmat3x3<valType> orientate3
+	GLM_FUNC_QUALIFIER detail::tmat3x3<valType> orientate3
-(
+	(
-	valType const & angle
+		valType const & angle
-)
+	)
-{
+	{
-    valType c = glm::cos(angle);
+		valType c = glm::cos(angle);
-    valType s = glm::sin(angle);
+		valType s = glm::sin(angle);
 
-	detail::tmat3x3<valType> Result;
+		detail::tmat3x3<valType> Result;
-    Result[0][0] = c;
+		Result[0][0] = c;
-    Result[0][1] = s;
+		Result[0][1] = s;
-	Result[0][2] = 0.0f;
+		Result[0][2] = 0.0f;
-    Result[1][0] = -s;
+		Result[1][0] = -s;
-    Result[1][1] = c;
+		Result[1][1] = c;
-	Result[1][2] = 0.0f;
+		Result[1][2] = 0.0f;
-	Result[2][0] = 0.0f;
+		Result[2][0] = 0.0f;
-	Result[2][1] = 0.0f;
+		Result[2][1] = 0.0f;
-	Result[2][2] = 1.0f;
+		Result[2][2] = 1.0f;
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tmat3x3<valType> orientate3
+	GLM_FUNC_QUALIFIER detail::tmat3x3<valType> orientate3
-(
+	(
-	detail::tvec3<valType> const & angles
+		detail::tvec3<valType> const & angles
-)
+	)
-{
+	{
-	return detail::tmat3x3<valType>(yawPitchRoll(angles.x, angles.y, angles.z));
+		return detail::tmat3x3<valType>(yawPitchRoll(angles.x, angles.y, angles.z));
-}
+	}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> orientate4
-(
-	detail::tvec3<valType> const & angles
-)
-{
-    return yawPitchRoll(angles.z, angles.x, angles.y);
-}
 
+	template <typename valType>
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> orientate4
+	(
+		detail::tvec3<valType> const & angles
+	)
+	{
+		return yawPitchRoll(angles.z, angles.x, angles.y);
+	}
 }//namespace glm

glm/gtx/extend.inl

@@ -7,50 +7,49 @@
 // File    : glm/gtx/extend.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-genType extend
-(
-	genType const & Origin, 
-	genType const & Source, 
-	genType const & Distance
-)
 {
-    return Origin + (Source - Origin) * Distance;
+	template <typename genType>
-}
+	genType extend
+	(
+		genType const & Origin, 
+		genType const & Source, 
+		genType const & Distance
+	)
+	{
+		return Origin + (Source - Origin) * Distance;
+	}
 
-template <typename valType>
+	template <typename valType>
-detail::tvec2<valType> extend
+	detail::tvec2<valType> extend
-(
+	(
-	detail::tvec2<valType> const & Origin, 
+		detail::tvec2<valType> const & Origin, 
-	detail::tvec2<valType> const & Source, 
+		detail::tvec2<valType> const & Source, 
-	valType const & Distance
+		valType const & Distance
-)
+	)
-{
+	{
-    return Origin + (Source - Origin) * Distance;
+		return Origin + (Source - Origin) * Distance;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-detail::tvec3<valType> extend
+	detail::tvec3<valType> extend
-(
+	(
-	detail::tvec3<valType> const & Origin, 
+		detail::tvec3<valType> const & Origin, 
-	detail::tvec3<valType> const & Source, 
+		detail::tvec3<valType> const & Source, 
-	valType const & Distance
+		valType const & Distance
-)
+	)
-{
+	{
-    return Origin + (Source - Origin) * Distance;
+		return Origin + (Source - Origin) * Distance;
-}
+	}
-
-template <typename valType>
-detail::tvec4<valType> extend
-(
-	detail::tvec4<valType> const & Origin, 
-	detail::tvec4<valType> const & Source, 
-	valType const & Distance
-)
-{
-    return Origin + (Source - Origin) * Distance;
-}
 
+	template <typename valType>
+	detail::tvec4<valType> extend
+	(
+		detail::tvec4<valType> const & Origin, 
+		detail::tvec4<valType> const & Source, 
+		valType const & Distance
+	)
+	{
+		return Origin + (Source - Origin) * Distance;
+	}
 }//namespace glm

glm/gtx/fast_exponential.hpp

@@ -54,17 +54,17 @@ namespace glm
 
 	//! Faster than the common pow function but less accurate.
 	//! From GLM_GTX_fast_exponential extension.
-	template <typename valType> 
+	template <typename genType> 
-	valType fastPow(
+	genType fastPow(
-		valType const & x, 
+		genType const & x, 
-		valType const & y);
+		genType const & y);
 
 	//! Faster than the common pow function but less accurate.
 	//! From GLM_GTX_fast_exponential extension.
-	template <typename T, typename U> 
+	template <typename genTypeT, typename genTypeU> 
-	T fastPow(
+	genTypeT fastPow(
-		const T& x, 
+		genTypeT const & x, 
-		const U& y);
+		genTypeU const & y);
 		
 	//! Faster than the common exp function but less accurate.
 	//! From GLM_GTX_fast_exponential extension.

glm/gtx/fast_exponential.inl

@@ -7,284 +7,144 @@
 // File    : glm/gtx/fast_exponential.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-// fastPow:
+namespace glm
-template <typename T>
-GLM_FUNC_QUALIFIER T fastPow(const T x, const T y)
 {
-    return exp(y * log(x));
+	// fastPow:
-}
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType fastPow(genType const & x, genType const & y)
+	{
+		return exp(y * log(x));
+	}
 
-template <typename T>
+	VECTORIZE_VEC_VEC(fastPow)
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastPow(
-	const detail::tvec2<T>& x, 
-	const detail::tvec2<T>& y)
-{
-    return detail::tvec2<T>(
-        fastPow(x.x, y.x),
-        fastPow(x.y, y.y));
-}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastPow(
+	GLM_FUNC_QUALIFIER T fastPow(const T x, int y)
-	const detail::tvec3<T>& x, 
+	{
-	const detail::tvec3<T>& y)
+		T f = T(1);
-{
+		for(int i = 0; i < y; ++i)
-    return detail::tvec3<T>(
+			f *= x;
-        fastPow(x.x, y.x),
+		return f;
-        fastPow(x.y, y.y),
+	}
-        fastPow(x.z, y.z));
-}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastPow(
+	GLM_FUNC_QUALIFIER detail::tvec2<T> fastPow(
-	const detail::tvec4<T>& x, 
+		const detail::tvec2<T>& x, 
-	const detail::tvec4<T>& y)
+		const detail::tvec2<int>& y)
-{
+	{
-    return detail::tvec4<T>(
+		return detail::tvec2<T>(
-        fastPow(x.x, y.x),
+			fastPow(x.x, y.x),
-        fastPow(x.y, y.y),
+			fastPow(x.y, y.y));
-        fastPow(x.z, y.z),
+	}
-        fastPow(x.w, y.w));
-}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T fastPow(const T x, int y)
+	GLM_FUNC_QUALIFIER detail::tvec3<T> fastPow(
-{
+		const detail::tvec3<T>& x, 
-    T f = T(1);
+		const detail::tvec3<int>& y)
-    for(int i = 0; i < y; ++i)
+	{
-        f *= x;
+		return detail::tvec3<T>(
-    return f;
+			fastPow(x.x, y.x),
-}
+			fastPow(x.y, y.y),
+			fastPow(x.z, y.z));
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastPow(
+	GLM_FUNC_QUALIFIER detail::tvec4<T> fastPow(
-	const detail::tvec2<T>& x, 
+		const detail::tvec4<T>& x, 
-	const detail::tvec2<int>& y)
+		const detail::tvec4<int>& y)
-{
+	{
-    return detail::tvec2<T>(
+		return detail::tvec4<T>(
-        fastPow(x.x, y.x),
+			fastPow(x.x, y.x),
-        fastPow(x.y, y.y));
+			fastPow(x.y, y.y),
-}
+			fastPow(x.z, y.z),
+			fastPow(x.w, y.w));
+	}
 
-template <typename T>
+	// fastExp
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastPow(
+	// Note: This function provides accurate results only for value between -1 and 1, else avoid it.
-	const detail::tvec3<T>& x, 
+	template <typename T>
-	const detail::tvec3<int>& y)
+	GLM_FUNC_QUALIFIER T fastExp(const T x)
-{
+	{
-    return detail::tvec3<T>(
+		// This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
-        fastPow(x.x, y.x),
+		// return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
-        fastPow(x.y, y.y),
+		T x2 = x * x;
-        fastPow(x.z, y.z));
+		T x3 = x2 * x;
-}
+		T x4 = x3 * x;
+		T x5 = x4 * x;
+		return T(1) + x + (x2 * T(0.5)) + (x3 * T(0.1666666667)) + (x4 * T(0.041666667)) + (x5 * T(0.008333333333));
+	}
+	/*  // Try to handle all values of float... but often shower than std::exp, glm::floor and the loop kill the performance
+	GLM_FUNC_QUALIFIER float fastExp(float x)
+	{
+		const float e = 2.718281828f;
+		const float IntegerPart = floor(x);
+		const float FloatPart = x - IntegerPart;
+		float z = 1.f;
 
-template <typename T>
+		for(int i = 0; i < int(IntegerPart); ++i)
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastPow(
+			z *= e;
-	const detail::tvec4<T>& x, 
-	const detail::tvec4<int>& y)
-{
-    return detail::tvec4<T>(
-        fastPow(x.x, y.x),
-        fastPow(x.y, y.y),
-        fastPow(x.z, y.z),
-        fastPow(x.w, y.w));
-}
 
-// fastExp
+		const float x2 = FloatPart * FloatPart;
-// Note: This function provides accurate results only for value between -1 and 1, else avoid it.
+		const float x3 = x2 * FloatPart;
-template <typename T>
+		const float x4 = x3 * FloatPart;
-GLM_FUNC_QUALIFIER T fastExp(const T x)
+		const float x5 = x4 * FloatPart;
-{
+		return z * (1.0f + FloatPart + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f));
-    // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
+	}
-    // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
-    T x2 = x * x;
-    T x3 = x2 * x;
-    T x4 = x3 * x;
-    T x5 = x4 * x;
-    return T(1) + x + (x2 * T(0.5)) + (x3 * T(0.1666666667)) + (x4 * T(0.041666667)) + (x5 * T(0.008333333333));
-}
-/*  // Try to handle all values of float... but often shower than std::exp, glm::floor and the loop kill the performance
-GLM_FUNC_QUALIFIER float fastExp(float x)
-{
-    const float e = 2.718281828f;
-    const float IntegerPart = floor(x);
-    const float FloatPart = x - IntegerPart;
-    float z = 1.f;
 
-    for(int i = 0; i < int(IntegerPart); ++i)
+	// Increase accuracy on number bigger that 1 and smaller than -1 but it's not enough for high and negative numbers
-        z *= e;
+	GLM_FUNC_QUALIFIER float fastExp(float x)
+	{
+		// This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
+		// return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
+		float x2 = x * x;
+		float x3 = x2 * x;
+		float x4 = x3 * x;
+		float x5 = x4 * x;
+		float x6 = x5 * x;
+		float x7 = x6 * x;
+		float x8 = x7 * x;
+		return 1.0f + x + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f)+ (x6 * 0.00138888888888f) + (x7 * 0.000198412698f) + (x8 * 0.0000248015873f);;
+	}
+	*/
 
-    const float x2 = FloatPart * FloatPart;
+	VECTORIZE_VEC(fastExp)
-    const float x3 = x2 * FloatPart;
-    const float x4 = x3 * FloatPart;
-    const float x5 = x4 * FloatPart;
-    return z * (1.0f + FloatPart + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f));
-}
 
-// Increase accuracy on number bigger that 1 and smaller than -1 but it's not enough for high and negative numbers
+	// fastLog
-GLM_FUNC_QUALIFIER float fastExp(float x)
+	template <typename genType>
-{
+	GLM_FUNC_QUALIFIER genType fastLog(genType const & x)
-    // This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
+	{
-    // return 1.0f + x * (1.0f + x * 0.5f * (1.0f + x * 0.3333333333f * (1.0f + x * 0.25 * (1.0f + x * 0.2f))));
+		return std::log(x);
-    float x2 = x * x;
+	}
-    float x3 = x2 * x;
-    float x4 = x3 * x;
-    float x5 = x4 * x;
-    float x6 = x5 * x;
-    float x7 = x6 * x;
-    float x8 = x7 * x;
-    return 1.0f + x + (x2 * 0.5f) + (x3 * 0.1666666667f) + (x4 * 0.041666667f) + (x5 * 0.008333333333f)+ (x6 * 0.00138888888888f) + (x7 * 0.000198412698f) + (x8 * 0.0000248015873f);;
-}
-*/
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastExp(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastExp(x.x),
-        fastExp(x.y));
-}
 
-template <typename T>
+	/* Slower than the VC7.1 function...
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastExp(
+	GLM_FUNC_QUALIFIER float fastLog(float x)
-	const detail::tvec3<T>& x)
+	{
-{
+		float y1 = (x - 1.0f) / (x + 1.0f);
-    return detail::tvec3<T>(
+		float y2 = y1 * y1;
-        fastExp(x.x),
+		return 2.0f * y1 * (1.0f + y2 * (0.3333333333f + y2 * (0.2f + y2 * 0.1428571429f)));
-        fastExp(x.y),
+	}
-        fastExp(x.z));
+	*/
-}
 
-template <typename T>
+	VECTORIZE_VEC(fastLog)
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastExp(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastExp(x.x),
-        fastExp(x.y),
-        fastExp(x.z),
-        fastExp(x.w));
-}
 
-// fastLog
+	//fastExp2, ln2 = 0.69314718055994530941723212145818f
-template <typename T>
+	template <typename genType>
-GLM_FUNC_QUALIFIER T fastLog(const T x)
+	GLM_FUNC_QUALIFIER genType fastExp2(genType const & x)
-{
+	{
-    return std::log(x);
+		return fastExp(0.69314718055994530941723212145818f * x);
-}
+	}
 
-/* Slower than the VC7.1 function...
+	VECTORIZE_VEC(fastExp2)
-GLM_FUNC_QUALIFIER float fastLog(float x)
-{
-    float y1 = (x - 1.0f) / (x + 1.0f);
-    float y2 = y1 * y1;
-    return 2.0f * y1 * (1.0f + y2 * (0.3333333333f + y2 * (0.2f + y2 * 0.1428571429f)));
-}
-*/
 
-template <typename T>
+	// fastLog2, ln2 = 0.69314718055994530941723212145818f
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastLog(
+	template <typename genType>
-	const detail::tvec2<T>& x)
+	GLM_FUNC_QUALIFIER genType fastLog2(genType const & x)
-{
+	{
-    return detail::tvec2<T>(
+		return fastLog(x) / 0.69314718055994530941723212145818f;
-        fastLog(x.x),
+	}
-        fastLog(x.y));
-}
 
-template <typename T>
+	VECTORIZE_VEC(fastLog2)
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastLog(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastLog(x.x),
-        fastLog(x.y),
-        fastLog(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastLog(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastLog(x.x),
-        fastLog(x.y),
-        fastLog(x.z),
-        fastLog(x.w));
-}
-
-//fastExp2, ln2 = 0.69314718055994530941723212145818f
-template <typename T>
-GLM_FUNC_QUALIFIER T fastExp2(const T x)
-{
-    return fastExp(0.69314718055994530941723212145818f * x);
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastExp2(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastExp2(x.x),
-        fastExp2(x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastExp2(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastExp2(x.x),
-        fastExp2(x.y),
-        fastExp2(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastExp2(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastExp2(x.x),
-        fastExp2(x.y),
-        fastExp2(x.z),
-        fastExp2(x.w));
-}
-
-// fastLog2, ln2 = 0.69314718055994530941723212145818f
-template <typename T>
-GLM_FUNC_QUALIFIER T fastLog2(const T x)
-{
-    return fastLog(x) / 0.69314718055994530941723212145818f;
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastLog2(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastLog2(x.x),
-        fastLog2(x.y));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastLog2(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastLog2(x.x),
-        fastLog2(x.y),
-        fastLog2(x.z));
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastLog2(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastLog2(x.x),
-        fastLog2(x.y),
-        fastLog2(x.z),
-        fastLog2(x.w));
-}
 
 }//namespace glm

glm/gtx/fast_square_root.inl

@@ -2,232 +2,137 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2006-01-04
-// Updated : 2008-10-07
+// Updated : 2011-10-14
 // Licence : This source is under MIT License
 // File    : glm/gtx/fast_square_root.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-// fastSqrt
+namespace glm
-template <typename genType>
-GLM_FUNC_QUALIFIER genType fastSqrt
-(
-	genType const & x
-)
 {
-    return genType(1) / fastInverseSqrt(x);
+	// fastSqrt
-}
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType fastSqrt
+	(
+		genType const & x
+	)
+	{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'fastSqrt' only accept floating-point input");
 
-template <typename valType>
+		return genType(1) / fastInverseSqrt(x);
-GLM_FUNC_QUALIFIER detail::tvec2<valType> fastSqrt
+	}
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        fastSqrt(x.x), 
-        fastSqrt(x.y));
-}
 
-template <typename valType>
+	VECTORIZE_VEC(fastSqrt)
-GLM_FUNC_QUALIFIER detail::tvec3<valType> fastSqrt
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        fastSqrt(x.x), 
-        fastSqrt(x.y), 
-        fastSqrt(x.z));
-}
 
-template <typename valType>
+	// fastInversesqrt
-GLM_FUNC_QUALIFIER detail::tvec4<valType> fastSqrt
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType fastInverseSqrt
-	detail::tvec4<valType> const & x
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec4<valType>(
+	{
-        fastSqrt(x.x), 
+		genType tmp = x;
-        fastSqrt(x.y), 
+		float xhalf = 0.5f * float(tmp);
-        fastSqrt(x.z), 
+		uint i = *(uint*)&x;
-        fastSqrt(x.w));
+		i = 0x5f375a86 - (i >> 1);
-}
+		//x = *(float*)&i;
+		//x = *((float*)(char*)&i);
+		tmp = detail::uif(i).f;
+		tmp = tmp * (1.5f - xhalf * tmp * tmp);
+		return genType(tmp);
+	}
 
-// fastInversesqrt
+	VECTORIZE_VEC(fastInverseSqrt)
-template <typename genType>
-GLM_FUNC_QUALIFIER genType fastInverseSqrt
-(
-	genType const & x
-)
-{
-	genType tmp = x;
-    float xhalf = 0.5f * float(tmp);
-    uint i = *(uint*)&x;
-    i = 0x5f375a86 - (i >> 1);
-    //x = *(float*)&i;
-	//x = *((float*)(char*)&i);
-	tmp = detail::uif(i).f;
-	tmp = tmp * (1.5f - xhalf * tmp * tmp);
-    return genType(tmp);
-}
 
-template <typename valType>
+	// fastLength
-GLM_FUNC_QUALIFIER detail::tvec2<valType> fastInverseSqrt
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType fastLength
-	detail::tvec2<valType> const & x
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec2<valType>(
+	{
-        fastInverseSqrt(x.x), 
+		return abs(x);
-        fastInverseSqrt(x.y));
+	}
-}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> fastInverseSqrt
+	GLM_FUNC_QUALIFIER valType fastLength
-(
+	(
-	detail::tvec3<valType> const & x
+		detail::tvec2<valType> const & x
-)
+	)
-{
+	{
-    return detail::tvec3<valType>(
+		valType sqr = x.x * x.x + x.y * x.y;
-        fastInverseSqrt(x.x), 
+		return fastSqrt(sqr);
-        fastInverseSqrt(x.y), 
+	}
-        fastInverseSqrt(x.z));
-}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> fastInverseSqrt
+	GLM_FUNC_QUALIFIER valType fastLength
-(
+	(
-	detail::tvec4<valType> const & x
+		detail::tvec3<valType> const & x
-)
+	)
-{
+	{
-    return detail::tvec4<valType>(
+		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
-        fastInverseSqrt(x.x), 
+		return fastSqrt(sqr);
-        fastInverseSqrt(x.y), 
+	}
-        fastInverseSqrt(x.z), 
-        fastInverseSqrt(x.w));
-}
 
-// fastLength
+	template <typename valType>
-template <typename genType>
+	GLM_FUNC_QUALIFIER valType fastLength
-GLM_FUNC_QUALIFIER genType fastLength
+	(
-(
+		detail::tvec4<valType> const & x
-	genType const & x
+	)
-)
+	{
-{
+		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
-    return abs(x);
+		return fastSqrt(sqr);
-}
+	}
 
-template <typename valType>
+	// fastDistance
-GLM_FUNC_QUALIFIER valType fastLength
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType fastDistance
-	detail::tvec2<valType> const & x
+	(
-)
+		genType const & x, 
-{
+		genType const & y
-    valType sqr = x.x * x.x + x.y * x.y;
+	)
-    return fastSqrt(sqr);
+	{
-}
+		return fastLength(y - x);
+	}
 
-template <typename valType>
+	// fastNormalize
-GLM_FUNC_QUALIFIER valType fastLength
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType fastNormalize
-	detail::tvec3<valType> const & x
+	(
-)
+		genType const & x
-{
+	)
-    valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
+	{
-    return fastSqrt(sqr);
+		return x > genType(0) ? genType(1) : -genType(1);
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER valType fastLength
+	GLM_FUNC_QUALIFIER detail::tvec2<valType> fastNormalize
-(
+	(
-	detail::tvec4<valType> const & x
+		detail::tvec2<valType> 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;
-    return fastSqrt(sqr);
+		return x * fastInverseSqrt(sqr);
-}
+	}
 
-// fastDistance
+	template <typename valType>
-template <typename genType>
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> fastNormalize
-GLM_FUNC_QUALIFIER genType fastDistance
+	(
-(
+		detail::tvec3<valType> const & x
-	genType const & x, 
+	)
-	genType const & y
+	{
-)
+		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
-{
+		return x * fastInverseSqrt(sqr);
-    return fastLength(y - x);
+	}
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER valType fastDistance
-(
-	detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y
-)
-{
-    return fastLength(y - x);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER valType fastDistance
-(
-	detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y
-)
-{
-    return fastLength(y - x);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER valType fastDistance
-(
-	detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y
-)
-{
-    return fastLength(y - x);
-}
-
-// fastNormalize
-template <typename genType>
-GLM_FUNC_QUALIFIER genType fastNormalize
-(
-	genType const & x
-)
-{
-    return x > genType(0) ? genType(1) : -genType(1);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> fastNormalize
-(
-	detail::tvec2<valType> const & x
-)
-{
-    valType sqr = x.x * x.x + x.y * x.y;
-    return x * fastInverseSqrt(sqr);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> fastNormalize
-(
-	detail::tvec3<valType> const & x
-)
-{
-    valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
-    return x * fastInverseSqrt(sqr);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> fastNormalize
-(
-	detail::tvec4<valType> const & x
-)
-{
-    valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
-    return x * fastInverseSqrt(sqr);
-}
 
+	template <typename valType>
+	GLM_FUNC_QUALIFIER detail::tvec4<valType> fastNormalize
+	(
+		detail::tvec4<valType> const & x
+	)
+	{
+		valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
+		return x * fastInverseSqrt(sqr);
+	}
 }//namespace glm

glm/gtx/fast_trigonometry.inl

@@ -2,267 +2,76 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2006-01-08
-// Updated : 2006-01-08
+// Updated : 2011-10-14
 // Licence : This source is under MIT License
 // File    : glm/gtx/fast_trigonometry.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-// sin
+namespace glm
-template <typename T> 
-GLM_FUNC_QUALIFIER T fastSin(const T x)
 {
-    return x - ((x * x * x) / T(6)) + ((x * x * x * x * x) / T(120)) - ((x * x * x * x * x * x * x) / T(5040));
+	// sin
-}
+	template <typename T> 
+	GLM_FUNC_QUALIFIER T fastSin(T const & x)
+	{
+		return x - ((x * x * x) / T(6)) + ((x * x * x * x * x) / T(120)) - ((x * x * x * x * x * x * x) / T(5040));
+	}
 
-template <typename T> 
+	VECTORIZE_VEC(fastSin)
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastSin(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastSin(x.x),
-        fastSin(x.y));
-}
 
-template <typename T> 
+	// cos
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastSin(
+	template <typename T> 
-	const detail::tvec3<T>& x)
+	GLM_FUNC_QUALIFIER T fastCos(T const & x)
-{
+	{
-    return detail::tvec3<T>(
+		return T(1) - (x * x * T(0.5)) + (x * x * x * x * T(0.041666666666)) - (x * x * x * x * x * x * T(0.00138888888888));
-        fastSin(x.x),
+	}
-        fastSin(x.y),
-        fastSin(x.z));
-}
 
-template <typename T> 
+	VECTORIZE_VEC(fastCos)
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastSin(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastSin(x.x),
-        fastSin(x.y),
-        fastSin(x.z),
-        fastSin(x.w));
-}
 
-// cos
+	// tan
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T fastCos(const T x)
+	GLM_FUNC_QUALIFIER T fastTan(T const & x)
-{
+	{
-    return T(1) - (x * x * T(0.5)) + (x * x * x * x * T(0.041666666666)) - (x * x * x * x * x * x * T(0.00138888888888));
+		return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539));
-}
+	}
 
-template <typename T> 
+	VECTORIZE_VEC(fastTan)
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastCos(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastCos(x.x),
-        fastCos(x.y));
-}
 
-template <typename T> 
+	// asin
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastCos(
+	template <typename T> 
-	const detail::tvec3<T>& x)
+	GLM_FUNC_QUALIFIER T fastAsin(T const & x)
-{
+	{
-    return detail::tvec3<T>(
+		return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159));
-        fastCos(x.x),
+	}
-        fastCos(x.y),
-        fastCos(x.z));
-}
 
-template <typename T> 
+	VECTORIZE_VEC(fastAsin)
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastCos(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastCos(x.x),
-        fastCos(x.y),
-        fastCos(x.z),
-        fastCos(x.w));
-}
 
-// tan
+	// acos
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T fastTan(const T x)
+	GLM_FUNC_QUALIFIER T fastAcos(T const & x)
-{
+	{
-    return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539));
+		return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2)
-}
+	}
 
-template <typename T> 
+	VECTORIZE_VEC(fastAcos)
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastTan(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastTan(x.x),
-        fastTan(x.y));
-}
 
-template <typename T> 
+	// atan
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastTan(
+	template <typename T> 
-	const detail::tvec3<T>& x)
+	GLM_FUNC_QUALIFIER T fastAtan(T const & y, T const & x)
-{
+	{
-    return detail::tvec3<T>(
+		T sgn = sign(y) * sign(x);
-        fastTan(x.x),
+		return abs(fastAtan(y / x)) * sgn;
-        fastTan(x.y),
+	}
-        fastTan(x.z));
-}
 
-template <typename T> 
+	VECTORIZE_VEC_VEC(fastAtan)
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastTan(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastTan(x.x),
-        fastTan(x.y),
-        fastTan(x.z),
-        fastTan(x.w));
-}
 
-// asin
+	template <typename T> 
-template <typename T> 
+	GLM_FUNC_QUALIFIER T fastAtan(T const & x)
-GLM_FUNC_QUALIFIER T fastAsin(const T x)
+	{
-{
+		return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909));
-    return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159));
+	}
-}
 
-template <typename T> detail::tvec2<T> fastAsin(
+	VECTORIZE_VEC(fastAtan)
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastAsin(x.x),
-        fastAsin(x.y));
-}
-
-template <typename T> detail::tvec3<T> fastAsin(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastAsin(x.x),
-        fastAsin(x.y),
-        fastAsin(x.z));
-}
-
-template <typename T> detail::tvec4<T> fastAsin(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastAsin(x.x),
-        fastAsin(x.y),
-        fastAsin(x.z),
-        fastAsin(x.w));
-}
-
-// acos
-template <typename T> 
-GLM_FUNC_QUALIFIER T fastAcos(const T x)
-{
-    return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2)
-}
-
-template <typename T> detail::tvec2<T> fastAcos(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastAcos(x.x),
-        fastAcos(x.y));
-}
-
-template <typename T> detail::tvec3<T> fastAcos(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastAcos(x.x),
-        fastAcos(x.y),
-        fastAcos(x.z));
-}
-
-template <typename T> detail::tvec4<T> fastAcos(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastAcos(x.x),
-        fastAcos(x.y),
-        fastAcos(x.z),
-        fastAcos(x.w));
-}
-
-// atan
-template <typename T> 
-GLM_FUNC_QUALIFIER T fastAtan(const T y, const T x)
-{
-    T sgn = sign(y) * sign(x);
-    return abs(fastAtan(y / x)) * sgn;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastAtan(
-	const detail::tvec2<T>& y, 
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastAtan(y.x, x.x),
-        fastAtan(y.y, x.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastAtan(
-	const detail::tvec3<T>& y, 
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastAtan(y.x, x.x),
-        fastAtan(y.y, x.y),
-        fastAtan(y.z, x.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastAtan(
-	const detail::tvec4<T>& y, 
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastAtan(y.x, x.x),
-        fastAtan(y.y, x.y),
-        fastAtan(y.z, x.z),
-        fastAtan(y.w, x.w));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER T fastAtan(const T x)
-{
-    return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> fastAtan(
-	const detail::tvec2<T>& x)
-{
-    return detail::tvec2<T>(
-        fastAtan(x.x),
-        fastAtan(x.y));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> fastAtan(
-	const detail::tvec3<T>& x)
-{
-    return detail::tvec3<T>(
-        fastAtan(x.x),
-        fastAtan(x.y),
-        fastAtan(x.z));
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> fastAtan(
-	const detail::tvec4<T>& x)
-{
-    return detail::tvec4<T>(
-        fastAtan(x.x),
-        fastAtan(x.y),
-        fastAtan(x.z),
-        fastAtan(x.w));
-}
 
 }//namespace glm

glm/gtx/gradient_paint.inl

@@ -7,38 +7,37 @@
 // File    : glm/gtx/gradient_paint.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType>
-valType radialGradient
-(
-	detail::tvec2<valType> const & Center,
-	valType const & Radius,
-	detail::tvec2<valType> const & Focal,
-	detail::tvec2<valType> const & Position
-)
 {
-	detail::tvec2<valType> F = Focal - Center;
+	template <typename valType>
-	detail::tvec2<valType> D = Position - Focal;
+	valType radialGradient
-	valType Radius2 = pow2(Radius);
+	(
-	valType Fx2 = pow2(F.x);
+		detail::tvec2<valType> const & Center,
-	valType Fy2 = pow2(F.y);
+		valType const & Radius,
+		detail::tvec2<valType> const & Focal,
+		detail::tvec2<valType> const & Position
+	)
+	{
+		detail::tvec2<valType> F = Focal - Center;
+		detail::tvec2<valType> D = Position - Focal;
+		valType Radius2 = pow2(Radius);
+		valType Fx2 = pow2(F.x);
+		valType Fy2 = pow2(F.y);
 
-	valType Numerator = (D.x * F.x + D.y * F.y) + sqrt(Radius2 * (pow2(D.x) + pow2(D.y)) - pow2(D.x * F.y - D.y * F.x));
+		valType Numerator = (D.x * F.x + D.y * F.y) + sqrt(Radius2 * (pow2(D.x) + pow2(D.y)) - pow2(D.x * F.y - D.y * F.x));
-	valType Denominator = Radius2 - (Fx2 + Fy2);
+		valType Denominator = Radius2 - (Fx2 + Fy2);
-	return Numerator / Denominator;
+		return Numerator / Denominator;
-}
+	}
-
-template <typename valType>
-valType linearGradient
-(
-	detail::tvec2<valType> const & Point0,
-	detail::tvec2<valType> const & Point1,
-	detail::tvec2<valType> const & Position
-)
-{
-	detail::tvec2<valType> Dist = Point1 - Point0;
-	return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist);
-}
 
+	template <typename valType>
+	valType linearGradient
+	(
+		detail::tvec2<valType> const & Point0,
+		detail::tvec2<valType> const & Point1,
+		detail::tvec2<valType> const & Position
+	)
+	{
+		detail::tvec2<valType> Dist = Point1 - Point0;
+		return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist);
+	}
 }//namespace glm

glm/gtx/handed_coordinate_space.inl

@@ -7,24 +7,27 @@
 // File    : glm/gtx/handed_coordinate_space.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER bool rightHanded(
-	detail::tvec3<T> const & tangent, 
-	detail::tvec3<T> const & binormal,
-	detail::tvec3<T> const & normal)
 {
-    return dot(cross(normal, tangent), binormal) > T(0);
+	template <typename T> 
-}
+	GLM_FUNC_QUALIFIER bool rightHanded
-
+	(
-template <typename T> 
+		detail::tvec3<T> const & tangent, 
-GLM_FUNC_QUALIFIER bool leftHanded(
+		detail::tvec3<T> const & binormal,
-	detail::tvec3<T> const & tangent, 
+		detail::tvec3<T> const & normal
-	detail::tvec3<T> const & binormal, 
+	)
-	detail::tvec3<T> const & normal)
+	{
-{
+		return dot(cross(normal, tangent), binormal) > T(0);
-    return dot(cross(normal, tangent), binormal) < T(0);
+	}
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER bool leftHanded
+	(
+		detail::tvec3<T> const & tangent, 
+		detail::tvec3<T> const & binormal, 
+		detail::tvec3<T> const & normal
+	)
+	{
+		return dot(cross(normal, tangent), binormal) < T(0);
+	}
 }//namespace glm

glm/gtx/inertia.hpp

@@ -55,57 +55,57 @@ namespace glm
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat3x3<T> boxInertia3(
-		const T Mass, 
+		T const & Mass, 
-		const detail::tvec3<T>& Scale);
+		detail::tvec3<T> const & Scale);
 		
 	//! Build an inertia matrix for a box.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat4x4<T> boxInertia4(
-		const T Mass, 
+		T const & Mass, 
-		const detail::tvec3<T>& Scale);
+		detail::tvec3<T> const & Scale);
 		
 	//! Build an inertia matrix for a disk.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat3x3<T> diskInertia3(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 
 	//! Build an inertia matrix for a disk.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat4x4<T> diskInertia4(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 
 	//! Build an inertia matrix for a ball.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat3x3<T> ballInertia3(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 		
 	//! Build an inertia matrix for a ball.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat4x4<T> ballInertia4(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 
 	//! Build an inertia matrix for a sphere.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat3x3<T> sphereInertia3(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 
 	//! Build an inertia matrix for a sphere.
 	//! From GLM_GTX_inertia extension.
 	template <typename T> 
 	detail::tmat4x4<T> sphereInertia4(
-		const T Mass, 
+		T const & Mass, 
-		const T Radius);
+		T const & Radius);
 
 	/// @}
 }// namespace glm

glm/gtx/inertia.inl

@@ -7,93 +7,108 @@
 // File    : glm/gtx/inertia.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> boxInertia3(
-	const T Mass, 
-	const detail::tvec3<T>& Scale)
 {
-	detail::tmat3x3<T> Result(T(1));
+	template <typename T>
-	Result[0][0] = (Scale.y * Scale.y + Scale.z * Scale.z) * Mass / T(12);
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> boxInertia3
-	Result[1][1] = (Scale.x * Scale.x + Scale.z * Scale.z) * Mass / T(12);
+	(
-	Result[2][2] = (Scale.x * Scale.x + Scale.y * Scale.y) * Mass / T(12);
+		T const & Mass, 
-    return Result;
+		detail::tvec3<T> const & Scale
-}
+	)
+	{
+		detail::tmat3x3<T> Result(T(1));
+		Result[0][0] = (Scale.y * Scale.y + Scale.z * Scale.z) * Mass / T(12);
+		Result[1][1] = (Scale.x * Scale.x + Scale.z * Scale.z) * Mass / T(12);
+		Result[2][2] = (Scale.x * Scale.x + Scale.y * Scale.y) * Mass / T(12);
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> boxInertia4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> boxInertia4
-	const T Mass, 
+	(
-	const detail::tvec3<T>& Scale)
+		T const & Mass, 
-{
+		detail::tvec3<T> const & Scale
-	detail::tmat4x4<T> Result(T(1));
+	)
-	Result[0][0] = (Scale.y * Scale.y + Scale.z * Scale.z) * Mass / T(12);
+	{
-	Result[1][1] = (Scale.x * Scale.x + Scale.z * Scale.z) * Mass / T(12);
+		detail::tmat4x4<T> Result(T(1));
-	Result[2][2] = (Scale.x * Scale.x + Scale.y * Scale.y) * Mass / T(12);
+		Result[0][0] = (Scale.y * Scale.y + Scale.z * Scale.z) * Mass / T(12);
-    return Result;
+		Result[1][1] = (Scale.x * Scale.x + Scale.z * Scale.z) * Mass / T(12);
-}
+		Result[2][2] = (Scale.x * Scale.x + Scale.y * Scale.y) * Mass / T(12);
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> diskInertia3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> diskInertia3
-	const T Mass, 
+	(
-	const T Radius)
+		T const & Mass, 
-{
+		T const & Radius
-    T a = Mass * Radius * Radius / T(2);
+	)
-    detail::tmat3x3<T> Result(a);
+	{
-    Result[2][2] *= T(2);
+		T a = Mass * Radius * Radius / T(2);
-    return Result;
+		detail::tmat3x3<T> Result(a);
-}
+		Result[2][2] *= T(2);
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> diskInertia4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> diskInertia4
-	const T Mass, 
+	(
-	const T Radius)
+		T const & Mass, 
-{
+		T const & Radius
-    T a = Mass * Radius * Radius / T(2);
+	)
-    detail::tmat4x4<T> Result(a);
+	{
-    Result[2][2] *= T(2);
+		T a = Mass * Radius * Radius / T(2);
-    Result[3][3] = T(1);
+		detail::tmat4x4<T> Result(a);
-    return Result;
+		Result[2][2] *= T(2);
-}
+		Result[3][3] = T(1);
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> ballInertia3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> ballInertia3
-	const T Mass, 
+	(
-	const T Radius)
+		T const & Mass, 
-{
+		T const & Radius
-    T a = T(2) * Mass * Radius * Radius / T(5);
+	)
-    return detail::tmat3x3<T>(a);
+	{
-}
+		T a = T(2) * Mass * Radius * Radius / T(5);
+		return detail::tmat3x3<T>(a);
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> ballInertia4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> ballInertia4
-	const T Mass, 
+	(
-	const T Radius)
+		T const & Mass, 
-{
+		T const & Radius
-    T a = T(2) * Mass * Radius * Radius / T(5);
+	)
-    detail::tmat4x4<T> Result(a);
+	{
-    Result[3][3] = T(1);
+		T a = T(2) * Mass * Radius * Radius / T(5);
-    return Result;
+		detail::tmat4x4<T> Result(a);
-}
+		Result[3][3] = T(1);
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> sphereInertia3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> sphereInertia3
-	const T Mass, 
+	(
-	const T Radius)
+		T const & Mass, 
-{
+		T const & Radius
-    T a = T(2) * Mass * Radius * Radius / T(3);
+	)
-    return detail::tmat3x3<T>(a);
+	{
-}
+		T a = T(2) * Mass * Radius * Radius / T(3);
-
+		return detail::tmat3x3<T>(a);
-template <typename T>
+	}
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> sphereInertia4(
-	const T Mass, 
-	const T Radius)
-{
-    T a = T(2) * Mass * Radius * Radius / T(3);
-    detail::tmat4x4<T> Result(a);
-    Result[3][3] = T(1);
-    return Result;
-}
 
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> sphereInertia4
+	(
+		T const & Mass, 
+		T const & Radius
+	)
+	{
+		T a = T(2) * Mass * Radius * Radius / T(3);
+		detail::tmat4x4<T> Result(a);
+		Result[3][3] = T(1);
+		return Result;
+	}
 }//namespace glm

glm/gtx/int_10_10_10_2.inl

@@ -7,11 +7,13 @@
 // File    : glm/gtx/int_10_10_10_2.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-GLM_FUNC_QUALIFIER dword uint10_10_10_2_cast(glm::vec4 const & v)
 {
-    return dword(uint(v.x * 2047.f) << 0 | uint(v.y * 2047.f) << 10 | uint(v.z * 2047.f) << 20 | uint(v.w * 3.f) << 30);
+	GLM_FUNC_QUALIFIER dword uint10_10_10_2_cast
-}
+	(
-
+		glm::vec4 const & v
+	)
+	{
+		return dword(uint(v.x * 2047.f) << 0 | uint(v.y * 2047.f) << 10 | uint(v.z * 2047.f) << 20 | uint(v.w * 3.f) << 30);
+	}
 }//namespace glm

glm/gtx/integer.inl

@@ -7,35 +7,35 @@
 // File    : glm/gtx/integer.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-// pow
-GLM_FUNC_QUALIFIER int pow(int x, int y)
 {
-	if(y == 0)
+	// pow
-		return 1;
+	GLM_FUNC_QUALIFIER int pow(int x, int y)
-    int result = x;
+	{
-    for(int i = 1; i < y; ++i)
+		if(y == 0)
-        result *= x;
+			return 1;
-    return result;
+		int result = x;
-}
+		for(int i = 1; i < y; ++i)
+			result *= x;
+		return result;
+	}
 
-// sqrt: From Christopher J. Musial, An integer square root, Graphics Gems, 1990, page 387
+	// sqrt: From Christopher J. Musial, An integer square root, Graphics Gems, 1990, page 387
-GLM_FUNC_QUALIFIER int sqrt(int x)
+	GLM_FUNC_QUALIFIER int sqrt(int x)
-{
+	{
-    if(x <= 1) return x;
+		if(x <= 1) return x;
 
-    int NextTrial = x >> 1;
+		int NextTrial = x >> 1;
-    int CurrentAnswer;
+		int CurrentAnswer;
 
-    do
+		do
-    {
+		{
-        CurrentAnswer = NextTrial;
+			CurrentAnswer = NextTrial;
-        NextTrial = (NextTrial + x / NextTrial) >> 1;
+			NextTrial = (NextTrial + x / NextTrial) >> 1;
-    } while(NextTrial < CurrentAnswer);
+		} while(NextTrial < CurrentAnswer);
 
-    return CurrentAnswer;
+		return CurrentAnswer;
-}
+	}
 
 // Henry Gordon Dietz: http://aggregate.org/MAGIC/
 namespace detail
@@ -69,132 +69,132 @@ namespace detail
 	};
 }//namespace detail
 
-// Henry Gordon Dietz: http://aggregate.org/MAGIC/
+	// Henry Gordon Dietz: http://aggregate.org/MAGIC/
-unsigned int floor_log2(unsigned int x)
+	unsigned int floor_log2(unsigned int x)
-{
+	{
-	x |= (x >> 1);
+		x |= (x >> 1);
-	x |= (x >> 2);
+		x |= (x >> 2);
-	x |= (x >> 4);
+		x |= (x >> 4);
-	x |= (x >> 8);
+		x |= (x >> 8);
-	x |= (x >> 16);
+		x |= (x >> 16);
 
-	return(detail::ones32(x) - 1);
+		return(detail::ones32(x) - 1);
-}
+	}
 
-// mod
+	// mod
-GLM_FUNC_QUALIFIER int mod(int x, int y)
+	GLM_FUNC_QUALIFIER int mod(int x, int y)
-{
+	{
-	return x - y * (x / y);
+		return x - y * (x / y);
-}
+	}
 
-// factorial (!12 max, integer only)
+	// factorial (!12 max, integer only)
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType factorial(genType const & x)
+	GLM_FUNC_QUALIFIER genType factorial(genType const & x)
-{
+	{
-	genType Temp = x;
+		genType Temp = x;
-    genType Result;
+		genType Result;
-    for(Result = 1; Temp > 1; --Temp)
+		for(Result = 1; Temp > 1; --Temp)
-        Result *= Temp;
+			Result *= Temp;
-    return Result;
+		return Result;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> factorial(
+	GLM_FUNC_QUALIFIER detail::tvec2<valType> factorial(
-	detail::tvec2<valType> const & x)
+		detail::tvec2<valType> const & x)
-{
+	{
-    return detail::tvec2<valType>(
+		return detail::tvec2<valType>(
-        factorial(x.x),
+			factorial(x.x),
-        factorial(x.y));
+			factorial(x.y));
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> factorial(
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> factorial(
-	detail::tvec3<valType> const & x)
+		detail::tvec3<valType> const & x)
-{
+	{
-    return detail::tvec3<valType>(
+		return detail::tvec3<valType>(
-        factorial(x.x),
+			factorial(x.x),
-        factorial(x.y),
+			factorial(x.y),
-        factorial(x.z));
+			factorial(x.z));
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> factorial(
+	GLM_FUNC_QUALIFIER detail::tvec4<valType> factorial(
-	detail::tvec4<valType> const & x)
+		detail::tvec4<valType> const & x)
-{
+	{
-    return detail::tvec4<valType>(
+		return detail::tvec4<valType>(
-        factorial(x.x),
+			factorial(x.x),
-        factorial(x.y),
+			factorial(x.y),
-        factorial(x.z),
+			factorial(x.z),
-        factorial(x.w));
+			factorial(x.w));
-}
+	}
 
-GLM_FUNC_QUALIFIER uint pow(uint x, uint y)
+	GLM_FUNC_QUALIFIER uint pow(uint x, uint y)
-{
+	{
-    uint result = x;
+		uint result = x;
-    for(uint i = 1; i < y; ++i)
+		for(uint i = 1; i < y; ++i)
-        result *= x;
+			result *= x;
-    return result;
+		return result;
-}
+	}
 
-GLM_FUNC_QUALIFIER uint sqrt(uint x)
+	GLM_FUNC_QUALIFIER uint sqrt(uint x)
-{
+	{
-    if(x <= 1) return x;
+		if(x <= 1) return x;
 
-    uint NextTrial = x >> 1;
+		uint NextTrial = x >> 1;
-    uint CurrentAnswer;
+		uint CurrentAnswer;
 
-    do
+		do
-    {
+		{
-        CurrentAnswer = NextTrial;
+			CurrentAnswer = NextTrial;
-        NextTrial = (NextTrial + x / NextTrial) >> 1;
+			NextTrial = (NextTrial + x / NextTrial) >> 1;
-    } while(NextTrial < CurrentAnswer);
+		} while(NextTrial < CurrentAnswer);
 
-    return CurrentAnswer;
+		return CurrentAnswer;
-}
+	}
 
-GLM_FUNC_QUALIFIER uint mod(uint x, uint y)
+	GLM_FUNC_QUALIFIER uint mod(uint x, uint y)
-{
+	{
-	return x - y * (x / y);
+		return x - y * (x / y);
-}
+	}
 
 #if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC))
 
-GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
+	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
-{
+	{
-	return 31u - findMSB(x);
+		return 31u - findMSB(x);
-}
+	}
 
 #else
 
-// Hackers Delight: http://www.hackersdelight.org/HDcode/nlz.c.txt
+	// Hackers Delight: http://www.hackersdelight.org/HDcode/nlz.c.txt
-GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
+	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
-{
+	{
-   int y, m, n;
+	   int y, m, n;
 
-   y = -int(x >> 16);      // If left half of x is 0,
+	   y = -int(x >> 16);      // If left half of x is 0,
-   m = (y >> 16) & 16;  // set n = 16.  If left half
+	   m = (y >> 16) & 16;  // set n = 16.  If left half
-   n = 16 - m;          // is nonzero, set n = 0 and
+	   n = 16 - m;          // is nonzero, set n = 0 and
-   x = x >> m;          // shift x right 16.
+	   x = x >> m;          // shift x right 16.
-                        // Now x is of the form 0000xxxx.
+							// Now x is of the form 0000xxxx.
-   y = x - 0x100;       // If positions 8-15 are 0,
+	   y = x - 0x100;       // If positions 8-15 are 0,
-   m = (y >> 16) & 8;   // add 8 to n and shift x left 8.
+	   m = (y >> 16) & 8;   // add 8 to n and shift x left 8.
-   n = n + m;
+	   n = n + m;
-   x = x << m;
+	   x = x << m;
 
-   y = x - 0x1000;      // If positions 12-15 are 0,
+	   y = x - 0x1000;      // If positions 12-15 are 0,
-   m = (y >> 16) & 4;   // add 4 to n and shift x left 4.
+	   m = (y >> 16) & 4;   // add 4 to n and shift x left 4.
-   n = n + m;
+	   n = n + m;
-   x = x << m;
+	   x = x << m;
 
-   y = x - 0x4000;      // If positions 14-15 are 0,
+	   y = x - 0x4000;      // If positions 14-15 are 0,
-   m = (y >> 16) & 2;   // add 2 to n and shift x left 2.
+	   m = (y >> 16) & 2;   // add 2 to n and shift x left 2.
-   n = n + m;
+	   n = n + m;
-   x = x << m;
+	   x = x << m;
 
-   y = x >> 14;         // Set y = 0, 1, 2, or 3.
+	   y = x >> 14;         // Set y = 0, 1, 2, or 3.
-   m = y & ~(y >> 1);   // Set m = 0, 1, 2, or 2 resp.
+	   m = y & ~(y >> 1);   // Set m = 0, 1, 2, or 2 resp.
-   return unsigned(n + 2 - m);
+	   return unsigned(n + 2 - m);
-}
+	}
 
 #endif//(GLM_COMPILER)
 

glm/gtx/intersect.inl

@@ -10,188 +10,187 @@
 #include <cfloat>
 #include <limits>
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-GLM_FUNC_QUALIFIER bool intersectRayTriangle
-(
-	genType const & orig, genType const & dir,
-	genType const & v0, genType const & v1, genType const & v2,
-	genType & baryPosition
-)
 {
-	genType e1 = v1 - v0;
+	template <typename genType>
-	genType e2 = v2 - v0;
+	GLM_FUNC_QUALIFIER bool intersectRayTriangle
-
+	(
-	genType p = glm::cross(dir, e2);
+		genType const & orig, genType const & dir,
-
+		genType const & v0, genType const & v1, genType const & v2,
-	typename genType::value_type a = glm::dot(e1, p);
+		genType & baryPosition
-
+	)
-	typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-	if(a < Epsilon)
-		return false;
-
-	typename genType::value_type f = typename genType::value_type(1.0f) / a;
-
-	genType s = orig - v0;
-	baryPosition.x = f * glm::dot(s, p);
-	if(baryPosition.x < typename genType::value_type(0.0f))
-		return false;
-	if(baryPosition.x > typename genType::value_type(1.0f))
-		return false;
-
-	genType q = glm::cross(s, e1);
-	baryPosition.y = f * glm::dot(dir, q);
-	if(baryPosition.y < typename genType::value_type(0.0f))
-		return false;
-	if(baryPosition.y + baryPosition.x > typename genType::value_type(1.0f))
-		return false;
-
-	baryPosition.z = f * glm::dot(e2, q);
-
-	return baryPosition.z >= typename genType::value_type(0.0f);
-}
-
-//template <typename genType>
-//GLM_FUNC_QUALIFIER bool intersectRayTriangle
-//(
-//	genType const & orig, genType const & dir,
-//	genType const & vert0, genType const & vert1, genType const & vert2,
-//	genType & position
-//)
-//{
-//	typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-//
-//	genType edge1 = vert1 - vert0;
-//	genType edge2 = vert2 - vert0;
-//
-//	genType pvec = cross(dir, edge2);
-//
-//	float det = dot(edge1, pvec);
-//	if(det < Epsilon)
-//		return false;
-//
-//	genType tvec = orig - vert0;
-//
-//	position.y = dot(tvec, pvec);
-//	if (position.y < typename genType::value_type(0) || position.y > det)
-//		return typename genType::value_type(0);
-//
-//	genType qvec = cross(tvec, edge1);
-//
-//	position.z = dot(dir, qvec);
-//	if (position.z < typename genType::value_type(0) || position.y + position.z > det)
-//		return typename genType::value_type(0);
-//
-//	position.x = dot(edge2, qvec);
-//	position *= typename genType::value_type(1) / det;
-//
-//	return typename genType::value_type(1);
-//}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER bool intersectLineTriangle
-(
-	genType const & orig, genType const & dir,
-	genType const & vert0, genType const & vert1, genType const & vert2,
-	genType & position
-)
-{
-    typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-
-	genType edge1 = vert1 - vert0;
-	genType edge2 = vert2 - vert0;
-
-	genType pvec = cross(dir, edge2);
-
-	float det = dot(edge1, pvec);
-
-	if (det > -Epsilon && det < Epsilon)
-		return false;
-	float inv_det = typename genType::value_type(1) / det;
-
-	genType tvec = orig - vert0;
-
-	position.y = dot(tvec, pvec) * inv_det;
-	if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1))
-		return false;
-
-	genType qvec = cross(tvec, edge1);
-
-	position.z = dot(dir, qvec) * inv_det;
-	if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1))
-		return false;
-
-	position.x = dot(edge2, qvec) * inv_det;
-
-	return true;
-}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER bool intersectRaySphere
-(
-	genType const & rayStarting, genType const & rayDirection,
-	genType const & sphereCenter, typename genType::value_type sphereRadius,
-	genType & position, genType & normal
-)
-{
-	typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-
-	typename genType::value_type a = dot(rayDirection, rayDirection);
-	typename genType::value_type b = typename genType::value_type(2) * dot(rayStarting, rayDirection);
-	typename genType::value_type c = dot(rayStarting, rayStarting) - sphereRadius * sphereRadius;
-	typename genType::value_type d = b * b - typename genType::value_type(4) * a * c;
-	typename genType::value_type e = sqrt(d);
-	typename genType::value_type x1 = (-b - e) / (typename genType::value_type(2) * a);
-	typename genType::value_type x2 = (-b + e) / (typename genType::value_type(2) * a);
-
-	if(x1 > Epsilon)
 	{
-		position = rayStarting + rayDirection * sphereRadius;
+		genType e1 = v1 - v0;
-		normal = (position - sphereCenter) / sphereRadius;
+		genType e2 = v2 - v0;
+
+		genType p = glm::cross(dir, e2);
+
+		typename genType::value_type a = glm::dot(e1, p);
+
+		typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
+		if(a < Epsilon)
+			return false;
+
+		typename genType::value_type f = typename genType::value_type(1.0f) / a;
+
+		genType s = orig - v0;
+		baryPosition.x = f * glm::dot(s, p);
+		if(baryPosition.x < typename genType::value_type(0.0f))
+			return false;
+		if(baryPosition.x > typename genType::value_type(1.0f))
+			return false;
+
+		genType q = glm::cross(s, e1);
+		baryPosition.y = f * glm::dot(dir, q);
+		if(baryPosition.y < typename genType::value_type(0.0f))
+			return false;
+		if(baryPosition.y + baryPosition.x > typename genType::value_type(1.0f))
+			return false;
+
+		baryPosition.z = f * glm::dot(e2, q);
+
+		return baryPosition.z >= typename genType::value_type(0.0f);
+	}
+
+	//template <typename genType>
+	//GLM_FUNC_QUALIFIER bool intersectRayTriangle
+	//(
+	//	genType const & orig, genType const & dir,
+	//	genType const & vert0, genType const & vert1, genType const & vert2,
+	//	genType & position
+	//)
+	//{
+	//	typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
+	//
+	//	genType edge1 = vert1 - vert0;
+	//	genType edge2 = vert2 - vert0;
+	//
+	//	genType pvec = cross(dir, edge2);
+	//
+	//	float det = dot(edge1, pvec);
+	//	if(det < Epsilon)
+	//		return false;
+	//
+	//	genType tvec = orig - vert0;
+	//
+	//	position.y = dot(tvec, pvec);
+	//	if (position.y < typename genType::value_type(0) || position.y > det)
+	//		return typename genType::value_type(0);
+	//
+	//	genType qvec = cross(tvec, edge1);
+	//
+	//	position.z = dot(dir, qvec);
+	//	if (position.z < typename genType::value_type(0) || position.y + position.z > det)
+	//		return typename genType::value_type(0);
+	//
+	//	position.x = dot(edge2, qvec);
+	//	position *= typename genType::value_type(1) / det;
+	//
+	//	return typename genType::value_type(1);
+	//}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER bool intersectLineTriangle
+	(
+		genType const & orig, genType const & dir,
+		genType const & vert0, genType const & vert1, genType const & vert2,
+		genType & position
+	)
+	{
+		typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
+
+		genType edge1 = vert1 - vert0;
+		genType edge2 = vert2 - vert0;
+
+		genType pvec = cross(dir, edge2);
+
+		float det = dot(edge1, pvec);
+
+		if (det > -Epsilon && det < Epsilon)
+			return false;
+		float inv_det = typename genType::value_type(1) / det;
+
+		genType tvec = orig - vert0;
+
+		position.y = dot(tvec, pvec) * inv_det;
+		if (position.y < typename genType::value_type(0) || position.y > typename genType::value_type(1))
+			return false;
+
+		genType qvec = cross(tvec, edge1);
+
+		position.z = dot(dir, qvec) * inv_det;
+		if (position.z < typename genType::value_type(0) || position.y + position.z > typename genType::value_type(1))
+			return false;
+
+		position.x = dot(edge2, qvec) * inv_det;
+
 		return true;
 	}
-	else if(x2 > Epsilon)
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER bool intersectRaySphere
+	(
+		genType const & rayStarting, genType const & rayDirection,
+		genType const & sphereCenter, typename genType::value_type sphereRadius,
+		genType & position, genType & normal
+	)
 	{
-		position = rayStarting + rayDirection * sphereRadius;
+		typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-		normal = (position - sphereCenter) / sphereRadius;
+
-		return true;
+		typename genType::value_type a = dot(rayDirection, rayDirection);
+		typename genType::value_type b = typename genType::value_type(2) * dot(rayStarting, rayDirection);
+		typename genType::value_type c = dot(rayStarting, rayStarting) - sphereRadius * sphereRadius;
+		typename genType::value_type d = b * b - typename genType::value_type(4) * a * c;
+		typename genType::value_type e = sqrt(d);
+		typename genType::value_type x1 = (-b - e) / (typename genType::value_type(2) * a);
+		typename genType::value_type x2 = (-b + e) / (typename genType::value_type(2) * a);
+
+		if(x1 > Epsilon)
+		{
+			position = rayStarting + rayDirection * sphereRadius;
+			normal = (position - sphereCenter) / sphereRadius;
+			return true;
+		}
+		else if(x2 > Epsilon)
+		{
+			position = rayStarting + rayDirection * sphereRadius;
+			normal = (position - sphereCenter) / sphereRadius;
+			return true;
+		}
+		return false;
 	}
-	return false;
-}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER bool intersectLineSphere
+	GLM_FUNC_QUALIFIER bool intersectLineSphere
-(
+	(
-	genType const & point0, genType const & point1,
+		genType const & point0, genType const & point1,
-	genType const & center, typename genType::value_type radius,
+		genType const & center, typename genType::value_type radius,
-	genType & position, genType & normal
+		genType & position, genType & normal
-)
+	)
-{
-	typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-
-    genType dir = point1 - point0;
-    typename genType::value_type a = dot(dir, dir);
-	typename genType::value_type b = typename genType::value_type(2) * dot(center, dir);
-	typename genType::value_type c = dot(center, center) - radius * radius;
-	typename genType::value_type d = b * b - typename genType::value_type(4) * a * c;
-	typename genType::value_type e = sqrt(d);
-	typename genType::value_type x1 = (-b - e) / (typename genType::value_type(2) * a);
-	typename genType::value_type x2 = (-b + e) / (typename genType::value_type(2) * a);
-
-	if(x1 > Epsilon)
 	{
-		position = center + dir * radius;
+		typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
-		normal = (position - center) / radius;
-		return true;
-	}
-	else if(x2 > Epsilon)
-	{
-		position = center + dir * radius;
-		normal = (position - center) / radius;
-		return true;
-	}
-	return false;
-}
 
+		genType dir = point1 - point0;
+		typename genType::value_type a = dot(dir, dir);
+		typename genType::value_type b = typename genType::value_type(2) * dot(center, dir);
+		typename genType::value_type c = dot(center, center) - radius * radius;
+		typename genType::value_type d = b * b - typename genType::value_type(4) * a * c;
+		typename genType::value_type e = sqrt(d);
+		typename genType::value_type x1 = (-b - e) / (typename genType::value_type(2) * a);
+		typename genType::value_type x2 = (-b + e) / (typename genType::value_type(2) * a);
+
+		if(x1 > Epsilon)
+		{
+			position = center + dir * radius;
+			normal = (position - center) / radius;
+			return true;
+		}
+		else if(x2 > Epsilon)
+		{
+			position = center + dir * radius;
+			normal = (position - center) / radius;
+			return true;
+		}
+		return false;
+	}
 }//namespace glm

glm/gtx/log_base.inl

@@ -7,82 +7,20 @@
 // File    : glm/gtx/log_base.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-template <typename genType> 
+namespace glm
-GLM_FUNC_QUALIFIER genType log(
-	genType const & x, 
-	genType const & base)
 {
-	assert(x != genType(0));
+	template <typename genType> 
+	GLM_FUNC_QUALIFIER genType log(
+		genType const & x, 
+		genType const & base)
+	{
+		assert(x != genType(0));
 
-	return glm::log(x) / glm::log(base);
+		return glm::log(x) / glm::log(base);
-}
+	}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec2<valType> log(
-	detail::tvec2<valType> const & v, 
-	valType const & base)
-{
-	return detail::tvec2<valType>(
-		log(v.x, base),
-		log(v.y, base));
-}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> log(
-	detail::tvec3<valType> const & v, 
-	valType const & base)
-{
-	return detail::tvec3<valType>(
-		log(v.x, base),
-		log(v.y, base),
-		log(v.z, base));
-}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec4<valType> log(
-	detail::tvec4<valType> const & v, 
-	valType const & base)
-{
-	return detail::tvec4<valType>(
-		log(v.x, base),
-		log(v.y, base),
-		log(v.z, base),
-		log(v.w, base));
-}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec2<valType> log(
-	detail::tvec2<valType> const & v, 
-	detail::tvec2<valType> const & base)
-{
-	return detail::tvec2<valType>(
-		log(v.x, base.x),
-		log(v.y, base.y));
-}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> log(
-	detail::tvec3<valType> const & v, 
-	detail::tvec3<valType> const & base)
-{
-	return detail::tvec3<valType>(
-		log(v.x, base.x),
-		log(v.y, base.y),
-		log(v.z, base.z));
-}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec4<valType> log(
-	detail::tvec4<valType> const & v, 
-	detail::tvec4<valType> const & base)
-{
-	return detail::tvec4<valType>(
-		log(v.x, base.x),
-		log(v.y, base.y),
-		log(v.z, base.z),
-		log(v.w, base.w));
-}
 
+	VECTORIZE_VEC_SCA(log)
+	VECTORIZE_VEC_VEC(log)
 }//namespace glm

glm/gtx/matrix_cross_product.inl

@@ -7,34 +7,38 @@
 // File    : glm/gtx/matrix_cross_product.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> matrixCross3(
-    detail::tvec3<T> const & x)
 {
-    detail::tmat3x3<T> Result(T(0));
+	template <typename T> 
-    Result[0][1] = x.z;
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> matrixCross3
-    Result[1][0] = -x.z;
+	(
-    Result[0][2] = -x.y;
+		detail::tvec3<T> const & x
-    Result[2][0] = x.y;
+	)
-    Result[1][2] = x.x;
+	{
-    Result[2][1] = -x.x;
+		detail::tmat3x3<T> Result(T(0));
-    return Result;
+		Result[0][1] = x.z;
-}
+		Result[1][0] = -x.z;
+		Result[0][2] = -x.y;
+		Result[2][0] = x.y;
+		Result[1][2] = x.x;
+		Result[2][1] = -x.x;
+		return Result;
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> matrixCross4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> matrixCross4
-    detail::tvec3<T> const & x)
+	(
-{
+		detail::tvec3<T> const & x
-    detail::tmat4x4<T> Result(T(0));
+	)
-    Result[0][1] = x.z;
+	{
-    Result[1][0] = -x.z;
+		detail::tmat4x4<T> Result(T(0));
-    Result[0][2] = -x.y;
+		Result[0][1] = x.z;
-    Result[2][0] = x.y;
+		Result[1][0] = -x.z;
-    Result[1][2] = x.x;
+		Result[0][2] = -x.y;
-    Result[2][1] = -x.x;
+		Result[2][0] = x.y;
-    return Result;
+		Result[1][2] = x.x;
-}
+		Result[2][1] = -x.x;
+		return Result;
+	}
 
 }//namespace glm

glm/gtx/matrix_interpolation.inl

@@ -7,107 +7,112 @@
 // File    : glm/gtx/matrix_interpolation.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER void axisAngle(
-    detail::tmat4x4<T> const & mat,
-    detail::tvec3<T> & axis,
-    T & angle)
 {
-    T epsilon = (T)0.01;
+	template <typename T>
-    T epsilon2 = (T)0.1;
+	GLM_FUNC_QUALIFIER void axisAngle
+	(
+		detail::tmat4x4<T> const & mat,
+		detail::tvec3<T> & axis,
+		T & angle
+	)
+	{
+		T epsilon = (T)0.01;
+		T epsilon2 = (T)0.1;
 
-    if ((fabs(mat[1][0] - mat[0][1]) < epsilon) && (fabs(mat[2][0] - mat[0][2]) < epsilon) && (fabs(mat[2][1] - mat[1][2]) < epsilon)) {
+		if ((fabs(mat[1][0] - mat[0][1]) < epsilon) && (fabs(mat[2][0] - mat[0][2]) < epsilon) && (fabs(mat[2][1] - mat[1][2]) < epsilon)) {
-        if ((fabs(mat[1][0] + mat[0][1]) < epsilon2) && (fabs(mat[2][0] + mat[0][2]) < epsilon2) && (fabs(mat[2][1] + mat[1][2]) < epsilon2) && (fabs(mat[0][0] + mat[1][1] + mat[2][2] - (T)3.0) < epsilon2)) {
+			if ((fabs(mat[1][0] + mat[0][1]) < epsilon2) && (fabs(mat[2][0] + mat[0][2]) < epsilon2) && (fabs(mat[2][1] + mat[1][2]) < epsilon2) && (fabs(mat[0][0] + mat[1][1] + mat[2][2] - (T)3.0) < epsilon2)) {
-            angle = (T)0.0;
+				angle = (T)0.0;
-            axis.x = (T)1.0;
+				axis.x = (T)1.0;
-            axis.y = (T)0.0;
+				axis.y = (T)0.0;
-            axis.z = (T)0.0;
+				axis.z = (T)0.0;
-            return;
+				return;
-        }
+			}
-        angle = T(3.1415926535897932384626433832795);
+			angle = T(3.1415926535897932384626433832795);
-        T xx = (mat[0][0] + (T)1.0) / (T)2.0;
+			T xx = (mat[0][0] + (T)1.0) / (T)2.0;
-        T yy = (mat[1][1] + (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;
+			T zz = (mat[2][2] + (T)1.0) / (T)2.0;
-        T xy = (mat[1][0] + mat[0][1]) / (T)4.0;
+			T xy = (mat[1][0] + mat[0][1]) / (T)4.0;
-        T xz = (mat[2][0] + mat[0][2]) / (T)4.0;
+			T xz = (mat[2][0] + mat[0][2]) / (T)4.0;
-        T yz = (mat[2][1] + mat[1][2]) / (T)4.0;
+			T yz = (mat[2][1] + mat[1][2]) / (T)4.0;
-        if ((xx > yy) && (xx > zz)) {
+			if ((xx > yy) && (xx > zz)) {
-            if (xx < epsilon) {
+				if (xx < epsilon) {
-                axis.x = (T)0.0;
+					axis.x = (T)0.0;
-                axis.y = (T)0.7071;
+					axis.y = (T)0.7071;
-                axis.z = (T)0.7071;
+					axis.z = (T)0.7071;
-            } else {
+				} else {
-                axis.x = sqrt(xx);
+					axis.x = sqrt(xx);
-                axis.y = xy / axis.x;
+					axis.y = xy / axis.x;
-                axis.z = xz / axis.x;
+					axis.z = xz / axis.x;
-            }
+				}
-        } else if (yy > zz) {
+			} else if (yy > zz) {
-            if (yy < epsilon) {
+				if (yy < epsilon) {
-                axis.x = (T)0.7071;
+					axis.x = (T)0.7071;
-                axis.y = (T)0.0;
+					axis.y = (T)0.0;
-                axis.z = (T)0.7071;
+					axis.z = (T)0.7071;
-            } else {
+				} else {
-                axis.y = sqrt(yy);
+					axis.y = sqrt(yy);
-                axis.x = xy / axis.y;
+					axis.x = xy / axis.y;
-                axis.z = yz / axis.y;
+					axis.z = yz / axis.y;
-            }
+				}
-        } else {
+			} else {
-            if (zz < epsilon) {
+				if (zz < epsilon) {
-                axis.x = (T)0.7071;
+					axis.x = (T)0.7071;
-                axis.y = (T)0.7071;
+					axis.y = (T)0.7071;
-                axis.z = (T)0.0;
+					axis.z = (T)0.0;
-            } else {
+				} else {
-                axis.z = sqrt(zz);
+					axis.z = sqrt(zz);
-                axis.x = xz / axis.z;
+					axis.x = xz / axis.z;
-                axis.y = yz / axis.z;
+					axis.y = yz / axis.z;
-            }
+				}
-        }
+			}
-        return;
+			return;
-    }
+		}
-    T s = sqrt((mat[2][1] - mat[1][2]) * (mat[2][1] - mat[1][2]) + (mat[2][0] - mat[0][2]) * (mat[2][0] - mat[0][2]) + (mat[1][0] - mat[0][1]) * (mat[1][0] - mat[0][1]));
+		T s = sqrt((mat[2][1] - mat[1][2]) * (mat[2][1] - mat[1][2]) + (mat[2][0] - mat[0][2]) * (mat[2][0] - mat[0][2]) + (mat[1][0] - mat[0][1]) * (mat[1][0] - mat[0][1]));
-    if (glm::abs(s) < T(0.001))
+		if (glm::abs(s) < T(0.001))
-        s = (T)1.0;
+			s = (T)1.0;
-    angle = acos((mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) / (T)2.0);
+		angle = acos((mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) / (T)2.0);
-    axis.x = (mat[1][2] - mat[2][1]) / s;
+		axis.x = (mat[1][2] - mat[2][1]) / s;
-    axis.y = (mat[2][0] - mat[0][2]) / s;
+		axis.y = (mat[2][0] - mat[0][2]) / s;
-    axis.z = (mat[0][1] - mat[1][0]) / s;
+		axis.z = (mat[0][1] - mat[1][0]) / s;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> axisAngleMatrix(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> axisAngleMatrix
-	detail::tvec3<T> const & axis,
+	(
-	T const angle)
+		detail::tvec3<T> const & axis,
-{
+		T const angle
-    T c = cos(angle);
+	)
-    T s = sin(angle);
+	{
-    T t = T(1) - c;
+		T c = cos(angle);
-    detail::tvec3<T> n = normalize(axis);
+		T s = sin(angle);
+		T t = T(1) - c;
+		detail::tvec3<T> n = normalize(axis);
 
-    return detail::tmat4x4<T>(
+		return detail::tmat4x4<T>(
-        t * n.x * n.x + c,          t * n.x * n.y + n.z * s,    t * n.x * n.z - n.y * s,    T(0),
+			t * n.x * n.x + c,          t * n.x * n.y + n.z * s,    t * n.x * n.z - n.y * s,    T(0),
-        t * n.x * n.y - n.z * s,    t * n.y * n.y + c,          t * n.y * n.z + n.x * s,    T(0),
+			t * n.x * n.y - n.z * s,    t * n.y * n.y + c,          t * n.y * n.z + n.x * s,    T(0),
-        t * n.x * n.z + n.y * s,    t * n.y * n.z - n.x * s,    t * n.z * n.z + c,          T(0),
+			t * n.x * n.z + n.y * s,    t * n.y * n.z - n.x * s,    t * n.z * n.z + c,          T(0),
-        T(0),                        T(0),                        T(0),                     T(1)
+			T(0),                        T(0),                        T(0),                     T(1)
-    );
+		);
-}
+	}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> interpolate(
-	detail::tmat4x4<T> const & m1,
-	detail::tmat4x4<T> const & m2,
-	T const delta)
-{
-	detail::tmat4x4<T> dltRotation = m2 * transpose(m1);
-	detail::tvec3<T> dltAxis;
-	T dltAngle;
-	axisAngle(dltRotation, dltAxis, dltAngle);
-	detail::tmat4x4<T> out = axisAngleMatrix(dltAxis, dltAngle * delta) * rotationMatrix(m1);
-	out[3][0] = m1[3][0] + delta * (m2[3][0] - m1[3][0]);
-	out[3][1] = m1[3][1] + delta * (m2[3][1] - m1[3][1]);
-	out[3][2] = m1[3][2] + delta * (m2[3][2] - m1[3][2]);
-	return out;
-}
 
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> interpolate
+	(
+		detail::tmat4x4<T> const & m1,
+		detail::tmat4x4<T> const & m2,
+		T const delta
+	)
+	{
+		detail::tmat4x4<T> dltRotation = m2 * transpose(m1);
+		detail::tvec3<T> dltAxis;
+		T dltAngle;
+		axisAngle(dltRotation, dltAxis, dltAngle);
+		detail::tmat4x4<T> out = axisAngleMatrix(dltAxis, dltAngle * delta) * rotationMatrix(m1);
+		out[3][0] = m1[3][0] + delta * (m2[3][0] - m1[3][0]);
+		out[3][1] = m1[3][1] + delta * (m2[3][1] - m1[3][1]);
+		out[3][2] = m1[3][2] + delta * (m2[3][2] - m1[3][2]);
+		return out;
+	}
 }//namespace glm

glm/gtx/matrix_major_storage.hpp

@@ -55,85 +55,85 @@ namespace glm
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat2x2<T> rowMajor2(
-		const detail::tvec2<T>& v1, 
+		detail::tvec2<T> const & v1, 
-		const detail::tvec2<T>& v2);
+		detail::tvec2<T> const & v2);
 		
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat2x2<T> rowMajor2(
-		const detail::tmat2x2<T>& m);
+		detail::tmat2x2<T> const & m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat3x3<T> rowMajor3(
-		const detail::tvec3<T>& v1, 
+		detail::tvec3<T> const & v1, 
-		const detail::tvec3<T>& v2, 
+		detail::tvec3<T> const & v2, 
-		const detail::tvec3<T>& v3);
+		detail::tvec3<T> const & v3);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat3x3<T> rowMajor3(
-		const detail::tmat3x3<T>& m);
+		detail::tmat3x3<T> const & m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat4x4<T> rowMajor4(
-		const detail::tvec4<T>& v1, 
+		detail::tvec4<T> const & v1, 
-		const detail::tvec4<T>& v2,
+		detail::tvec4<T> const & v2,
-		const detail::tvec4<T>& v3, 
+		detail::tvec4<T> const & v3, 
-		const detail::tvec4<T>& v4);
+		detail::tvec4<T> const & v4);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat4x4<T> rowMajor4(
-		const detail::tmat4x4<T>& m);
+		detail::tmat4x4<T> const & m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat2x2<T> colMajor2(
-		const detail::tvec2<T>& v1, 
+		detail::tvec2<T> const & v1, 
-		const detail::tvec2<T>& v2);
+		detail::tvec2<T> const & v2);
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat2x2<T> colMajor2(
-		const detail::tmat2x2<T>& m);
+		detail::tmat2x2<T> const & m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat3x3<T> colMajor3(
-		const detail::tvec3<T>& v1, 
+		detail::tvec3<T> const & v1, 
-		const detail::tvec3<T>& v2, 
+		detail::tvec3<T> const & v2, 
-		const detail::tvec3<T>& v3);
+		detail::tvec3<T> const & v3);
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat3x3<T> colMajor3(
-		const detail::tmat3x3<T>& m);
+		detail::tmat3x3<T> const & m);
 		
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat4x4<T> colMajor4(
-		const detail::tvec4<T>& v1, 
+		detail::tvec4<T> const & v1, 
-		const detail::tvec4<T>& v2, 
+		detail::tvec4<T> const & v2, 
-		const detail::tvec4<T>& v3, 
+		detail::tvec4<T> const & v3, 
-		const detail::tvec4<T>& v4);
+		detail::tvec4<T> const & v4);
 				
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
 	template <typename T> 
 	detail::tmat4x4<T> colMajor4(
-		const detail::tmat4x4<T>& m);
+		detail::tmat4x4<T> const & m);
 
 	/// @}
 }//namespace glm

glm/gtx/matrix_major_storage.inl

@@ -7,166 +7,167 @@
 // File    : glm/gtx/matrix_major_storage.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<T> rowMajor2(
-	const detail::tvec2<T>& v1, 
-	const detail::tvec2<T>& v2)
 {
-    detail::tmat2x2<T> Result;
+	template <typename T> 
-    Result[0][0] = v1.x;
+	GLM_FUNC_QUALIFIER detail::tmat2x2<T> rowMajor2
-    Result[1][0] = v1.y;
+	(
-    Result[0][1] = v2.x;
+		detail::tvec2<T> const & v1, 
-    Result[1][1] = v2.y;
+		detail::tvec2<T> const & v2
-    return Result;
+	)
-}
+	{
+		detail::tmat2x2<T> Result;
+		Result[0][0] = v1.x;
+		Result[1][0] = v1.y;
+		Result[0][1] = v2.x;
+		Result[1][1] = v2.y;
+		return Result;
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<T> rowMajor2(
+	GLM_FUNC_QUALIFIER detail::tmat2x2<T> rowMajor2(
-	const detail::tmat2x2<T>& m)
+		const detail::tmat2x2<T>& m)
-{
+	{
-    detail::tmat2x2<T> Result;
+		detail::tmat2x2<T> Result;
-    Result[0][0] = m[0][0];
+		Result[0][0] = m[0][0];
-    Result[0][1] = m[1][0];
+		Result[0][1] = m[1][0];
-    Result[1][0] = m[0][1];
+		Result[1][0] = m[0][1];
-    Result[1][1] = m[1][1];
+		Result[1][1] = m[1][1];
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> rowMajor3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> rowMajor3(
-	const detail::tvec3<T>& v1, 
+		const detail::tvec3<T>& v1, 
-	const detail::tvec3<T>& v2, 
+		const detail::tvec3<T>& v2, 
-	const detail::tvec3<T>& v3)
+		const detail::tvec3<T>& v3)
-{
+	{
-    detail::tmat3x3<T> Result;
+		detail::tmat3x3<T> Result;
-    Result[0][0] = v1.x;
+		Result[0][0] = v1.x;
-    Result[1][0] = v1.y;
+		Result[1][0] = v1.y;
-    Result[2][0] = v1.z;
+		Result[2][0] = v1.z;
-    Result[0][1] = v2.x;
+		Result[0][1] = v2.x;
-    Result[1][1] = v2.y;
+		Result[1][1] = v2.y;
-    Result[2][1] = v2.z;
+		Result[2][1] = v2.z;
-    Result[0][2] = v3.x;
+		Result[0][2] = v3.x;
-    Result[1][2] = v3.y;
+		Result[1][2] = v3.y;
-    Result[2][2] = v3.z;
+		Result[2][2] = v3.z;
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> rowMajor3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> rowMajor3(
-	const detail::tmat3x3<T>& m)
+		const detail::tmat3x3<T>& m)
-{
+	{
-    detail::tmat3x3<T> Result;
+		detail::tmat3x3<T> Result;
-    Result[0][0] = m[0][0];
+		Result[0][0] = m[0][0];
-    Result[0][1] = m[1][0];
+		Result[0][1] = m[1][0];
-    Result[0][2] = m[2][0];
+		Result[0][2] = m[2][0];
-    Result[1][0] = m[0][1];
+		Result[1][0] = m[0][1];
-    Result[1][1] = m[1][1];
+		Result[1][1] = m[1][1];
-    Result[1][2] = m[2][1];
+		Result[1][2] = m[2][1];
-    Result[2][0] = m[0][2];
+		Result[2][0] = m[0][2];
-    Result[2][1] = m[1][2];
+		Result[2][1] = m[1][2];
-    Result[2][2] = m[2][2];
+		Result[2][2] = m[2][2];
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> rowMajor4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> rowMajor4(
-	const detail::tvec4<T>& v1, 
+		const detail::tvec4<T>& v1, 
-	const detail::tvec4<T>& v2, 
+		const detail::tvec4<T>& v2, 
-	const detail::tvec4<T>& v3, 
+		const detail::tvec4<T>& v3, 
-	const detail::tvec4<T>& v4)
+		const detail::tvec4<T>& v4)
-{
+	{
-    detail::tmat4x4<T> Result;
+		detail::tmat4x4<T> Result;
-    Result[0][0] = v1.x;
+		Result[0][0] = v1.x;
-    Result[1][0] = v1.y;
+		Result[1][0] = v1.y;
-    Result[2][0] = v1.z;
+		Result[2][0] = v1.z;
-    Result[3][0] = v1.w;
+		Result[3][0] = v1.w;
-    Result[0][1] = v2.x;
+		Result[0][1] = v2.x;
-    Result[1][1] = v2.y;
+		Result[1][1] = v2.y;
-    Result[2][1] = v2.z;
+		Result[2][1] = v2.z;
-    Result[3][1] = v2.w;
+		Result[3][1] = v2.w;
-    Result[0][2] = v3.x;
+		Result[0][2] = v3.x;
-    Result[1][2] = v3.y;
+		Result[1][2] = v3.y;
-    Result[2][2] = v3.z;
+		Result[2][2] = v3.z;
-    Result[3][2] = v3.w;
+		Result[3][2] = v3.w;
-    Result[0][3] = v4.x;
+		Result[0][3] = v4.x;
-    Result[1][3] = v4.y;
+		Result[1][3] = v4.y;
-    Result[2][3] = v4.z;
+		Result[2][3] = v4.z;
-    Result[3][3] = v4.w;
+		Result[3][3] = v4.w;
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> rowMajor4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> rowMajor4(
-	const detail::tmat4x4<T>& m)
+		const detail::tmat4x4<T>& m)
-{
+	{
-    detail::tmat4x4<T> Result;
+		detail::tmat4x4<T> Result;
-    Result[0][0] = m[0][0];
+		Result[0][0] = m[0][0];
-    Result[0][1] = m[1][0];
+		Result[0][1] = m[1][0];
-    Result[0][2] = m[2][0];
+		Result[0][2] = m[2][0];
-    Result[0][3] = m[3][0];
+		Result[0][3] = m[3][0];
-    Result[1][0] = m[0][1];
+		Result[1][0] = m[0][1];
-    Result[1][1] = m[1][1];
+		Result[1][1] = m[1][1];
-    Result[1][2] = m[2][1];
+		Result[1][2] = m[2][1];
-    Result[1][3] = m[3][1];
+		Result[1][3] = m[3][1];
-    Result[2][0] = m[0][2];
+		Result[2][0] = m[0][2];
-    Result[2][1] = m[1][2];
+		Result[2][1] = m[1][2];
-    Result[2][2] = m[2][2];
+		Result[2][2] = m[2][2];
-    Result[2][3] = m[3][2];
+		Result[2][3] = m[3][2];
-    Result[3][0] = m[0][3];
+		Result[3][0] = m[0][3];
-    Result[3][1] = m[1][3];
+		Result[3][1] = m[1][3];
-    Result[3][2] = m[2][3];
+		Result[3][2] = m[2][3];
-    Result[3][3] = m[3][3];
+		Result[3][3] = m[3][3];
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<T> colMajor2(
+	GLM_FUNC_QUALIFIER detail::tmat2x2<T> colMajor2(
-	const detail::tvec2<T>& v1, 
+		const detail::tvec2<T>& v1, 
-	const detail::tvec2<T>& v2)
+		const detail::tvec2<T>& v2)
-{
+	{
-    return detail::tmat2x2<T>(v1, v2);
+		return detail::tmat2x2<T>(v1, v2);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<T> colMajor2(
+	GLM_FUNC_QUALIFIER detail::tmat2x2<T> colMajor2(
-	const detail::tmat2x2<T>& m)
+		const detail::tmat2x2<T>& m)
-{
+	{
-    return detail::tmat2x2<T>(m);
+		return detail::tmat2x2<T>(m);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> colMajor3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> colMajor3(
-	const detail::tvec3<T>& v1, 
+		const detail::tvec3<T>& v1, 
-	const detail::tvec3<T>& v2, 
+		const detail::tvec3<T>& v2, 
-	const detail::tvec3<T>& v3)
+		const detail::tvec3<T>& v3)
-{
+	{
-    return detail::tmat3x3<T>(v1, v2, v3);
+		return detail::tmat3x3<T>(v1, v2, v3);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> colMajor3(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> colMajor3(
-	const detail::tmat3x3<T>& m)
+		const detail::tmat3x3<T>& m)
-{
+	{
-    return detail::tmat3x3<T>(m);
+		return detail::tmat3x3<T>(m);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> colMajor4(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> colMajor4(
-	const detail::tvec4<T>& v1, 
+		const detail::tvec4<T>& v1, 
-	const detail::tvec4<T>& v2, 
+		const detail::tvec4<T>& v2, 
-	const detail::tvec4<T>& v3, 
+		const detail::tvec4<T>& v3, 
-	const detail::tvec4<T>& v4)
+		const detail::tvec4<T>& v4)
-{
+	{
-    return detail::tmat4x4<T>(v1, v2, v3, v4);
+		return detail::tmat4x4<T>(v1, v2, v3, v4);
-}
+	}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> colMajor4(
-	const detail::tmat4x4<T>& m)
-{
-    return detail::tmat4x4<T>(m);
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> colMajor4(
+		const detail::tmat4x4<T>& m)
+	{
+		return detail::tmat4x4<T>(m);
+	}
 }//namespace glm

glm/gtx/matrix_operation.inl

@@ -7,119 +7,118 @@
 // File    : glm/gtx/matrix_operation.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat2x2<valType> diagonal2x2
-(
-	detail::tvec2<valType> const & v
-)
 {
-	detail::tmat2x2<valType> Result(valType(1));
+	template <typename valType> 
-	Result[0][0] = v[0];
+	GLM_FUNC_QUALIFIER detail::tmat2x2<valType> diagonal2x2
-	Result[1][1] = v[1];
+	(
-	return Result;
+		detail::tvec2<valType> const & v
-}
+	)
+	{
+		detail::tmat2x2<valType> Result(valType(1));
+		Result[0][0] = v[0];
+		Result[1][1] = v[1];
+		return Result;
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat2x3<valType> diagonal2x3
+	GLM_FUNC_QUALIFIER detail::tmat2x3<valType> diagonal2x3
-(
+	(
-	detail::tvec2<valType> const & v
+		detail::tvec2<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat2x3<valType> Result(valType(1));
+		detail::tmat2x3<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat2x4<valType> diagonal2x4
+	GLM_FUNC_QUALIFIER detail::tmat2x4<valType> diagonal2x4
-(
+	(
-	detail::tvec2<valType> const & v
+		detail::tvec2<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat2x4<valType> Result(valType(1));
+		detail::tmat2x4<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat3x2<valType> diagonal3x2
+	GLM_FUNC_QUALIFIER detail::tmat3x2<valType> diagonal3x2
-(
+	(
-	detail::tvec2<valType> const & v
+		detail::tvec2<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat3x2<valType> Result(valType(1));
+		detail::tmat3x2<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<valType> diagonal3x3
+	GLM_FUNC_QUALIFIER detail::tmat3x3<valType> diagonal3x3
-(
+	(
-	detail::tvec3<valType> const & v
+		detail::tvec3<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat3x3<valType> Result(valType(1));
+		detail::tmat3x3<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	Result[2][2] = v[2];
+		Result[2][2] = v[2];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat3x4<valType> diagonal3x4
+	GLM_FUNC_QUALIFIER detail::tmat3x4<valType> diagonal3x4
-(
+	(
-	detail::tvec3<valType> const & v
+		detail::tvec3<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat3x4<valType> Result(valType(1));
+		detail::tmat3x4<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	Result[2][2] = v[2];
+		Result[2][2] = v[2];
-	return Result;
+		return Result;
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<valType> diagonal4x4
+	GLM_FUNC_QUALIFIER detail::tmat4x4<valType> diagonal4x4
-(
+	(
-	detail::tvec4<valType> const & v
+		detail::tvec4<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat4x4<valType> Result(valType(1));
+		detail::tmat4x4<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	Result[2][2] = v[2];
+		Result[2][2] = v[2];
-	Result[3][3] = v[3];
+		Result[3][3] = v[3];
-	return Result;		
+		return Result;		
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x3<valType> diagonal4x3
+	GLM_FUNC_QUALIFIER detail::tmat4x3<valType> diagonal4x3
-(
+	(
-	detail::tvec3<valType> const & v
+		detail::tvec3<valType> const & v
-)
+	)
-{
+	{
-	detail::tmat4x3<valType> Result(valType(1));
+		detail::tmat4x3<valType> Result(valType(1));
-	Result[0][0] = v[0];
+		Result[0][0] = v[0];
-	Result[1][1] = v[1];
+		Result[1][1] = v[1];
-	Result[2][2] = v[2];
+		Result[2][2] = v[2];
-	return Result;		
+		return Result;		
-}
+	}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tmat4x2<valType> diagonal4x2
-(
-	detail::tvec2<valType> const & v
-)
-{
-	detail::tmat4x2<valType> Result(valType(1));
-	Result[0][0] = v[0];
-	Result[1][1] = v[1];
-	return Result;		
-}
 
+	template <typename valType> 
+	GLM_FUNC_QUALIFIER detail::tmat4x2<valType> diagonal4x2
+	(
+		detail::tvec2<valType> const & v
+	)
+	{
+		detail::tmat4x2<valType> Result(valType(1));
+		Result[0][0] = v[0];
+		Result[1][1] = v[1];
+		return Result;		
+	}
 }//namespace glm

glm/gtx/matrix_query.hpp

@@ -56,57 +56,57 @@ namespace glm
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNull(
-		const detail::tmat2x2<T>& m, 
+		detail::tmat2x2<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 		
 	//! Return if a matrix a null matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNull(
-		const detail::tmat3x3<T>& m, 
+		detail::tmat3x3<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 		
 	//! Return if a matrix a null matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNull(
-		const detail::tmat4x4<T>& m, 
+		detail::tmat4x4<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 			
 	//! Return if a matrix an identity matrix. 
 	//! From GLM_GTX_matrix_query extension.
 	template<typename genType> 
 	bool isIdentity(
-		const genType& m, 
+		genType const & m, 
-		const typename genType::value_type epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
 	//! Return if a matrix a normalized matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNormalized(
-		const detail::tmat2x2<T>& m, 
+		detail::tmat2x2<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 		
 	//! Return if a matrix a normalized matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNormalized(
-		const detail::tmat3x3<T>& m, 
+		detail::tmat3x3<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 		
 	//! Return if a matrix a normalized matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename T> 
 	bool isNormalized(
-		const detail::tmat4x4<T>& m, 
+		detail::tmat4x4<T> const & m, 
-		const T epsilon = std::numeric_limits<T>::epsilon());
+		T const & epsilon = std::numeric_limits<T>::epsilon());
 
 	//! Return if a matrix an orthonormalized matrix.
 	//! From GLM_GTX_matrix_query extension.
 	template<typename genType> 
 	bool isOrthogonal(
-		const genType& m, 
+		genType const & m, 
-		const typename genType::value_type epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
 	/// @}
 }//namespace glm

glm/gtx/matrix_query.inl

@@ -10,131 +10,145 @@
 // - GLM core
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNull(
-	const detail::tmat2x2<T>& m, 
-	const T epsilon)
 {
-	bool result = true;
+	template<typename T> 
-	for(int i = 0; result && i < 2 ; ++i)
+	GLM_FUNC_QUALIFIER bool isNull
-		result = isNull(m[i], epsilon);
+	(
-	return result;
+		detail::tmat2x2<T> const & m, 
-}
+		T const & epsilon)
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNull(
-	const detail::tmat3x3<T>& m, 
-	const T epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < 3 ; ++i)
-		result = isNull(m[i], epsilon);
-	return result;
-}
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNull(
-	const detail::tmat4x4<T>& m, 
-	const T epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < 4 ; ++i)
-		result = isNull(m[i], epsilon);
-	return result;
-}
-
-template<typename genType> 
-GLM_FUNC_QUALIFIER bool isIdentity(
-	const genType& m, 
-	const typename genType::value_type epsilon)
-{
-	bool result = true;
-	for(typename genType::value_type i = typename genType::value_type(0); result && i < genType::col_size(); ++i)
 	{
-		for(typename genType::value_type j = typename genType::value_type(0); result && j < i ; ++j)
+		bool result = true;
-			result = abs(m[i][j]) <= epsilon;
+		for(int i = 0; result && i < 2 ; ++i)
+			result = isNull(m[i], epsilon);
+		return result;
+	}
+
+	template<typename T> 
+	GLM_FUNC_QUALIFIER bool isNull
+	(
+		detail::tmat3x3<T> const & m, 
+		T const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < 3 ; ++i)
+			result = isNull(m[i], epsilon);
+		return result;
+	}
+
+	template<typename T> 
+	GLM_FUNC_QUALIFIER bool isNull
+	(
+		detail::tmat4x4<T> const & m, 
+		T const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < 4 ; ++i)
+			result = isNull(m[i], epsilon);
+		return result;
+	}
+
+	template<typename genType> 
+	GLM_FUNC_QUALIFIER bool isIdentity
+	(
+		genType const & m, 
+		typename genType::value_type const & epsilon
+	)
+	{
+		bool result = true;
+		for(typename genType::value_type i = typename genType::value_type(0); result && i < genType::col_size(); ++i)
+		{
+			for(typename genType::value_type j = typename genType::value_type(0); result && j < i ; ++j)
+				result = abs(m[i][j]) <= epsilon;
+			if(result)
+				result = abs(m[i][i] - typename genType::value_type(1)) <= epsilon;
+			for(typename genType::value_type j = i + typename genType::value_type(1); result && j < genType::row_size(); ++j)
+				result = abs(m[i][j]) <= epsilon;
+		}
+		return result;
+	}
+
+	template<typename T> 
+	GLM_FUNC_QUALIFIER bool isNormalized
+	(
+		detail::tmat2x2<T> const & m, 
+		T const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < 2; ++i)
+			result = isNormalized(m[i], epsilon);
+		for(int i = 0; result && i < 2; ++i)
+		{
+			detail::tvec2<T> v;
+			for(int j = 0; j < 2; ++j)
+				v[j] = m[j][i];
+			result = isNormalized(v, epsilon);
+		}
+		return result;
+	}
+
+	template<typename T> 
+	GLM_FUNC_QUALIFIER bool isNormalized
+	(
+		detail::tmat3x3<T> const & m, 
+		T const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < 3; ++i)
+			result = isNormalized(m[i], epsilon);
+		for(int i = 0; result && i < 3; ++i)
+		{
+			detail::tvec3<T> v;
+			for(int j = 0; j < 3; ++j)
+				v[j] = m[j][i];
+			result = isNormalized(v, epsilon);
+		}
+		return result;
+	}
+
+	template<typename T> 
+	GLM_FUNC_QUALIFIER bool isNormalized
+	(
+		detail::tmat4x4<T> const & m, 
+		T const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < 4; ++i)
+			result = isNormalized(m[i], epsilon);
+		for(int i = 0; result && i < 4; ++i)
+		{
+			detail::tvec4<T> v;
+			for(int j = 0; j < 4; ++j)
+				v[j] = m[j][i];
+			result = isNormalized(v, epsilon);
+		}
+		return result;
+	}
+
+	template<typename genType> 
+	GLM_FUNC_QUALIFIER bool isOrthogonal
+	(
+		genType const & m, 
+		typename genType::value_type const & epsilon
+	)
+	{
+		bool result = true;
+		for(int i = 0; result && i < genType::col_size() - 1; ++i)
+		for(int j= i + 1; result && j < genType::col_size(); ++j)
+			result = areOrthogonal(m[i], m[j], epsilon);
+
 		if(result)
-			result = abs(m[i][i] - typename genType::value_type(1)) <= epsilon;
+		{
-		for(typename genType::value_type j = i + typename genType::value_type(1); result && j < genType::row_size(); ++j)
+			genType tmp = transpose(m);
-			result = abs(m[i][j]) <= epsilon;
+			for(int i = 0; result && i < genType::col_size() - 1 ; ++i)
+			for(int j = i + 1; result && j < genType::col_size(); ++j)
+				result = areOrthogonal(tmp[i], tmp[j], epsilon);
+		}
+		return result;
 	}
-	return result;
-}
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNormalized(
-	const detail::tmat2x2<T>& m, 
-	const T epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < 2; ++i)
-		result = isNormalized(m[i], epsilon);
-	for(int i = 0; result && i < 2; ++i)
-	{
-		detail::tvec2<T> v;
-		for(int j = 0; j < 2; ++j)
-			v[j] = m[j][i];
-		result = isNormalized(v, epsilon);
-	}
-	return result;
-}
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNormalized(
-	const detail::tmat3x3<T>& m, 
-	const T epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < 3; ++i)
-		result = isNormalized(m[i], epsilon);
-	for(int i = 0; result && i < 3; ++i)
-	{
-		detail::tvec3<T> v;
-		for(int j = 0; j < 3; ++j)
-			v[j] = m[j][i];
-		result = isNormalized(v, epsilon);
-	}
-	return result;
-}
-
-template<typename T> 
-GLM_FUNC_QUALIFIER bool isNormalized(
-	const detail::tmat4x4<T>& m, 
-	const T epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < 4; ++i)
-		result = isNormalized(m[i], epsilon);
-	for(int i = 0; result && i < 4; ++i)
-	{
-		detail::tvec4<T> v;
-		for(int j = 0; j < 4; ++j)
-			v[j] = m[j][i];
-		result = isNormalized(v, epsilon);
-	}
-	return result;
-}
-
-template<typename genType> 
-GLM_FUNC_QUALIFIER bool isOrthogonal(
-	const genType& m, 
-	const typename genType::value_type epsilon)
-{
-	bool result = true;
-	for(int i = 0; result && i < genType::col_size() - 1; ++i)
-	for(int j= i + 1; result && j < genType::col_size(); ++j)
-		result = areOrthogonal(m[i], m[j], epsilon);
-
-	if(result)
-	{
-		genType tmp = transpose(m);
-		for(int i = 0; result && i < genType::col_size() - 1 ; ++i)
-		for(int j = i + 1; result && j < genType::col_size(); ++j)
-			result = areOrthogonal(tmp[i], tmp[j], epsilon);
-	}
-	return result;
-}
-
 }//namespace glm

glm/gtx/mixed_product.inl

@@ -7,15 +7,16 @@
 // File    : glm/gtx/mixed_product.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER valType mixedProduct(
-    detail::tvec3<valType> const & v1, 
-    detail::tvec3<valType> const & v2, 
-    detail::tvec3<valType> const & v3)
 {
-    return dot(cross(v1, v2), v3);
+	template <typename valType> 
-}
+	GLM_FUNC_QUALIFIER valType mixedProduct
-
+	(
+		detail::tvec3<valType> const & v1, 
+		detail::tvec3<valType> const & v2, 
+		detail::tvec3<valType> const & v3
+	)
+	{
+		return dot(cross(v1, v2), v3);
+	}
 }//namespace glm

glm/gtx/multiple.inl

@@ -10,184 +10,111 @@
 // - GLM core
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-//////////////////////
+namespace glm
-// higherMultiple
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType higherMultiple
-(
-	genType const & Source, 
-	genType const & Multiple
-)
 {
-	genType Tmp = Source % Multiple;
+	//////////////////////
-	return Tmp ? Source + Multiple - Tmp : Source;
+	// higherMultiple
-}
 
-template <> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER detail::thalf higherMultiple
+	GLM_FUNC_QUALIFIER genType higherMultiple
-(
+	(
-	detail::thalf const & SourceH, 
+		genType const & Source, 
-	detail::thalf const & MultipleH
+		genType const & Multiple
-)
+	)
-{
+	{
-	float Source = SourceH.toFloat();
+		genType Tmp = Source % Multiple;
-	float Multiple = MultipleH.toFloat();
+		return Tmp ? Source + Multiple - Tmp : Source;
+	}
 
-	int Tmp = int(float(Source)) % int(Multiple);
+	template <> 
-	return detail::thalf(Tmp ? Source + Multiple - float(Tmp) : Source);
+	GLM_FUNC_QUALIFIER detail::thalf higherMultiple
-}
+	(
+		detail::thalf const & SourceH, 
+		detail::thalf const & MultipleH
+	)
+	{
+		float Source = SourceH.toFloat();
+		float Multiple = MultipleH.toFloat();
 
-template <> 
+		int Tmp = int(float(Source)) % int(Multiple);
-GLM_FUNC_QUALIFIER float higherMultiple
+		return detail::thalf(Tmp ? Source + Multiple - float(Tmp) : Source);
-(	
+	}
-	float const & Source, 
-	float const & Multiple
-)
-{
-	int Tmp = int(Source) % int(Multiple);
-	return Tmp ? Source + Multiple - float(Tmp) : Source;
-}
 
-template <> 
+	template <> 
-GLM_FUNC_QUALIFIER double higherMultiple
+	GLM_FUNC_QUALIFIER float higherMultiple
-(
+	(	
-	double const & Source, 
+		float const & Source, 
-	double const & Multiple
+		float const & Multiple
-)
+	)
-{
+	{
-	long Tmp = long(Source) % long(Multiple);
+		int Tmp = int(Source) % int(Multiple);
-	return Tmp ? Source + Multiple - double(Tmp) : Source;
+		return Tmp ? Source + Multiple - float(Tmp) : Source;
-}
+	}
 
-template <typename T> 
+	template <> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> higherMultiple
+	GLM_FUNC_QUALIFIER double higherMultiple
-(
+	(
-	detail::tvec2<T> const & Source, 
+		double const & Source, 
-	detail::tvec2<T> const & Multiple
+		double const & Multiple
-)
+	)
-{
+	{
-	detail::tvec2<T> Result;
+		long Tmp = long(Source) % long(Multiple);
-	for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
+		return Tmp ? Source + Multiple - double(Tmp) : Source;
-		Result[i] = higherMultiple(Source[i], Multiple[i]);
+	}
-	return Result;
-}
 
-template <typename T> 
+	VECTORIZE_VEC_VEC(higherMultiple)
-GLM_FUNC_QUALIFIER detail::tvec3<T> higherMultiple
-(
-	detail::tvec3<T> const & Source, 
-	detail::tvec3<T> const & Multiple
-)
-{
-	detail::tvec3<T> Result;
-	for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
-		Result[i] = higherMultiple(Source[i], Multiple[i]);
-	return Result;
-}
 
-template <typename T> 
+	//////////////////////
-GLM_FUNC_QUALIFIER detail::tvec4<T> higherMultiple
+	// lowerMultiple
-(
-	detail::tvec4<T> const & Source, 
-	detail::tvec4<T> const & Multiple
-)
-{
-	detail::tvec4<T> Result;
-	for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
-		Result[i] = higherMultiple(Source[i], Multiple[i]);
-	return Result;
-}
 
-//////////////////////
+	template <typename genType> 
-// lowerMultiple
+	GLM_FUNC_QUALIFIER genType lowerMultiple
+	(
+		genType const & Source, 
+		genType const & Multiple
+	)
+	{
+		genType Tmp = Source % Multiple;
+		return Tmp ? Source - Tmp : Source;
+	}
 
-template <typename genType> 
+	template <> 
-GLM_FUNC_QUALIFIER genType lowerMultiple
+	GLM_FUNC_QUALIFIER detail::thalf lowerMultiple
-(
+	(
-	genType const & Source, 
+		detail::thalf const & SourceH, 
-	genType const & Multiple
+		detail::thalf const & MultipleH
-)
+	)
-{
+	{
-	genType Tmp = Source % Multiple;
+		float Source = SourceH.toFloat();
-	return Tmp ? Source - Tmp : Source;
+		float Multiple = MultipleH.toFloat();
-}
 
-template <> 
+		int Tmp = int(float(Source)) % int(float(Multiple));
-GLM_FUNC_QUALIFIER detail::thalf lowerMultiple
+		return detail::thalf(Tmp ? Source - float(Tmp) : Source);
-(
+	}
-	detail::thalf const & SourceH, 
-	detail::thalf const & MultipleH
-)
-{
-	float Source = SourceH.toFloat();
-	float Multiple = MultipleH.toFloat();
 
-	int Tmp = int(float(Source)) % int(float(Multiple));
+	template <> 
-	return detail::thalf(Tmp ? Source - float(Tmp) : Source);
+	GLM_FUNC_QUALIFIER float lowerMultiple
-}
+	(
+		float const & Source, 
+		float const & Multiple
+	)
+	{
+		int Tmp = int(Source) % int(Multiple);
+		return Tmp ? Source - float(Tmp) : Source;
+	}
 
-template <> 
+	template <> 
-GLM_FUNC_QUALIFIER float lowerMultiple
+	GLM_FUNC_QUALIFIER double lowerMultiple
-(
+	(
-	float const & Source, 
+		double const & Source, 
-	float const & Multiple
+		double const & Multiple
-)
+	)
-{
+	{
-	int Tmp = int(Source) % int(Multiple);
+		long Tmp = long(Source) % long(Multiple);
-	return Tmp ? Source - float(Tmp) : Source;
+		return Tmp ? Source - double(Tmp) : Source;
-}
+	}
-
-template <> 
-GLM_FUNC_QUALIFIER double lowerMultiple
-(
-	double const & Source, 
-	double const & Multiple
-)
-{
-	long Tmp = long(Source) % long(Multiple);
-	return Tmp ? Source - double(Tmp) : Source;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> lowerMultiple
-(
-	detail::tvec2<T> const & Source, 
-	detail::tvec2<T> const & Multiple
-)
-{
-	detail::tvec2<T> Result;
-	for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
-		Result[i] = lowerMultiple(Source[i], Multiple[i]);
-	return Result;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> lowerMultiple
-(
-	detail::tvec3<T> const & Source, 
-	detail::tvec3<T> const & Multiple
-)
-{
-	detail::tvec3<T> Result;
-	for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
-		Result[i] = lowerMultiple(Source[i], Multiple[i]);
-	return Result;
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> lowerMultiple
-(
-	detail::tvec4<T> const & Source, 
-	detail::tvec4<T> const & Multiple
-)
-{
-	detail::tvec4<T> Result;
-	for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
-		Result[i] = lowerMultiple(Source[i], Multiple[i]);
-	return Result;
-}
 
+	VECTORIZE_VEC_VEC(lowerMultiple)
 }//namespace glm

glm/gtx/norm.hpp

@@ -56,99 +56,73 @@ namespace glm
 	//! From GLM_GTX_norm extension.
 	template <typename T> 
 	T length2(
-		const T x);
+		T const & x);
+
+	//! Returns the squared length of x.
+	//! From GLM_GTX_norm extension.
+	template <typename genType> 
+	typename genType::value_type length2(
+		genType const & x);
 		
 	//! Returns the squared length of x.
 	//! From GLM_GTX_norm extension.
 	template <typename T>
 	T length2(
-		const detail::tvec2<T> & x);
+		detail::tquat<T> const & q);
-
-	//! Returns the squared length of x.
-	//! From GLM_GTX_norm extension.
-	template <typename T>
-	T length2(
-		const detail::tvec3<T>& x);
-		
-	//! Returns the squared length of x.
-	//! From GLM_GTX_norm extension.
-	template <typename T> 
-	T length2(
-		const detail::tvec4<T>& x);
-		
-	//! Returns the squared length of x.
-	//! From GLM_GTX_norm extension.
-	template <typename T>
-	T length2(
-		const detail::tquat<T>& q);
 
 	//! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
 	//! From GLM_GTX_norm extension.
 	template <typename T>
 	T distance2(
-		const T p0, 
+		T const & p0, 
-		const T p1);
+		T const & p1);
 		
 	//! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
 	//! From GLM_GTX_norm extension.
-	template <typename T> 
+	template <typename genType> 
-	T distance2(
+	typename genType::value_type distance2(
-		const detail::tvec2<T>& p0, 
+		genType const & p0, 
-		const detail::tvec2<T>& p1);
+		genType const & p1);
-
-	//! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
-	//! From GLM_GTX_norm extension.
-	template <typename T>
-	T distance2(
-		const detail::tvec3<T>& p0,
-		const detail::tvec3<T>& p1);
-
-	//! Returns the squared distance between p0 and p1, i.e., length(p0 - p1).
-	//! From GLM_GTX_norm extension.
-	template <typename T>
-	T distance2(
-		const detail::tvec4<T>& p0, 
-		const detail::tvec4<T>& p1);
 
 	//! Returns the L1 norm between x and y.
 	//! From GLM_GTX_norm extension.
 	template <typename T>
 	T l1Norm(
-		const detail::tvec3<T>& x,
+		detail::tvec3<T> const & x,
-		const detail::tvec3<T>& y);
+		detail::tvec3<T> const & y);
 		
 	//! Returns the L1 norm of v.
 	//! From GLM_GTX_norm extension.
 	template <typename T> 
 	T l1Norm(
-		const detail::tvec3<T>& v);
+		detail::tvec3<T> const & v);
 		
 	//! Returns the L2 norm between x and y.
 	//! From GLM_GTX_norm extension.
 	template <typename T> 
 	T l2Norm(
-		const detail::tvec3<T>& x, 
+		detail::tvec3<T> const & x, 
-		const detail::tvec3<T>& y);
+		detail::tvec3<T> const & y);
 		
 	//! Returns the L2 norm of v.
 	//! From GLM_GTX_norm extension.
 	template <typename T> 
 	T l2Norm(
-		const detail::tvec3<T>& x);
+		detail::tvec3<T> const & x);
 		
 	//! Returns the L norm between x and y.
 	//! From GLM_GTX_norm extension.
 	template <typename T> 
 	T lxNorm(
-		const detail::tvec3<T>& x,
+		detail::tvec3<T> const & x,
-		const detail::tvec3<T>& y,
+		detail::tvec3<T> const & y,
 		unsigned int Depth);
 
 	//! Returns the L norm of v.
 	//! From GLM_GTX_norm extension.
 	template <typename T>
 	T lxNorm(
-		const detail::tvec3<T>& x,
+		detail::tvec3<T> const & x,
 		unsigned int Depth);
 
 	/// @}

glm/gtx/norm.inl

@@ -7,120 +7,150 @@
 // File    : glm/gtx/norm.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER T length2(
-	const T x)
 {
-    return x * x;
+	template <typename T>
-}
+	GLM_FUNC_QUALIFIER T length2
+	(
+		T const & x
+	)
+	{
+		return x * x;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T length2(
+	GLM_FUNC_QUALIFIER T length2
-	const detail::tvec2<T>& x)
+	(
-{
+		detail::tvec2<T> const & x
-    return dot(x, x);
+	)
-}
+	{
+		return dot(x, x);
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T length2(
+	GLM_FUNC_QUALIFIER T length2
-	const detail::tvec3<T>& x)
+	(
-{
+		detail::tvec3<T> const & x
-    return dot(x, x);
+	)
-}
+	{
+		return dot(x, x);
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T length2(
+	GLM_FUNC_QUALIFIER T length2
-	const detail::tvec4<T>& x)
+	(
-{
+		detail::tvec4<T> const & x
-    return dot(x, x);
+	)
-}
+	{
+		return dot(x, x);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T length2(
+	GLM_FUNC_QUALIFIER T length2
-	const detail::tquat<T>& q)
+	(
-{
+		detail::tquat<T> const & q
-    return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
+	)
-}
+	{
+		return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
+	}
 
-template <typename T> 
+	template <typename T> 
-T distance2(
+	GLM_FUNC_QUALIFIER T distance2
-	const T p0, 
+	(
-	const T p1)
+		T const & p0, 
-{
+		T const & p1
-	return length2(p1 - p0);
+	)
-}
+	{
+		return length2(p1 - p0);
+	}
 
-template <typename T> 
+	template <typename T> 
-T distance2(
+	GLM_FUNC_QUALIFIER T distance2
-	const detail::tvec2<T>& p0, 
+	(
-	const detail::tvec2<T>& p1)
+		detail::tvec2<T> const & p0, 
-{
+		detail::tvec2<T> const & p1
-	return length2(p1 - p0);
+	)
-}
+	{
+		return length2(p1 - p0);
+	}
 
-template <typename T> 
+	template <typename T> 
-T distance2(
+	GLM_FUNC_QUALIFIER T distance2
-	const detail::tvec3<T>& p0, 
+	(
-	const detail::tvec3<T>& p1)
+		detail::tvec3<T> const & p0, 
-{
+		detail::tvec3<T> const & p1
-	return length2(p1 - p0);
+	)
-}
+	{
+		return length2(p1 - p0);
+	}
 
-template <typename T>
+	template <typename T>
-T distance2(
+	GLM_FUNC_QUALIFIER T distance2
-	const detail::tvec4<T>& p0, 
+	(
-	const detail::tvec4<T>& p1)
+		detail::tvec4<T> const & p0, 
-{
+		detail::tvec4<T> const & p1
-	return length2(p1 - p0);
+	)
-}
+	{
+		return length2(p1 - p0);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T l1Norm(
+	GLM_FUNC_QUALIFIER T l1Norm
-	const detail::tvec3<T>& a, 
+	(
-	const detail::tvec3<T>& b)
+		detail::tvec3<T> const & a, 
-{
+		detail::tvec3<T> const & b
-    return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z);
+	)
-}
+	{
+		return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T l1Norm(
+	GLM_FUNC_QUALIFIER T l1Norm
-	const detail::tvec3<T>& v)
+	(
-{
+		detail::tvec3<T> const & v
-    return abs(v.x) + abs(v.y) + abs(v.z);
+	)
-}
+	{
+		return abs(v.x) + abs(v.y) + abs(v.z);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T l2Norm(
+	GLM_FUNC_QUALIFIER T l2Norm
-	const detail::tvec3<T>& a, 
+	(
-	const detail::tvec3<T>& b)
+		detail::tvec3<T> const & a, 
-{
+		detail::tvec3<T> const & b
-    return length(b - a);
+	)
-}
+	{
+		return length(b - a);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T l2Norm(
+	GLM_FUNC_QUALIFIER T l2Norm
-	const detail::tvec3<T>& v)
+	(
-{
+		detail::tvec3<T> const & v
-    return length(v);
+	)
-}
+	{
+		return length(v);
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T lxNorm(
+	GLM_FUNC_QUALIFIER T lxNorm
-	const detail::tvec3<T>& x, 
+	(
-	const detail::tvec3<T>& y, 
+		detail::tvec3<T> const & x, 
-	unsigned int Depth)
+		detail::tvec3<T> const & y, 
-{
+		unsigned int Depth
-	return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth));
+	)
-}
+	{
+		return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth));
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T lxNorm(
+	GLM_FUNC_QUALIFIER T lxNorm
-	const detail::tvec3<T>& v, 
+	(
-	unsigned int Depth)
+		detail::tvec3<T> const & v, 
-{
+		unsigned int Depth
-	return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth));
+	)
-}
+	{
+		return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth));
+	}
 
 }//namespace glm

glm/gtx/normal.inl

@@ -7,17 +7,16 @@
 // File    : glm/gtx/normal.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> triangleNormal
-(
-    detail::tvec3<T> const & p1, 
-    detail::tvec3<T> const & p2, 
-    detail::tvec3<T> const & p3
-)
 {
-    return normalize(cross(p1 - p2, p1 - p3));
+	template <typename T> 
-}
+	GLM_FUNC_QUALIFIER detail::tvec3<T> triangleNormal
-
+	(
+		detail::tvec3<T> const & p1, 
+		detail::tvec3<T> const & p2, 
+		detail::tvec3<T> const & p3
+	)
+	{
+		return normalize(cross(p1 - p2, p1 - p3));
+	}
 }//namespace glm

glm/gtx/normalize_dot.inl

@@ -7,110 +7,109 @@
 // File    : glm/gtx/normalize_dot.inl
 //////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType normalizeDot
-(
-	genType const & x, 
-	genType const & y
-)
 {
-	return 
+	template <typename genType> 
-		glm::dot(x, y) * 
+	GLM_FUNC_QUALIFIER genType normalizeDot
-		glm::inversesqrt(glm::dot(x, x) * 
+	(
-		glm::dot(y, y));
+		genType const & x, 
-}
+		genType const & y
+	)
+	{
+		return 
+			glm::dot(x, y) * 
+			glm::inversesqrt(glm::dot(x, x) * 
+			glm::dot(y, y));
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType normalizeDot
+	GLM_FUNC_QUALIFIER valType normalizeDot
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y
+		detail::tvec2<valType> const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		glm::inversesqrt(glm::dot(x, x) * 
+			glm::inversesqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType normalizeDot
+	GLM_FUNC_QUALIFIER valType normalizeDot
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y
+		detail::tvec3<valType> const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		glm::inversesqrt(glm::dot(x, x) * 
+			glm::inversesqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType normalizeDot
+	GLM_FUNC_QUALIFIER valType normalizeDot
-(
+	(
-	detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y
+		detail::tvec4<valType> const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		glm::inversesqrt(glm::dot(x, x) * 
+			glm::inversesqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType fastNormalizeDot
+	GLM_FUNC_QUALIFIER genType fastNormalizeDot
-(
+	(
-	genType const & x, 
+		genType const & x, 
-	genType const & y
+		genType const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		fastInverseSqrt(glm::dot(x, x) * 
+			fastInverseSqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType fastNormalizeDot
+	GLM_FUNC_QUALIFIER valType fastNormalizeDot
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y
+		detail::tvec2<valType> const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		fastInverseSqrt(glm::dot(x, x) * 
+			fastInverseSqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType fastNormalizeDot
+	GLM_FUNC_QUALIFIER valType fastNormalizeDot
-(
+	(
-	detail::tvec3<valType> const & x, 
+		detail::tvec3<valType> const & x, 
-	detail::tvec3<valType> const & y
+		detail::tvec3<valType> const & y
-)
+	)
-{
+	{
-	return 
+		return 
-		glm::dot(x, y) * 
+			glm::dot(x, y) * 
-		fastInverseSqrt(glm::dot(x, x) * 
+			fastInverseSqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
+			glm::dot(y, y));
-}
+	}
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER valType fastNormalizeDot
-(
-	detail::tvec4<valType> const & x, 
-	detail::tvec4<valType> const & y
-)
-{
-	return 
-		glm::dot(x, y) * 
-		fastInverseSqrt(glm::dot(x, x) * 
-		glm::dot(y, y));
-}
 
+	template <typename valType> 
+	GLM_FUNC_QUALIFIER valType fastNormalizeDot
+	(
+		detail::tvec4<valType> const & x, 
+		detail::tvec4<valType> const & y
+	)
+	{
+		return 
+			glm::dot(x, y) * 
+			fastInverseSqrt(glm::dot(x, x) * 
+			glm::dot(y, y));
+	}
 }//namespace glm

glm/gtx/optimum_pow.inl

@@ -7,53 +7,52 @@
 // File    : glm/gtx/optimum_pow.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType pow2(const genType& x)
 {
-    return x * x;
+	template <typename genType> 
-}
+	GLM_FUNC_QUALIFIER genType pow2(const genType& x)
+	{
+		return x * x;
+	}
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType pow3(const genType& x)
+	GLM_FUNC_QUALIFIER genType pow3(const genType& x)
-{
+	{
-    return x * x * x;
+		return x * x * x;
-}
+	}
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType pow4(const genType& x)
+	GLM_FUNC_QUALIFIER genType pow4(const genType& x)
-{
+	{
-    return x * x * x * x;
+		return x * x * x * x;
-}
+	}
 
-GLM_FUNC_QUALIFIER bool powOfTwo(int x)
+	GLM_FUNC_QUALIFIER bool powOfTwo(int x)
-{
+	{
-    return !(x & (x - 1));
+		return !(x & (x - 1));
-}
+	}
 
-GLM_FUNC_QUALIFIER detail::tvec2<bool> powOfTwo(const detail::tvec2<int>& x)
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> powOfTwo(const detail::tvec2<int>& x)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        powOfTwo(x.x),
+			powOfTwo(x.x),
-        powOfTwo(x.y));
+			powOfTwo(x.y));
-}
+	}
 
-GLM_FUNC_QUALIFIER detail::tvec3<bool> powOfTwo(const detail::tvec3<int>& x)
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> powOfTwo(const detail::tvec3<int>& x)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        powOfTwo(x.x),
+			powOfTwo(x.x),
-        powOfTwo(x.y),
+			powOfTwo(x.y),
-        powOfTwo(x.z));
+			powOfTwo(x.z));
-}
+	}
-
-GLM_FUNC_QUALIFIER detail::tvec4<bool> powOfTwo(const detail::tvec4<int>& x)
-{
-    return detail::tvec4<bool>(
-        powOfTwo(x.x),
-        powOfTwo(x.y),
-        powOfTwo(x.z),
-        powOfTwo(x.w));
-}
 
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> powOfTwo(const detail::tvec4<int>& x)
+	{
+		return detail::tvec4<bool>(
+			powOfTwo(x.x),
+			powOfTwo(x.y),
+			powOfTwo(x.z),
+			powOfTwo(x.w));
+	}
 }//namespace glm

glm/gtx/orthonormalize.inl

@@ -7,38 +7,37 @@
 // File    : glm/gtx/orthonormalize.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> orthonormalize
-(
-	const detail::tmat3x3<T>& m
-)
 {
-    detail::tmat3x3<T> r = m;
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> orthonormalize
+	(
+		const detail::tmat3x3<T>& m
+	)
+	{
+		detail::tmat3x3<T> r = m;
 
-    r[0] = normalize(r[0]);
+		r[0] = normalize(r[0]);
 
-	float d0 = dot(r[0], r[1]);
+		float d0 = dot(r[0], r[1]);
-	r[1] -= r[0] * d0;
+		r[1] -= r[0] * d0;
-	r[1] = normalize(r[1]);
+		r[1] = normalize(r[1]);
 
-	float d1 = dot(r[1], r[2]);
+		float d1 = dot(r[1], r[2]);
-	d0 = dot(r[0], r[2]);
+		d0 = dot(r[0], r[2]);
-	r[2] -= r[0] * d0 + r[1] * d1;
+		r[2] -= r[0] * d0 + r[1] * d1;
-	r[2] = normalize(r[2]);
+		r[2] = normalize(r[2]);
 
-    return r;
+		return r;
-}
+	}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> orthonormalize
-(
-	const detail::tvec3<T>& x, 
-	const detail::tvec3<T>& y
-)
-{
-    return normalize(x - y * dot(y, x));
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec3<T> orthonormalize
+	(
+		const detail::tvec3<T>& x, 
+		const detail::tvec3<T>& y
+	)
+	{
+		return normalize(x - y * dot(y, x));
+	}
 }//namespace glm

glm/gtx/perpendicular.hpp

@@ -54,24 +54,10 @@ namespace glm
 
 	//! Projects x a perpendicular axis of Normal.
 	//! From GLM_GTX_perpendicular extension.
-	template <typename T> 
+	template <typename vecType> 
-	detail::tvec2<T> perp(
+	vecType perp(
-		detail::tvec2<T> const & x, 
+		vecType const & x, 
-		detail::tvec2<T> const & Normal);
+		vecType const & Normal);
-
-    //! Projects x a perpendicular axis of Normal.
-	//! From GLM_GTX_perpendicular extension.
-	template <typename T> 
-	detail::tvec3<T> perp(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & Normal);
-
-    //! Projects x a perpendicular axis of Normal.
-	//! From GLM_GTX_perpendicular extension.
-	template <typename T> 
-	detail::tvec4<T> perp(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & Normal);
 
 	/// @}
 }//namespace glm

glm/gtx/perpendicular.inl

@@ -7,30 +7,15 @@
 // File    : glm/gtx/perpendicular.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> perp(
-	detail::tvec2<T> const & x, 
-	detail::tvec2<T> const & Normal)
 {
-    return x - proj(x, Normal);
+	template <typename vecType> 
-}
+	GLM_FUNC_QUALIFIER vecType perp
-
+	(
-template <typename T> 
+		vecType const & x, 
-GLM_FUNC_QUALIFIER detail::tvec3<T> perp(
+		vecType const & Normal
-	detail::tvec3<T> const & x, 
+	)
-	detail::tvec3<T> const & Normal)
+	{
-{
+		return x - proj(x, Normal);
-    return x - proj(x, Normal);
+	}
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> perp(
-	detail::tvec4<T> const & x, 
-	detail::tvec4<T> const & Normal)
-{
-    return x - proj(x, Normal);
-}
-
 }//namespace glm

glm/gtx/polar_coordinates.hpp

@@ -53,12 +53,14 @@ namespace glm
 	//! Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
 	//! From GLM_GTX_polar_coordinates extension.
 	template <typename T> 
-	detail::tvec3<T> polar(const detail::tvec3<T>& euclidean);
+	detail::tvec3<T> polar(
+		detail::tvec3<T> const & euclidean);
 
 	//! Convert Polar to Euclidean coordinates.
 	//! From GLM_GTX_polar_coordinates extension.
 	template <typename T> 
-	detail::tvec3<T> euclidean(const detail::tvec3<T>& polar);
+	detail::tvec3<T> euclidean(
+		detail::tvec3<T> const & polar);
 
 	/// @}
 }//namespace glm

glm/gtx/polar_coordinates.inl

@@ -10,8 +10,10 @@
 namespace glm
 {
 	template <typename T> 
-	GLM_FUNC_QUALIFIER detail::tvec3<T> polar(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> polar
-		const detail::tvec3<T>& euclidean)
+	(
+		detail::tvec3<T> const & euclidean
+	)
 	{
 		T length = length(euclidean);
 		detail::tvec3<T> tmp = euclidean / length;
@@ -24,8 +26,10 @@ namespace glm
 	}
 
 	template <typename T> 
-	GLM_FUNC_QUALIFIER detail::tvec3<T> euclidean(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> euclidean
-		const detail::tvec3<T>& polar)
+	(
+		detail::tvec3<T> const & polar
+	)
 	{
 		T latitude = radians(polar.x);
 		T longitude = radians(polar.y);

glm/gtx/projection.hpp

@@ -52,24 +52,10 @@ namespace glm
 
 	//! Projects x on Normal.
 	//! From GLM_GTX_projection extension.
-	template <typename T> 
+	template <typename vecType> 
-	detail::tvec2<T> proj(
+	vecType proj(
-		detail::tvec2<T> const & x, 
+		vecType const & x, 
-		detail::tvec2<T> const & Normal);
+		vecType const & Normal);
-		
-	//! Projects x on Normal.
-	//! From GLM_GTX_projection extension.
-	template <typename T> 
-	detail::tvec3<T> proj(
-		detail::tvec3<T> const & x, 
-		detail::tvec3<T> const & Normal);
-
-	//! Projects x on Normal.
-	//! From GLM_GTX_projection extension.
-	template <typename T> 
-	detail::tvec4<T> proj(
-		detail::tvec4<T> const & x, 
-		detail::tvec4<T> const & Normal);
 
 	/// @}
 }//namespace glm

glm/gtx/projection.inl

@@ -7,30 +7,15 @@
 // File    : glm/gtx/projection.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> proj(
-	detail::tvec2<T> const & x, 
-	detail::tvec2<T> const & Normal)
 {
-	return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
+	template <typename vecType> 
-}
+	GLM_FUNC_QUALIFIER vecType proj
-
+	(
-template <typename T> 
+		vecType const & x, 
-GLM_FUNC_QUALIFIER detail::tvec3<T> proj(
+		vecType const & Normal
-	detail::tvec3<T> const & x, 
+	)
-	detail::tvec3<T> const & Normal)
+	{
-{
+		return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
-	return dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
+	}
-}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> proj(
-	detail::tvec4<T> const & x, 
-	detail::tvec4<T> const & Normal)
-{
-	return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
-}
-
 }//namespace glm

glm/gtx/quaternion.inl

@@ -9,291 +9,290 @@
 
 #include <limits>
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> cross
-(
-	detail::tvec3<valType> const & v, 
-	detail::tquat<valType> const & q
-)
 {
-	return inverse(q) * v;
+	template <typename valType> 
-}
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> cross
+	(
+		detail::tvec3<valType> const & v, 
+		detail::tquat<valType> const & q
+	)
+	{
+		return inverse(q) * v;
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> cross
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> cross
-(
+	(
-	detail::tquat<valType> const & q, 
+		detail::tquat<valType> const & q, 
-	detail::tvec3<valType> const & v
+		detail::tvec3<valType> const & v
-)
+	)
-{
+	{
-	return q * v;
+		return q * v;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tquat<T> squad
+	GLM_FUNC_QUALIFIER detail::tquat<T> squad
-(
+	(
-	detail::tquat<T> const & q1, 
+		detail::tquat<T> const & q1, 
-	detail::tquat<T> const & q2, 
+		detail::tquat<T> const & q2, 
-	detail::tquat<T> const & s1, 
+		detail::tquat<T> const & s1, 
-	detail::tquat<T> const & s2, 
+		detail::tquat<T> const & s2, 
-	T const & h)
+		T const & h)
-{
+	{
-    return mix(mix(q1, q2, h), mix(s1, s2, h), T(2) * h (T(1) - h));
+		return mix(mix(q1, q2, h), mix(s1, s2, h), T(2) * h (T(1) - h));
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tquat<T> intermediate
+	GLM_FUNC_QUALIFIER detail::tquat<T> intermediate
-(
+	(
-	detail::tquat<T> const & prev, 
+		detail::tquat<T> const & prev, 
-	detail::tquat<T> const & curr, 
+		detail::tquat<T> const & curr, 
-	detail::tquat<T> const & next
+		detail::tquat<T> const & next
-)
+	)
-{
+	{
-    detail::tquat<T> invQuat = inverse(curr);
+		detail::tquat<T> invQuat = inverse(curr);
-    return ext((log(next + invQuat) + log(prev + invQuat)) / T(-4)) * curr;
+		return ext((log(next + invQuat) + log(prev + invQuat)) / T(-4)) * curr;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tquat<T> exp
+	GLM_FUNC_QUALIFIER detail::tquat<T> exp
-(
+	(
-	detail::tquat<T> const & q, 
+		detail::tquat<T> const & q, 
-	T const & exponent
+		T const & exponent
-)
+	)
-{
+	{
-    detail::tvec3<T> u(q.x, q.y, q.z);
+		detail::tvec3<T> u(q.x, q.y, q.z);
-	float a = glm::length(u);
+		float a = glm::length(u);
-    detail::tvec3<T> v(u / a);
+		detail::tvec3<T> v(u / a);
-    return detail::tquat<T>(cos(a), sin(a) * v);
+		return detail::tquat<T>(cos(a), sin(a) * v);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tquat<T> log
+	GLM_FUNC_QUALIFIER detail::tquat<T> log
-(
+	(
-	detail::tquat<T> const & q
+		detail::tquat<T> const & q
-)
+	)
-{
+	{
-    if((q.x == T(0)) && (q.y == T(0)) && (q.z == T(0)))
+		if((q.x == T(0)) && (q.y == T(0)) && (q.z == T(0)))
-    {
+		{
-        if(q.w > T(0))
+			if(q.w > T(0))
-            return detail::tquat<T>(log(q.w), T(0), T(0), T(0));
+				return detail::tquat<T>(log(q.w), T(0), T(0), T(0));
-        else if(q.w < T(0))
+			else if(q.w < T(0))
-            return detail::tquat<T>(log(-q.w), T(3.1415926535897932384626433832795), T(0),T(0));
+				return detail::tquat<T>(log(-q.w), T(3.1415926535897932384626433832795), T(0),T(0));
-        else
+			else
-            return detail::tquat<T>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
+				return detail::tquat<T>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
-    } 
+		} 
-    else 
+		else 
-    {
+		{
-        T Vec3Len = sqrt(q.x * q.x + q.y * q.y + q.z * q.z);
+			T Vec3Len = sqrt(q.x * q.x + q.y * q.y + q.z * q.z);
-        T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
+			T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
-        T t = atan(Vec3Len, T(q.w)) / Vec3Len;
+			T t = atan(Vec3Len, T(q.w)) / Vec3Len;
-        return detail::tquat<T>(t * q.x, t * q.y, t * q.z, log(QuatLen));
+			return detail::tquat<T>(t * q.x, t * q.y, t * q.z, log(QuatLen));
-    }
+		}
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tquat<T> pow
+	GLM_FUNC_QUALIFIER detail::tquat<T> pow
-(
+	(
-	detail::tquat<T> const & x, 
+		detail::tquat<T> const & x, 
-	T const & y
+		T const & y
-)
+	)
-{
+	{
-    if(abs(x.w) > T(0.9999))
+		if(abs(x.w) > T(0.9999))
-        return x;
+			return x;
-    float Angle = acos(y);
+		float Angle = acos(y);
-    float NewAngle = Angle * y;
+		float NewAngle = Angle * y;
-    float Div = sin(NewAngle) / sin(Angle);
+		float Div = sin(NewAngle) / sin(Angle);
-    return detail::tquat<T>(
+		return detail::tquat<T>(
-        cos(NewAngle),
+			cos(NewAngle),
-        x.x * Div,
+			x.x * Div,
-        x.y * Div,
+			x.y * Div,
-        x.z * Div);
+			x.z * Div);
-}
+	}
 
-//template <typename T> 
+	//template <typename T> 
-//GLM_FUNC_QUALIFIER detail::tquat<T> sqrt
+	//GLM_FUNC_QUALIFIER detail::tquat<T> sqrt
-//(
+	//(
-//	detail::tquat<T> const & q
+	//	detail::tquat<T> const & q
-//)
+	//)
-//{
+	//{
-//	T q0 = T(1) - dot(q, q);
+	//	T q0 = T(1) - dot(q, q);
-//	return T(2) * (T(1) + q0) * q;
+	//	return T(2) * (T(1) + q0) * q;
-//}
+	//}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotate
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotate
-(
+	(
-	detail::tquat<T> const & q, 
+		detail::tquat<T> const & q, 
-	detail::tvec3<T> const & v
+		detail::tvec3<T> const & v
-)
+	)
-{
+	{
-	return q * v;
+		return q * v;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> rotate
+	GLM_FUNC_QUALIFIER detail::tvec4<T> rotate
-(
+	(
-	detail::tquat<T> const & q, 
+		detail::tquat<T> const & q, 
-	detail::tvec4<T> const & v
+		detail::tvec4<T> const & v
-)
+	)
-{
+	{
-    return q * v;
+		return q * v;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T angle
+	GLM_FUNC_QUALIFIER T angle
-(
+	(
-	detail::tquat<T> const & x
+		detail::tquat<T> const & x
-)
+	)
-{
+	{
-    return glm::degrees(acos(x.w) * T(2));
+		return glm::degrees(acos(x.w) * T(2));
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> axis
+	GLM_FUNC_QUALIFIER detail::tvec3<T> axis
-(
+	(
-	detail::tquat<T> const & x
+		detail::tquat<T> const & x
-)
+	)
-{
+	{
-    T tmp1 = T(1) - x.w * x.w;
+		T tmp1 = T(1) - x.w * x.w;
-    if(tmp1 <= T(0))
+		if(tmp1 <= T(0))
-        return detail::tvec3<T>(0, 0, 1);
+			return detail::tvec3<T>(0, 0, 1);
-    T tmp2 = T(1) / sqrt(tmp1);
+		T tmp2 = T(1) / sqrt(tmp1);
-    return detail::tvec3<T>(x.x * tmp2, x.y * tmp2, x.z * tmp2);
+		return detail::tvec3<T>(x.x * tmp2, x.y * tmp2, x.z * tmp2);
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tquat<valType> angleAxis
+	GLM_FUNC_QUALIFIER detail::tquat<valType> angleAxis
-(
+	(
-	valType const & angle, 
+		valType const & angle, 
-	valType const & x, 
+		valType const & x, 
-	valType const & y, 
+		valType const & y, 
-	valType const & z
+		valType const & z
-)
+	)
-{
+	{
-    return angleAxis(angle, detail::tvec3<valType>(x, y, z));
+		return angleAxis(angle, detail::tvec3<valType>(x, y, z));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tquat<valType> angleAxis
+	GLM_FUNC_QUALIFIER detail::tquat<valType> angleAxis
-(
+	(
-	valType const & angle, 
+		valType const & angle, 
-	detail::tvec3<valType> const & v
+		detail::tvec3<valType> const & v
-)
+	)
-{
+	{
-    detail::tquat<valType> result;
+		detail::tquat<valType> result;
 
-	valType a = glm::radians(angle);
+		valType a = glm::radians(angle);
-    valType s = glm::sin(a * valType(0.5));
+		valType s = glm::sin(a * valType(0.5));
 
-    result.w = glm::cos(a * valType(0.5));
+		result.w = glm::cos(a * valType(0.5));
-    result.x = v.x * s;
+		result.x = v.x * s;
-    result.y = v.y * s;
+		result.y = v.y * s;
-    result.z = v.z * s;
+		result.z = v.z * s;
-    return result;
+		return result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER T extractRealComponent
+	GLM_FUNC_QUALIFIER T extractRealComponent
-(
+	(
-	detail::tquat<T> const & q
+		detail::tquat<T> const & q
-)
+	)
-{
+	{
-    T w = T(1.0) - q.x * q.x - q.y * q.y - q.z * q.z;
+		T w = T(1.0) - q.x * q.x - q.y * q.y - q.z * q.z;
-    if(w < T(0))
+		if(w < T(0))
-        return T(0);
+			return T(0);
-    else
+		else
-        return -sqrt(w);
+			return -sqrt(w);
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType roll
+	GLM_FUNC_QUALIFIER valType roll
-(
+	(
-	detail::tquat<valType> const & q
+		detail::tquat<valType> const & q
-)
+	)
-{
+	{
-	return glm::degrees(atan2(valType(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
+		return glm::degrees(atan2(valType(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType pitch
+	GLM_FUNC_QUALIFIER valType pitch
-(
+	(
-	detail::tquat<valType> const & q
+		detail::tquat<valType> const & q
-)
+	)
-{
+	{
-	return glm::degrees(atan2(valType(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
+		return glm::degrees(atan2(valType(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType yaw
+	GLM_FUNC_QUALIFIER valType yaw
-(
+	(
-	detail::tquat<valType> const & q
+		detail::tquat<valType> const & q
-)
+	)
-{
+	{
-	return glm::degrees(asin(valType(-2) * (q.x * q.z - q.w * q.y)));
+		return glm::degrees(asin(valType(-2) * (q.x * q.z - q.w * q.y)));
-}
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER detail::tvec3<valType> eularAngles
+	GLM_FUNC_QUALIFIER detail::tvec3<valType> eularAngles
-(
+	(
-	detail::tquat<valType> const & x
+		detail::tquat<valType> const & x
-)
+	)
-{
+	{
-    return detail::tvec3<valType>(pitch(x), yaw(x), roll(x));
+		return detail::tvec3<valType>(pitch(x), yaw(x), roll(x));
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tquat<T> shortMix
+	GLM_FUNC_QUALIFIER detail::tquat<T> shortMix
-(
+	(
-	detail::tquat<T> const & x, 
+		detail::tquat<T> const & x, 
-	detail::tquat<T> const & y, 
+		detail::tquat<T> const & y, 
-	T const & a
+		T const & a
-)
+	)
-{
+	{
-    if(a <= typename detail::tquat<T>::value_type(0)) return x;
+		if(a <= typename detail::tquat<T>::value_type(0)) return x;
-    if(a >= typename detail::tquat<T>::value_type(1)) return y;
+		if(a >= typename detail::tquat<T>::value_type(1)) return y;
 
-	T fCos = dot(x, y);
+		T fCos = dot(x, y);
-    detail::tquat<T> y2(y); //BUG!!! tquat<T> y2;
+		detail::tquat<T> y2(y); //BUG!!! tquat<T> y2;
-	if(fCos < T(0))
+		if(fCos < T(0))
-    {
+		{
-        y2 = -y;
+			y2 = -y;
-        fCos = -fCos;
+			fCos = -fCos;
-    }
+		}
 
-    //if(fCos > 1.0f) // problem
+		//if(fCos > 1.0f) // problem
-	T k0, k1;
+		T k0, k1;
-	if(fCos > T(0.9999))
+		if(fCos > T(0.9999))
-    {
+		{
-		k0 = T(1) - a;
+			k0 = T(1) - a;
-		k1 = T(0) + a; //BUG!!! 1.0f + a;
+			k1 = T(0) + a; //BUG!!! 1.0f + a;
-    }
+		}
-    else
+		else
-    {
+		{
-		T fSin = sqrt(T(1) - fCos * fCos);
+			T fSin = sqrt(T(1) - fCos * fCos);
-		T fAngle = atan(fSin, fCos);
+			T fAngle = atan(fSin, fCos);
-		T fOneOverSin = T(1) / fSin;
+			T fOneOverSin = T(1) / fSin;
-		k0 = sin((T(1) - a) * fAngle) * fOneOverSin;
+			k0 = sin((T(1) - a) * fAngle) * fOneOverSin;
-		k1 = sin((T(0) + a) * fAngle) * fOneOverSin;
+			k1 = sin((T(0) + a) * fAngle) * fOneOverSin;
-    }
+		}
 
-    return detail::tquat<T>(
+		return detail::tquat<T>(
-        k0 * x.w + k1 * y2.w,
+			k0 * x.w + k1 * y2.w,
-        k0 * x.x + k1 * y2.x,
+			k0 * x.x + k1 * y2.x,
-        k0 * x.y + k1 * y2.y,
+			k0 * x.y + k1 * y2.y,
-        k0 * x.z + k1 * y2.z);
+			k0 * x.z + k1 * y2.z);
-}
+	}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tquat<T> fastMix
-(
-	detail::tquat<T> const & x, 
-	detail::tquat<T> const & y, 
-	T const & a
-)
-{
-	return glm::normalize(x * (T(1) - a) + (y * a));
-}
 
+	template <typename T>
+	GLM_FUNC_QUALIFIER detail::tquat<T> fastMix
+	(
+		detail::tquat<T> const & x, 
+		detail::tquat<T> const & y, 
+		T const & a
+	)
+	{
+		return glm::normalize(x * (T(1) - a) + (y * a));
+	}
 }//namespace glm

glm/gtx/reciprocal.inl

@@ -2,588 +2,181 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2008-10-09
-// Updated : 2008-10-09
+// Updated : 2011-10-14
 // Licence : This source is under MIT License
 // File    : glm/gtx/reciprocal.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+#include "../core/_vectorize.hpp"
 
-// sec
+namespace glm
-template <typename genType>
-GLM_FUNC_QUALIFIER genType sec
-(
-	genType const & angle
-)
 {
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sec' only accept floating-point values");
+	// sec
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType sec
+	(
+		genType const & angle
+	)
+	{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sec' only accept floating-point values");
 
-	return genType(1) / glm::cos(angle);
+		return genType(1) / glm::cos(angle);
-}
+	}
 
-template <typename valType>
+	VECTORIZE_VEC(sec)
-GLM_FUNC_QUALIFIER detail::tvec2<valType> sec
-(
-	detail::tvec2<valType> const & angle
-)
-{
-    return detail::tvec2<valType>(
-        sec(angle.x),
-        sec(angle.y));
-}
 
-template <typename valType>
+	// csc
-GLM_FUNC_QUALIFIER detail::tvec3<valType> sec
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType csc
-	detail::tvec3<valType> const & angle
+	(
-)
+		genType const & angle
-{
+	)
-    return detail::tvec3<valType>(
+	{
-        sec(angle.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'csc' only accept floating-point values");
-        sec(angle.y),
-        sec(angle.z));
-}
 
-template <typename valType>
+		return genType(1) / glm::sin(angle);
-GLM_FUNC_QUALIFIER detail::tvec4<valType> sec
+	}
-(
-	detail::tvec4<valType> const & angle
-)
-{
-    return detail::tvec4<valType>(
-        sec(angle.x),
-        sec(angle.y),
-        sec(angle.z),
-        sec(angle.w));
-}
 
-// csc
+	VECTORIZE_VEC(csc)
-template <typename genType>
-GLM_FUNC_QUALIFIER genType csc
-(
-	genType const & angle
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'csc' only accept floating-point values");
 
-    return genType(1) / glm::sin(angle);
+	// cot
-}
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType cot
+	(
+		genType const & angle
+	)
+	{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cot' only accept floating-point values");
 
-template <typename valType>
+		return genType(1) / glm::tan(angle);
-GLM_FUNC_QUALIFIER detail::tvec2<valType> csc
+	}
-(
-	detail::tvec2<valType> const & angle
-)
-{
-    return detail::tvec2<valType>(
-        csc(angle.x),
-        csc(angle.y));
-}
 
-template <typename valType>
+	VECTORIZE_VEC(cot)
-GLM_FUNC_QUALIFIER detail::tvec3<valType> csc
-(
-	detail::tvec3<valType> const & angle
-)
-{
-    return detail::tvec3<valType>(
-        csc(angle.x),
-        csc(angle.y),
-        csc(angle.z));
-}
 
-template <typename valType>
+	// asec
-GLM_FUNC_QUALIFIER detail::tvec4<valType> csc
+	template <typename genType>
-(	
+	GLM_FUNC_QUALIFIER genType asec
-	detail::tvec4<valType> const & angle
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec4<valType>(
+	{
-        csc(angle.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asec' only accept floating-point values");
-        csc(angle.y),
-        csc(angle.z),
-        csc(angle.w));
-}
 	
-// cot
+		return acos(genType(1) / x);
-template <typename genType>
+	}
-GLM_FUNC_QUALIFIER genType cot
-(
-	genType const & angle
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'cot' only accept floating-point values");
 
-	return genType(1) / glm::tan(angle);
+	VECTORIZE_VEC(asec)
-}
 
-template <typename valType>
+	// acsc
-GLM_FUNC_QUALIFIER detail::tvec2<valType> cot
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType acsc
-	detail::tvec2<valType> const & angle
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec2<valType>(
+	{
-        cot(angle.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acsc' only accept floating-point values");
-        cot(angle.y));
-}
 
-template <typename valType>
+		return asin(genType(1) / x);
-GLM_FUNC_QUALIFIER detail::tvec3<valType> cot
+	}
-(
-	detail::tvec3<valType> const & angle
-)
-{
-    return detail::tvec3<valType>(
-        cot(angle.x),
-        cot(angle.y),
-        cot(angle.z));
-}
 
-template <typename valType>
+	VECTORIZE_VEC(acsc)
-GLM_FUNC_QUALIFIER detail::tvec4<valType> cot
-(
-	detail::tvec4<valType> const & angle
-)
-{
-    return detail::tvec4<valType>(
-        cot(angle.x),
-        cot(angle.y),
-        cot(angle.z),
-        cot(angle.w));
-}
 
-// asec
+	// acot
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType asec
+	GLM_FUNC_QUALIFIER genType acot
-(
+	(
-	genType const & x
+		genType const & x
-)
+	)
-{
+	{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asec' only accept floating-point values");
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acot' only accept floating-point values");
 
-	return acos(genType(1) / x);
+		genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0);
-}
+		return pi_over_2 - atan(x);
+	}
 
-template <typename valType>
+	VECTORIZE_VEC(acot)
-GLM_FUNC_QUALIFIER detail::tvec2<valType> asec
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        asec(x.x),
-        asec(x.y));
-}
 
-template <typename valType>
+	// sech
-GLM_FUNC_QUALIFIER detail::tvec3<valType> asec
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType sech
-	detail::tvec3<valType> const & x
+	(
-)
+		genType const & angle
-{
+	)
-    return detail::tvec3<valType>(
+	{
-        asec(x.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sech' only accept floating-point values");
-        asec(x.y),
-        asec(x.z));
-}
 
-template <typename valType>
+		return genType(1) / glm::cosh(angle);
-GLM_FUNC_QUALIFIER detail::tvec4<valType> asec
+	}
-(
-	detail::tvec4<valType> const & x
-)
-{
-    return detail::tvec4<valType>(
-        asec(x.x),
-        asec(x.y),
-        asec(x.z),
-        asec(x.w));
-}
 
-// acsc
+	VECTORIZE_VEC(sech)
-template <typename genType>
-GLM_FUNC_QUALIFIER genType acsc
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acsc' only accept floating-point values");
 
-	return asin(genType(1) / x);
+	// csch
-}
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType csch
+	(
+		genType const & angle
+	)
+	{
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'csch' only accept floating-point values");
 
-template <typename valType>
+		return genType(1) / glm::sinh(angle);
-GLM_FUNC_QUALIFIER detail::tvec2<valType> acsc
+	}
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        acsc(x.x),
-        acsc(x.y));
-}
 
-template <typename valType>
+	VECTORIZE_VEC(csch)
-GLM_FUNC_QUALIFIER detail::tvec3<valType> acsc
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        acsc(x.x),
-        acsc(x.y),
-        acsc(x.z));
-}
 
-template <typename valType>
+	// coth
-GLM_FUNC_QUALIFIER detail::tvec4<valType> acsc
+	template <typename genType>
-(	
+	GLM_FUNC_QUALIFIER genType coth
-	detail::tvec4<valType> const & x
+	(
-)
+		genType const & angle
-{
+	)
-    return detail::tvec4<valType>(
+	{
-        acsc(x.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'coth' only accept floating-point values");
-        acsc(x.y),
-        acsc(x.z),
-        acsc(x.w));
-}
 
-// acot
+		return glm::cosh(angle) / glm::sinh(angle);
-template <typename genType>
+	}
-GLM_FUNC_QUALIFIER genType acot
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acot' only accept floating-point values");
 
-	genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0);
+	VECTORIZE_VEC(coth)
-	return pi_over_2 - atan(x);
-}
 
-template <typename valType>
+	// asech
-GLM_FUNC_QUALIFIER detail::tvec2<valType> acot
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType asech
-	detail::tvec2<valType> const & x
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec2<valType>(
+	{
-        acot(x.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asech' only accept floating-point values");
-        acot(x.y));
-}
 
-template <typename valType>
+		return acosh(genType(1) / x);
-GLM_FUNC_QUALIFIER detail::tvec3<valType> acot
+	}
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        acot(x.x),
-        acot(x.y),
-        acot(x.z));
-}
 
-template <typename valType>
+	VECTORIZE_VEC(asech)
-GLM_FUNC_QUALIFIER detail::tvec4<valType> acot
-(
-	detail::tvec4<valType> const & x
-)
-{
-    return detail::tvec4<valType>(
-        acot(x.x),
-        acot(x.y),
-        acot(x.z),
-        acot(x.w));
-}
 
-// sech
+	// acsch
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType sech
+	GLM_FUNC_QUALIFIER genType acsch
-(
+	(
-	genType const & angle
+		genType const & x
-)
+	)
-{
+	{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'sech' only accept floating-point values");
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acsch' only accept floating-point values");
 
-	return genType(1) / glm::cosh(angle);
+		return asinh(genType(1) / x);
-}
+	}
 
-template <typename valType>
+	VECTORIZE_VEC(acsch)
-GLM_FUNC_QUALIFIER detail::tvec2<valType> sech
-(
-	detail::tvec2<valType> const & angle
-)
-{
-    return detail::tvec2<valType>(
-        sech(angle.x),
-        sech(angle.y));
-}
 
-template <typename valType>
+	// acoth
-GLM_FUNC_QUALIFIER detail::tvec3<valType> sech
+	template <typename genType>
-(
+	GLM_FUNC_QUALIFIER genType acoth
-	detail::tvec3<valType> const & angle
+	(
-)
+		genType const & x
-{
+	)
-    return detail::tvec3<valType>(
+	{
-        sech(angle.x),
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acoth' only accept floating-point values");
-        sech(angle.y),
-        sech(angle.z));
-}
 
-template <typename valType>
+		return atanh(genType(1) / x);
-GLM_FUNC_QUALIFIER detail::tvec4<valType> sech
+	}
-(
-	detail::tvec4<valType> const & angle
-)
-{
-    return detail::tvec4<valType>(
-        sech(angle.x),
-        sech(angle.y),
-        sech(angle.z),
-        sech(angle.w));
-}
-
-// csch
-template <typename genType>
-GLM_FUNC_QUALIFIER genType csch
-(
-	genType const & angle
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'csch' only accept floating-point values");
-
-    return genType(1) / glm::sinh(angle);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> csch
-(
-	detail::tvec2<valType> const & angle
-)
-{
-    return detail::tvec2<valType>(
-        csch(angle.x),
-        csch(angle.y));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> csch
-(
-	detail::tvec3<valType> const & angle
-)
-{
-    return detail::tvec3<valType>(
-        csch(angle.x),
-        csch(angle.y),
-        csch(angle.z));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> csch
-(	
-	detail::tvec4<valType> const & angle
-)
-{
-    return detail::tvec4<valType>(
-        csch(angle.x),
-        csch(angle.y),
-        csch(angle.z),
-        csch(angle.w));
-}
-
-// coth
-template <typename genType>
-GLM_FUNC_QUALIFIER genType coth
-(
-	genType const & angle
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'coth' only accept floating-point values");
-
-	return glm::cosh(angle) / glm::sinh(angle);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> coth
-(
-	detail::tvec2<valType> const & angle
-)
-{
-    return detail::tvec2<valType>(
-        coth(angle.x),
-        coth(angle.y));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> coth
-(
-	detail::tvec3<valType> const & angle
-)
-{
-    return detail::tvec3<valType>(
-        coth(angle.x),
-        coth(angle.y),
-        coth(angle.z));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> coth
-(
-	detail::tvec4<valType> const & angle
-)
-{
-    return detail::tvec4<valType>(
-        coth(angle.x),
-        coth(angle.y),
-        coth(angle.z),
-        coth(angle.w));
-}
-
-// asech
-template <typename genType>
-GLM_FUNC_QUALIFIER genType asech
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'asech' only accept floating-point values");
-
-	return acosh(genType(1) / x);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> asech
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        asech(x.x),
-        asech(x.y));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> asech
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        asech(x.x),
-        asech(x.y),
-        asech(x.z));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> asech
-(
-	detail::tvec4<valType> const & x
-)
-{
-    return detail::tvec4<valType>(
-        asech(x.x),
-        asech(x.y),
-        asech(x.z),
-        asech(x.w));
-}
-
-// acsch
-template <typename genType>
-GLM_FUNC_QUALIFIER genType acsch
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acsch' only accept floating-point values");
-
-    return asinh(genType(1) / x);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> acsch
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        acsch(x.x),
-        acsch(x.y));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> acsch
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        acsch(x.x),
-        acsch(x.y),
-        acsch(x.z));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> acsch
-(	
-	detail::tvec4<valType> const & x
-)
-{
-    return detail::tvec4<valType>(
-        acsch(x.x),
-        acsch(x.y),
-        acsch(x.z),
-        acsch(x.w));
-}
-
-// acoth
-template <typename genType>
-GLM_FUNC_QUALIFIER genType acoth
-(
-	genType const & x
-)
-{
-	GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'acoth' only accept floating-point values");
-
-	return atanh(genType(1) / x);
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec2<valType> acoth
-(
-	detail::tvec2<valType> const & x
-)
-{
-    return detail::tvec2<valType>(
-        acoth(x.x),
-        acoth(x.y));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec3<valType> acoth
-(
-	detail::tvec3<valType> const & x
-)
-{
-    return detail::tvec3<valType>(
-        acoth(x.x),
-        acoth(x.y),
-        acoth(x.z));
-}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER detail::tvec4<valType> acoth
-(
-	detail::tvec4<valType> const & x
-)
-{
-    return detail::tvec4<valType>(
-        acoth(x.x),
-        acoth(x.y),
-        acoth(x.z),
-        acoth(x.w));
-}
 
+	VECTORIZE_VEC(acoth)
 }//namespace glm

glm/gtx/rotate_vector.inl

@@ -7,139 +7,158 @@
 // File    : glm/gtx/rotate_vector.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> rotate(
-    detail::tvec2<T> const & v, 
-	T const & angle)
 {
-	detail::tvec2<T> Result;
+	template <typename T>
-	const T Cos = cos(radians(angle));
+	GLM_FUNC_QUALIFIER detail::tvec2<T> rotate
-    const T Sin = sin(radians(angle));
+	(
-	Result.x = v.x * Cos - v.y * Sin;
+		detail::tvec2<T> const & v, 
-	Result.y = v.x * Sin + v.y * Cos;
+		T const & angle
-	return Result;
+	)
-}
+	{
+		detail::tvec2<T> Result;
+		T const Cos = cos(radians(angle));
+		T const Sin = sin(radians(angle));
+		Result.x = v.x * Cos - v.y * Sin;
+		Result.y = v.x * Sin + v.y * Cos;
+		return Result;
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotate(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotate
-	const detail::tvec3<T> & v, 
+	(
-    T const & angle, 
+		detail::tvec3<T> const & v, 
-	const detail::tvec3<T> & normal)
+		T const & angle, 
-{
+		detail::tvec3<T> const & normal
-	return detail::tmat3x3<T>(glm::rotate(angle, normal)) * v;
+	)
-}
+	{
-/*
+		return detail::tmat3x3<T>(glm::rotate(angle, normal)) * v;
-template <typename T> 
+	}
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotateGTX(
+	/*
-    const detail::tvec3<T>& x, 
+	template <typename T> 
-    T angle, 
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotateGTX(
-    const detail::tvec3<T>& normal)
+		const detail::tvec3<T>& x, 
-{
+		T angle, 
-    const T Cos = cos(radians(angle));
+		const detail::tvec3<T>& normal)
-    const T Sin = sin(radians(angle));
+	{
-    return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin;
+		const T Cos = cos(radians(angle));
-}
+		const T Sin = sin(radians(angle));
-*/
+		return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin;
-template <typename T> 
+	}
-GLM_FUNC_QUALIFIER detail::tvec4<T> rotate(
+	*/
-    detail::tvec4<T> const & v, 
+	template <typename T> 
-	T const & angle, 
+	GLM_FUNC_QUALIFIER detail::tvec4<T> rotate
-    detail::tvec3<T> const & normal)
+	(
-{
+		detail::tvec4<T> const & v, 
-	return rotate(angle, normal) * v;
+		T const & angle, 
-}
+		detail::tvec3<T> const & normal
+	)
+	{
+		return rotate(angle, normal) * v;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotateX(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotateX
-	detail::tvec3<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec3<T> const & v, 
-{
+		T const & angle
-	detail::tvec3<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec3<T> Result = v;
-	Result.y = v.y * Cos - v.z * Sin;
+		const T Cos = cos(radians(angle));
-	Result.z = v.y * Sin + v.z * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.y = v.y * Cos - v.z * Sin;
-}
+		Result.z = v.y * Sin + v.z * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotateY(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotateY
-	detail::tvec3<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec3<T> const & v, 
-{
+		T const & angle
-	detail::tvec3<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec3<T> Result = v;
-	Result.x =  v.x * Cos + v.z * Sin;
+		const T Cos = cos(radians(angle));
-	Result.z = -v.x * Sin + v.z * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.x =  v.x * Cos + v.z * Sin;
-}
+		Result.z = -v.x * Sin + v.z * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> rotateZ(
+	GLM_FUNC_QUALIFIER detail::tvec3<T> rotateZ
-	detail::tvec3<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec3<T> const & v, 
-{
+		T const & angle
-	detail::tvec3<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec3<T> Result = v;
-	Result.x = v.x * Cos - v.y * Sin;
+		const T Cos = cos(radians(angle));
-	Result.y = v.x * Sin + v.y * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.x = v.x * Cos - v.y * Sin;
-}
+		Result.y = v.x * Sin + v.y * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> rotateX(
+	GLM_FUNC_QUALIFIER detail::tvec4<T> rotateX
-	detail::tvec4<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec4<T> const & v, 
-{
+		T const & angle
-	detail::tvec4<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec4<T> Result = v;
-	Result.y = v.y * Cos - v.z * Sin;
+		const T Cos = cos(radians(angle));
-	Result.z = v.y * Sin + v.z * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.y = v.y * Cos - v.z * Sin;
-}
+		Result.z = v.y * Sin + v.z * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> rotateY(
+	GLM_FUNC_QUALIFIER detail::tvec4<T> rotateY
-	detail::tvec4<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec4<T> const & v, 
-{
+		T const & angle
-	detail::tvec4<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec4<T> Result = v;
-	Result.x =  v.x * Cos + v.z * Sin;
+		const T Cos = cos(radians(angle));
-	Result.z = -v.x * Sin + v.z * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.x =  v.x * Cos + v.z * Sin;
-}
+		Result.z = -v.x * Sin + v.z * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> rotateZ(
+	GLM_FUNC_QUALIFIER detail::tvec4<T> rotateZ
-	detail::tvec4<T> const & v, 
+	(
-	T const & angle)
+		detail::tvec4<T> const & v, 
-{
+		T const & angle
-	detail::tvec4<T> Result = v;
+	)
-	const T Cos = cos(radians(angle));
+	{
-    const T Sin = sin(radians(angle));
+		detail::tvec4<T> Result = v;
-	Result.x = v.x * Cos - v.y * Sin;
+		const T Cos = cos(radians(angle));
-	Result.y = v.x * Sin + v.y * Cos;
+		const T Sin = sin(radians(angle));
-	return Result;
+		Result.x = v.x * Cos - v.y * Sin;
-}
+		Result.y = v.x * Sin + v.y * Cos;
+		return Result;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> orientation(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> orientation
-	detail::tvec3<T> const & Normal, 
+	(
-	detail::tvec3<T> const & Up)
+		detail::tvec3<T> const & Normal, 
-{
+		detail::tvec3<T> const & Up
-	if(all(equal(Normal, Up)))
+	)
-		return detail::tmat4x4<T>(T(1));
+	{
-
+		if(all(equal(Normal, Up)))
-	detail::tvec3<T> RotationAxis = cross(Up, Normal);
+			return detail::tmat4x4<T>(T(1));
-	T Angle = degrees(acos(dot(Normal, Up)));
-	return rotate(Angle, RotationAxis);
-}
 
+		detail::tvec3<T> RotationAxis = cross(Up, Normal);
+		T Angle = degrees(acos(dot(Normal, Up)));
+		return rotate(Angle, RotationAxis);
+	}
 }//namespace glm

glm/gtx/transform2.inl

@@ -7,149 +7,148 @@
 // File : glm/gtx/transform2.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearX2D(
-	const detail::tmat3x3<T>& m, 
-	T s)
 {
-    detail::tmat3x3<T> r(1);
+	template <typename T> 
-    r[0][1] = s;
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearX2D(
-    return m * r;
+		const detail::tmat3x3<T>& m, 
-}
+		T s)
+	{
+		detail::tmat3x3<T> r(1);
+		r[0][1] = s;
+		return m * r;
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearY2D(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> shearY2D(
-	const detail::tmat3x3<T>& m, 
+		const detail::tmat3x3<T>& m, 
-	T s)
+		T s)
-{
+	{
-    detail::tmat3x3<T> r(1);
+		detail::tmat3x3<T> r(1);
-    r[1][0] = s;
+		r[1][0] = s;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearX3D(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearX3D(
-	const detail::tmat4x4<T>& m, 
+		const detail::tmat4x4<T>& m, 
-	T s, 
+		T s, 
-	T t)
+		T t)
-{
+	{
-    detail::tmat4x4<T> r(1);
+		detail::tmat4x4<T> r(1);
-    r[1][0] = s;
+		r[1][0] = s;
-    r[2][0] = t;
+		r[2][0] = t;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearY3D(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearY3D(
-	const detail::tmat4x4<T>& m, 
+		const detail::tmat4x4<T>& m, 
-	T s, 
+		T s, 
-	T t)
+		T t)
-{
+	{
-    detail::tmat4x4<T> r(1);
+		detail::tmat4x4<T> r(1);
-    r[0][1] = s;
+		r[0][1] = s;
-    r[2][1] = t;
+		r[2][1] = t;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T>     
+	template <typename T>     
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearZ3D(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> shearZ3D(
-	const detail::tmat4x4<T>& m, 
+		const detail::tmat4x4<T>& m, 
-	T s, 
+		T s, 
-	T t)
+		T t)
-{
+	{
-    detail::tmat4x4<T> r(1);
+		detail::tmat4x4<T> r(1);
-    r[0][2] = s;
+		r[0][2] = s;
-    r[1][2] = t;
+		r[1][2] = t;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> reflect2D(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> reflect2D(
-	const detail::tmat3x3<T>& m, 
+		const detail::tmat3x3<T>& m, 
-	const detail::tvec3<T>& normal)
+		const detail::tvec3<T>& normal)
-{
+	{
-    detail::tmat3x3<T> r(1);
+		detail::tmat3x3<T> r(1);
-    r[0][0] = 1 - 2 * normal.x * normal.x;
+		r[0][0] = 1 - 2 * normal.x * normal.x;
-    r[0][1] = -2 * normal.x * normal.y;
+		r[0][1] = -2 * normal.x * normal.y;
-    r[1][0] = -2 * normal.x * normal.y;
+		r[1][0] = -2 * normal.x * normal.y;
-    r[1][1] = 1 - 2 * normal.y * normal.y;
+		r[1][1] = 1 - 2 * normal.y * normal.y;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> reflect3D(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> reflect3D(
-	const detail::tmat4x4<T>& m, 
+		const detail::tmat4x4<T>& m, 
-	const detail::tvec3<T>& normal)
+		const detail::tvec3<T>& normal)
-{
+	{
-    detail::tmat4x4<T> r(1);
+		detail::tmat4x4<T> r(1);
-    r[0][0] = 1 - 2 * normal.x * normal.x;
+		r[0][0] = 1 - 2 * normal.x * normal.x;
-    r[0][1] = -2 * normal.x * normal.y;
+		r[0][1] = -2 * normal.x * normal.y;
-    r[0][2] = -2 * normal.x * normal.z;
+		r[0][2] = -2 * normal.x * normal.z;
 
-    r[1][0] = -2 * normal.x * normal.y;
+		r[1][0] = -2 * normal.x * normal.y;
-    r[1][1] = 1 - 2 * normal.y * normal.y;
+		r[1][1] = 1 - 2 * normal.y * normal.y;
-    r[1][2] = -2 * normal.y * normal.z;
+		r[1][2] = -2 * normal.y * normal.z;
 
-    r[2][0] = -2 * normal.x * normal.z;
+		r[2][0] = -2 * normal.x * normal.z;
-    r[2][1] = -2 * normal.y * normal.z;
+		r[2][1] = -2 * normal.y * normal.z;
-    r[2][2] = 1 - 2 * normal.z * normal.z;
+		r[2][2] = 1 - 2 * normal.z * normal.z;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> proj2D(
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> proj2D(
-	const detail::tmat3x3<T>& m, 
+		const detail::tmat3x3<T>& m, 
-	const detail::tvec3<T>& normal)
+		const detail::tvec3<T>& normal)
-{
+	{
-    detail::tmat3x3<T> r(1);
+		detail::tmat3x3<T> r(1);
-    r[0][0] = 1 - normal.x * normal.x;
+		r[0][0] = 1 - normal.x * normal.x;
-    r[0][1] = - normal.x * normal.y;
+		r[0][1] = - normal.x * normal.y;
-    r[1][0] = - normal.x * normal.y;
+		r[1][0] = - normal.x * normal.y;
-    r[1][1] = 1 - normal.y * normal.y;
+		r[1][1] = 1 - normal.y * normal.y;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> proj3D(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> proj3D(
-	const detail::tmat4x4<T>& m, 
+		const detail::tmat4x4<T>& m, 
-	const detail::tvec3<T>& normal)
+		const detail::tvec3<T>& normal)
-{
+	{
-    detail::tmat4x4<T> r(1);
+		detail::tmat4x4<T> r(1);
-    r[0][0] = 1 - normal.x * normal.x;
+		r[0][0] = 1 - normal.x * normal.x;
-    r[0][1] = - normal.x * normal.y;
+		r[0][1] = - normal.x * normal.y;
-    r[0][2] = - normal.x * normal.z;
+		r[0][2] = - normal.x * normal.z;
-    r[1][0] = - normal.x * normal.y;
+		r[1][0] = - normal.x * normal.y;
-    r[1][1] = 1 - normal.y * normal.y;
+		r[1][1] = 1 - normal.y * normal.y;
-    r[1][2] = - normal.y * normal.z;
+		r[1][2] = - normal.y * normal.z;
-    r[2][0] = - normal.x * normal.z;
+		r[2][0] = - normal.x * normal.z;
-    r[2][1] = - normal.y * normal.z;
+		r[2][1] = - normal.y * normal.z;
-    r[2][2] = 1 - normal.z * normal.z;
+		r[2][2] = 1 - normal.z * normal.z;
-    return m * r;
+		return m * r;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
-	T scale, 
+		T scale, 
-	T bias)
+		T bias)
-{
+	{
-	detail::tmat4x4<T> result;
+		detail::tmat4x4<T> result;
-	result[3] = detail::tvec4<T>(detail::tvec3<T>(bias), T(1));
+		result[3] = detail::tvec4<T>(detail::tvec3<T>(bias), T(1));
-	result[0][0] = scale;
+		result[0][0] = scale;
-	result[1][1] = scale;
+		result[1][1] = scale;
-	result[2][2] = scale;
+		result[2][2] = scale;
-	return result;
+		return result;
-}
+	}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
-	const detail::tmat4x4<T>& m, 
-	T scale, 
-	T bias)
-{
-	return m * scaleBias(scale, bias);
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> scaleBias(
+		const detail::tmat4x4<T>& m, 
+		T scale, 
+		T bias)
+	{
+		return m * scaleBias(scale, bias);
+	}
 }//namespace glm
 

glm/gtx/ulp.inl

@@ -42,34 +42,34 @@ typedef union
 } ieee_double_shape_type;
 
 #define GLM_EXTRACT_WORDS(ix0,ix1,d)                                \
-do {                                                            \
+	do {                                                            \
-  ieee_double_shape_type ew_u;                                  \
+	  ieee_double_shape_type ew_u;                                  \
-  ew_u.value = (d);                                             \
+	  ew_u.value = (d);                                             \
-  (ix0) = ew_u.parts.msw;                                       \
+	  (ix0) = ew_u.parts.msw;                                       \
-  (ix1) = ew_u.parts.lsw;                                       \
+	  (ix1) = ew_u.parts.lsw;                                       \
-} while (0)
+	} while (0)
 
 #define GLM_GET_FLOAT_WORD(i,d)                                     \
-do {                                                            \
+	do {                                                            \
-  ieee_float_shape_type gf_u;                                   \
+	  ieee_float_shape_type gf_u;                                   \
-  gf_u.value = (d);                                             \
+	  gf_u.value = (d);                                             \
-  (i) = gf_u.word;                                              \
+	  (i) = gf_u.word;                                              \
-} while (0)
+	} while (0)
 
 #define GLM_SET_FLOAT_WORD(d,i)                                     \
-do {                                                            \
+	do {                                                            \
-  ieee_float_shape_type sf_u;                                   \
+	  ieee_float_shape_type sf_u;                                   \
-  sf_u.word = (i);                                              \
+	  sf_u.word = (i);                                              \
-  (d) = sf_u.value;                                             \
+	  (d) = sf_u.value;                                             \
-} while (0)
+	} while (0)
 
 #define GLM_INSERT_WORDS(d,ix0,ix1)                                 \
-do {                                                            \
+	do {                                                            \
-  ieee_double_shape_type iw_u;                                  \
+	  ieee_double_shape_type iw_u;                                  \
-  iw_u.parts.msw = (ix0);                                       \
+	  iw_u.parts.msw = (ix0);                                       \
-  iw_u.parts.lsw = (ix1);                                       \
+	  iw_u.parts.lsw = (ix1);                                       \
-  (d) = iw_u.value;                                             \
+	  (d) = iw_u.value;                                             \
-} while (0)
+	} while (0)
 
 namespace glm{
 namespace detail
@@ -181,218 +181,119 @@ namespace detail
 #   define GLM_NEXT_AFTER_DBL(x, toward) nextafter((x), (toward))
 #endif
 
-namespace glm{
+namespace glm
-
-GLM_FUNC_QUALIFIER float next_float(float const & x)
 {
-    return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::max());
+	GLM_FUNC_QUALIFIER float next_float(float const & x)
-}
+	{
+		return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::max());
+	}
 
-GLM_FUNC_QUALIFIER double next_float(double const & x)
+	GLM_FUNC_QUALIFIER double next_float(double const & x)
-{
+	{
-    return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::max());
+		return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::max());
-}
+	}
 
-template<typename T, template<typename> class vecType>
+	template<typename T, template<typename> class vecType>
-GLM_FUNC_QUALIFIER vecType<T> next_float(vecType<T> const & x)
+	GLM_FUNC_QUALIFIER vecType<T> next_float(vecType<T> const & x)
-{
+	{
-    vecType<T> Result;
+		vecType<T> Result;
-    for(std::size_t i = 0; i < Result.length(); ++i)
+		for(std::size_t i = 0; i < Result.length(); ++i)
-        Result[i] = next_float(x[i]);
+			Result[i] = next_float(x[i]);
-    return Result;
+		return Result;
-}
+	}
 
-GLM_FUNC_QUALIFIER float prev_float(float const & x)
+	GLM_FUNC_QUALIFIER float prev_float(float const & x)
-{
+	{
-    return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::min());
+		return GLM_NEXT_AFTER_FLT(x, std::numeric_limits<float>::min());
-}
+	}
 
-GLM_FUNC_QUALIFIER double prev_float(double const & x)
+	GLM_FUNC_QUALIFIER double prev_float(double const & x)
-{
+	{
-    return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::min());
+		return GLM_NEXT_AFTER_DBL(x, std::numeric_limits<double>::min());
-}
+	}
 
-template<typename T, template<typename> class vecType>
+	template<typename T, template<typename> class vecType>
-GLM_FUNC_QUALIFIER vecType<T> prev_float(vecType<T> const & x)
+	GLM_FUNC_QUALIFIER vecType<T> prev_float(vecType<T> const & x)
-{
+	{
-    vecType<T> Result;
+		vecType<T> Result;
-    for(std::size_t i = 0; i < Result.length(); ++i)
+		for(std::size_t i = 0; i < Result.length(); ++i)
-        Result[i] = prev_float(x[i]);
+			Result[i] = prev_float(x[i]);
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T next_float(T const & x, uint const & ulps)
+	GLM_FUNC_QUALIFIER T next_float(T const & x, uint const & ulps)
-{
+	{
-    T temp = x;
+		T temp = x;
-    for(std::size_t i = 0; i < ulps; ++i)
+		for(std::size_t i = 0; i < ulps; ++i)
-        temp = next_float(temp);
+			temp = next_float(temp);
-    return temp;
+		return temp;
-}
+	}
 
-template<typename T, template<typename> class vecType>
+	template<typename T, template<typename> class vecType>
-GLM_FUNC_QUALIFIER vecType<T> next_float(vecType<T> const & x, vecType<uint> const & ulps)
+	GLM_FUNC_QUALIFIER vecType<T> next_float(vecType<T> const & x, vecType<uint> const & ulps)
-{
+	{
-    vecType<T> Result;
+		vecType<T> Result;
-    for(std::size_t i = 0; i < Result.length(); ++i)
+		for(std::size_t i = 0; i < Result.length(); ++i)
-        Result[i] = next_float(x[i], ulps[i]);
+			Result[i] = next_float(x[i], ulps[i]);
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER T prev_float(T const & x, uint const & ulps)
+	GLM_FUNC_QUALIFIER T prev_float(T const & x, uint const & ulps)
-{
+	{
-    T temp = x;
+		T temp = x;
-    for(std::size_t i = 0; i < ulps; ++i)
+		for(std::size_t i = 0; i < ulps; ++i)
-        temp = prev_float(temp);
+			temp = prev_float(temp);
-    return temp;
+		return temp;
-}
+	}
 
-template<typename T, template<typename> class vecType>
+	template<typename T, template<typename> class vecType>
-GLM_FUNC_QUALIFIER vecType<T> prev_float(vecType<T> const & x, vecType<uint> const & ulps)
+	GLM_FUNC_QUALIFIER vecType<T> prev_float(vecType<T> const & x, vecType<uint> const & ulps)
-{
+	{
-    vecType<T> Result;
+		vecType<T> Result;
-    for(std::size_t i = 0; i < Result.length(); ++i)
+		for(std::size_t i = 0; i < Result.length(); ++i)
-        Result[i] = prev_float(x[i], ulps[i]);
+			Result[i] = prev_float(x[i], ulps[i]);
-    return Result;
+		return Result;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER uint float_distance(T const & x, T const & y)
+	GLM_FUNC_QUALIFIER uint float_distance(T const & x, T const & y)
-{
+	{
-    uint ulp = 0;
+		uint ulp = 0;
 
-    if(x < y)
+		if(x < y)
-    {
+		{
-        T temp = x;
+			T temp = x;
-        while(temp != y && ulp < std::numeric_limits<std::size_t>::max())
+			while(temp != y && ulp < std::numeric_limits<std::size_t>::max())
-        {
+			{
-            ++ulp;
+				++ulp;
-            temp = next_float(temp);
+				temp = next_float(temp);
-        }
+			}
-    }
+		}
-    else if(y < x)
+		else if(y < x)
-    {
+		{
-        T temp = y;
+			T temp = y;
-        while(temp != x && ulp < std::numeric_limits<std::size_t>::max())
+			while(temp != x && ulp < std::numeric_limits<std::size_t>::max())
-        {
+			{
-            ++ulp;
+				++ulp;
-            temp = next_float(temp);
+				temp = next_float(temp);
-        }
+			}
-    }
+		}
-    else // ==
+		else // ==
-    {
+		{
 
-    }
+		}
 
-    return ulp;
+		return ulp;
-}
+	}
-
-template<typename T, template<typename> class vecType>
-GLM_FUNC_QUALIFIER vecType<uint> float_distance(vecType<T> const & x, vecType<T> const & y)
-{
-    vecType<uint> Result;
-    for(std::size_t i = 0; i < Result.length(); ++i)
-        Result[i] = float_distance(x[i], y[i]);
-    return Result;
-}
-/*
-inline std::size_t ulp
-(
-	detail::thalf const & a,
-	detail::thalf const & b
-)
-{
-	std::size_t Count = 0;
-	float TempA(a);
-	float TempB(b);
-	//while((TempA = _nextafterf(TempA, TempB)) != TempB)
-		++Count;
-	return Count;
-}
-
-inline std::size_t ulp
-(
-	float const & a,
-	float const & b
-)
-{
-	std::size_t Count = 0;
-	float Temp = a;
-	//while((Temp = _nextafterf(Temp, b)) != b)
-    {
-        std::cout << Temp << " " << b << std::endl;
-		++Count;
-    }
-	return Count;
-}
-
-inline std::size_t ulp
-(
-	double const & a,
-	double const & b
-)
-{
-	std::size_t Count = 0;
-	double Temp = a;
-	//while((Temp = _nextafter(Temp, b)) != b)
-    {
-        std::cout << Temp << " " << b << std::endl;
-		++Count;
-    }
-	return Count;
-}
-
-template <typename T>
-inline std::size_t ulp
-(
-	detail::tvec2<T> const & a,
-	detail::tvec2<T> const & b
-)
-{
-    std::size_t ulps[] = 
-    {
-        ulp(a[0], b[0]),
-        ulp(a[1], b[1])
-    };
-
-    return glm::max(ulps[0], ulps[1]);
-}
-
-template <typename T>
-inline std::size_t ulp
-(
-	detail::tvec3<T> const & a,
-	detail::tvec3<T> const & b
-)
-{
-    std::size_t ulps[] = 
-    {
-        ulp(a[0], b[0]),
-        ulp(a[1], b[1]),
-        ulp(a[2], b[2])
-    };
-
-    return glm::max(glm::max(ulps[0], ulps[1]), ulps[2]);
-}
-
-template <typename T>
-inline std::size_t ulp
-(
-	detail::tvec4<T> const & a,
-	detail::tvec4<T> const & b
-)
-{
-    std::size_t ulps[] = 
-    {
-        ulp(a[0], b[0]),
-        ulp(a[1], b[1]),
-        ulp(a[2], b[2]),
-        ulp(a[3], b[3])
-    };
-
-    return glm::max(glm::max(ulps[0], ulps[1]), glm::max(ulps[2], ulps[3]));
-}
-*/
 
+	template<typename T, template<typename> class vecType>
+	GLM_FUNC_QUALIFIER vecType<uint> float_distance(vecType<T> const & x, vecType<T> const & y)
+	{
+		vecType<uint> Result;
+		for(std::size_t i = 0; i < Result.length(); ++i)
+			Result[i] = float_distance(x[i], y[i]);
+		return Result;
+	}
 }//namespace glm

glm/gtx/unsigned_int.inl

@@ -7,7 +7,7 @@
 // File    : glm/gtx/unsigned_int.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
+{
 
 }//namespace glm

glm/gtx/vector_access.inl

@@ -7,48 +7,47 @@
 // File    : glm/gtx/vector_access.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename valType> 
-GLM_FUNC_QUALIFIER void set
-(
-	detail::tvec2<valType>& v, 
-	valType const & x, 
-	valType const & y
-)
 {
-    v.x = x;
+	template <typename valType> 
-    v.y = y;
+	GLM_FUNC_QUALIFIER void set
-}
+	(
+		detail::tvec2<valType>& v, 
+		valType const & x, 
+		valType const & y
+	)
+	{
+		v.x = x;
+		v.y = y;
+	}
 
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER void set
+	GLM_FUNC_QUALIFIER void set
-(
+	(
-	detail::tvec3<valType>& v, 
+		detail::tvec3<valType>& v, 
-	valType const & x, 
+		valType const & x, 
-	valType const & y, 
+		valType const & y, 
-	valType const & z
+		valType const & z
-)
+	)
-{
+	{
-    v.x = x;
+		v.x = x;
-    v.y = y;
+		v.y = y;
-    v.z = z;
+		v.z = z;
-}
+	}
-
-template <typename valType>
-GLM_FUNC_QUALIFIER void set
-(
-	detail::tvec4<valType>& v, 
-	valType const & x, 
-	valType const & y, 
-	valType const & z, 
-	valType const & w
-)
-{
-    v.x = x;
-    v.y = y;
-    v.z = z;
-    v.w = w;
-}
 
+	template <typename valType>
+	GLM_FUNC_QUALIFIER void set
+	(
+		detail::tvec4<valType>& v, 
+		valType const & x, 
+		valType const & y, 
+		valType const & z, 
+		valType const & w
+	)
+	{
+		v.x = x;
+		v.y = y;
+		v.z = z;
+		v.w = w;
+	}
 }//namespace glm

glm/gtx/vector_angle.inl

@@ -7,48 +7,47 @@
 // File    : glm/gtx/vector_angle.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER typename genType::value_type angle
-(
-	genType const & x, 
-	genType const & y
-)
 {
-	return degrees(acos(dot(x, y)));
+	template <typename genType> 
-}
+	GLM_FUNC_QUALIFIER typename genType::value_type angle
+	(
+		genType const & x, 
+		genType const & y
+	)
+	{
+		return degrees(acos(dot(x, y)));
+	}
 
-//! \todo epsilon is hard coded to 0.01
+	//! \todo epsilon is hard coded to 0.01
-template <typename valType> 
+	template <typename valType> 
-GLM_FUNC_QUALIFIER valType orientedAngle
+	GLM_FUNC_QUALIFIER valType orientedAngle
-(
+	(
-	detail::tvec2<valType> const & x, 
+		detail::tvec2<valType> const & x, 
-	detail::tvec2<valType> const & y
+		detail::tvec2<valType> const & y
-)
+	)
-{
+	{
-    valType Angle = glm::degrees(acos(dot(x, y)));
+		valType Angle = glm::degrees(acos(dot(x, y)));
-	detail::tvec2<valType> TransformedVector = glm::rotate(x, Angle);
+		detail::tvec2<valType> TransformedVector = glm::rotate(x, Angle);
-    if(all(equalEpsilon(y, TransformedVector, valType(0.01))))
+		if(all(equalEpsilon(y, TransformedVector, valType(0.01))))
-		return Angle;
+			return Angle;
-    else
+		else
-        return -Angle;
+			return -Angle;
-}
+	}
 
-template <typename valType>
+	template <typename valType>
-GLM_FUNC_QUALIFIER valType orientedAngle
+	GLM_FUNC_QUALIFIER valType orientedAngle
-(
+	(
-	detail::tvec3<valType> const & x,
+		detail::tvec3<valType> const & x,
-	detail::tvec3<valType> const & y,
+		detail::tvec3<valType> const & y,
-	detail::tvec3<valType> const & ref
+		detail::tvec3<valType> const & ref
-)
+	)
-{
+	{
-	valType Angle = glm::degrees(glm::acos(glm::dot(x, y)));
+		valType Angle = glm::degrees(glm::acos(glm::dot(x, y)));
-
-	if(glm::dot(ref, glm::cross(x, y)) < valType(0))
-		return -Angle;
-	else
-		return Angle;
-}
 
+		if(glm::dot(ref, glm::cross(x, y)) < valType(0))
+			return -Angle;
+		else
+			return Angle;
+	}
 }//namespace glm

glm/gtx/vector_query.inl

@@ -12,159 +12,158 @@
 
 #include <cassert>
 
-namespace glm{
+namespace glm
-
-template <typename T>
-GLM_FUNC_QUALIFIER bool areCollinear
-(
-	detail::tvec2<T> const & v0, 
-	detail::tvec2<T> const & v1, 
-	T const & epsilon
-)
 {
-	return length(cross(detail::tvec3<T>(v0, T(0)), detail::tvec3<T>(v1, T(0)))) < epsilon;
+	template <typename T>
-}
+	GLM_FUNC_QUALIFIER bool areCollinear
+	(
+		detail::tvec2<T> const & v0, 
+		detail::tvec2<T> const & v1, 
+		T const & epsilon
+	)
+	{
+		return length(cross(detail::tvec3<T>(v0, T(0)), detail::tvec3<T>(v1, T(0)))) < epsilon;
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER bool areCollinear
+	GLM_FUNC_QUALIFIER bool areCollinear
-(
+	(
-	detail::tvec3<T> const & v0, 
+		detail::tvec3<T> const & v0, 
-	detail::tvec3<T> const & v1, 
+		detail::tvec3<T> const & v1, 
-	T const & epsilon
+		T const & epsilon
-)
+	)
-{
+	{
-	return length(cross(v0, v1)) < epsilon;
+		return length(cross(v0, v1)) < epsilon;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER bool areCollinear
+	GLM_FUNC_QUALIFIER bool areCollinear
-(
+	(
-	detail::tvec4<T> const & v0, 
+		detail::tvec4<T> const & v0, 
-	detail::tvec4<T> const & v1, 
+		detail::tvec4<T> const & v1, 
-	T const & epsilon
+		T const & epsilon
-)
+	)
-{
+	{
-	return length(cross(detail::tvec3<T>(v0), detail::tvec3<T>(v1))) < epsilon;
+		return length(cross(detail::tvec3<T>(v0), detail::tvec3<T>(v1))) < epsilon;
-}
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER bool areOpposite
+	GLM_FUNC_QUALIFIER bool areOpposite
-(
+	(
-	genType const & v0, 
+		genType const & v0, 
-	genType const & v1, 
+		genType const & v1, 
-	typename genType::value_type const & epsilon
+		typename genType::value_type const & epsilon
-)
+	)
-{
+	{
-	assert(isNormalized(v0) && isNormalized(v1));
+		assert(isNormalized(v0) && isNormalized(v1));
-    return((typename genType::value_type(1) + dot(v0, v1)) <= epsilon);
+		return((typename genType::value_type(1) + dot(v0, v1)) <= epsilon);
-}
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER bool areOrthogonal
+	GLM_FUNC_QUALIFIER bool areOrthogonal
-(
+	(
-	genType const & v0, 
+		genType const & v0, 
-	genType const & v1, 
+		genType const & v1, 
-	typename genType::value_type const & epsilon
+		typename genType::value_type const & epsilon
-)
+	)
-{
+	{
-	return abs(dot(v0, v1)) <= max(
+		return abs(dot(v0, v1)) <= max(
-		typename genType::value_type(1), 
-		length(v0)) * max(
 			typename genType::value_type(1), 
-			length(v1)) * epsilon;
+			length(v0)) * max(
-}
+				typename genType::value_type(1), 
+				length(v1)) * epsilon;
+	}
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER bool isNormalized
+	GLM_FUNC_QUALIFIER bool isNormalized
-(
+	(
-	genType const & v, 
+		genType const & v, 
-	typename genType::value_type const & epsilon
+		typename genType::value_type const & epsilon
-)
+	)
-{
+	{
-	return abs(length(v) - typename genType::value_type(1)) <= typename genType::value_type(2) * epsilon;
+		return abs(length(v) - typename genType::value_type(1)) <= typename genType::value_type(2) * epsilon;
-}
+	}
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER bool isNull
+	GLM_FUNC_QUALIFIER bool isNull
-(
+	(
-	genType const & v, 
+		genType const & v, 
-	typename genType::value_type const & epsilon
+		typename genType::value_type const & epsilon
-)
+	)
-{
+	{
-	return length(v) <= epsilon;
+		return length(v) <= epsilon;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER bool isCompNull
+	GLM_FUNC_QUALIFIER bool isCompNull
-(
+	(
-	T const & s, 
+		T const & s, 
-	T const & epsilon
+		T const & epsilon
-)
+	)
-{
+	{
-    return abs(s) < epsilon;
+		return abs(s) < epsilon;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<bool> isCompNull
+	GLM_FUNC_QUALIFIER detail::tvec2<bool> isCompNull
-(
+	(
-	detail::tvec2<T> const & v, 
+		detail::tvec2<T> const & v, 
-	T const & epsilon)
+		T const & epsilon)
-{
+	{
-    return detail::tvec2<bool>(
+		return detail::tvec2<bool>(
-        (abs(v.x) < epsilon),
+			(abs(v.x) < epsilon),
-        (abs(v.y) < epsilon));
+			(abs(v.y) < epsilon));
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<bool> isCompNull
+	GLM_FUNC_QUALIFIER detail::tvec3<bool> isCompNull
-(
+	(
-	detail::tvec3<T> const & v, 
+		detail::tvec3<T> const & v, 
-	T const & epsilon
+		T const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec3<bool>(
+		return detail::tvec3<bool>(
-        abs(v.x) < epsilon,
+			abs(v.x) < epsilon,
-        abs(v.y) < epsilon,
+			abs(v.y) < epsilon,
-        abs(v.z) < epsilon);
+			abs(v.z) < epsilon);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<bool> isCompNull
+	GLM_FUNC_QUALIFIER detail::tvec4<bool> isCompNull
-(
+	(
-	detail::tvec4<T> const & v, 
+		detail::tvec4<T> const & v, 
-	T const & epsilon
+		T const & epsilon
-)
+	)
-{
+	{
-    return detail::tvec4<bool>(
+		return detail::tvec4<bool>(
-        abs(v.x) < epsilon,
+			abs(v.x) < epsilon,
-        abs(v.y) < epsilon,
+			abs(v.y) < epsilon,
-        abs(v.z) < epsilon,
+			abs(v.z) < epsilon,
-        abs(v.w) < epsilon);
+			abs(v.w) < epsilon);
-}
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER bool areOrthonormal
+	GLM_FUNC_QUALIFIER bool areOrthonormal
-(
+	(
-	genType const & v0, 
+		genType const & v0, 
-	genType const & v1, 
+		genType const & v1, 
-	typename genType::value_type const & epsilon
+		typename genType::value_type const & epsilon
-)
+	)
-{
+	{
-	return isNormalized(v0, epsilon) && isNormalized(v1, epsilon) && (abs(dot(v0, v1)) <= epsilon);
+		return isNormalized(v0, epsilon) && isNormalized(v1, epsilon) && (abs(dot(v0, v1)) <= epsilon);
-}
+	}
-
-template <typename genType>
-GLM_FUNC_QUALIFIER bool areSimilar
-(
-	genType const & v0, 
-	genType const & v1, 
-	typename genType::value_type const & epsilon
-)
-{
-	bool similar = true;
-    for(typename genType::size_type i = 0; similar && i < genType::value_size(); i++)
-		similar = (abs(v0[i] - v1[i]) <= epsilon);
-	return similar;
-}
 
+	template <typename genType>
+	GLM_FUNC_QUALIFIER bool areSimilar
+	(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon
+	)
+	{
+		bool similar = true;
+		for(typename genType::size_type i = 0; similar && i < genType::value_size(); i++)
+			similar = (abs(v0[i] - v1[i]) <= epsilon);
+		return similar;
+	}
 }//namespace glm

glm/gtx/verbose_operator.inl

@@ -7,119 +7,118 @@
 // File    : glm/gtx/verbose_operator.inl
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType>
-GLM_FUNC_QUALIFIER genType add(genType const & a, genType const & b)
 {
-    return a + b;
+	template <typename genType>
-}
+	GLM_FUNC_QUALIFIER genType add(genType const & a, genType const & b)
+	{
+		return a + b;
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType sub(genType const & a, genType const & b)
+	GLM_FUNC_QUALIFIER genType sub(genType const & a, genType const & b)
-{
+	{
-    return a - b;
+		return a - b;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat2x2<T> mul
+	GLM_FUNC_QUALIFIER detail::tmat2x2<T> mul
-(
+	(
-	detail::tmat2x2<T> const & a, 
+		detail::tmat2x2<T> const & a, 
-	detail::tmat2x2<T> const & b
+		detail::tmat2x2<T> const & b
-)
+	)
-{
+	{
-    return a * b;
+		return a * b;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat3x3<T> mul
+	GLM_FUNC_QUALIFIER detail::tmat3x3<T> mul
-(
+	(
-	detail::tmat3x3<T> const & a, 
+		detail::tmat3x3<T> const & a, 
-	detail::tmat3x3<T> const & b
+		detail::tmat3x3<T> const & b
-)
+	)
-{
+	{
-    return a * b;
+		return a * b;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tmat4x4<T> mul
+	GLM_FUNC_QUALIFIER detail::tmat4x4<T> mul
-(
+	(
-	detail::tmat4x4<T> const & a, 
+		detail::tmat4x4<T> const & a, 
-	detail::tmat4x4<T> const & b
+		detail::tmat4x4<T> const & b
-)
+	)
-{
+	{
-    return a * b;
+		return a * b;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec2<T> mul
-(
+	(
-	detail::tmat2x2<T> const & m, 
+		detail::tmat2x2<T> const & m, 
-	detail::tvec2<T> const & v
+		detail::tvec2<T> const & v
-)
+	)
-{
+	{
-    return m * v;
+		return m * v;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec3<T> mul
-(
+	(
-	detail::tmat3x3<T> const & m, 
+		detail::tmat3x3<T> const & m, 
-	detail::tvec3<T> const & v)
+		detail::tvec3<T> const & v)
-{
+	{
-    return m * v;
+		return m * v;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec4<T> mul
-(
+	(
-	detail::tmat4x4<T> const & m, 
+		detail::tmat4x4<T> const & m, 
-	detail::tvec4<T> const & v
+		detail::tvec4<T> const & v
-)
+	)
-{
+	{
-    return m * v;
+		return m * v;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec2<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec2<T> mul
-(
+	(
-	detail::tvec2<T> const & v, 
+		detail::tvec2<T> const & v, 
-	detail::tmat2x2<T> const & m
+		detail::tmat2x2<T> const & m
-)
+	)
-{
+	{
-    return v * m;
+		return v * m;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec3<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec3<T> mul
-(
+	(
-	detail::tvec3<T> const & v, 
+		detail::tvec3<T> const & v, 
-	detail::tmat3x3<T> const & m
+		detail::tmat3x3<T> const & m
-)
+	)
-{
+	{
-    return v * m;
+		return v * m;
-}
+	}
 
-template <typename T>
+	template <typename T>
-GLM_FUNC_QUALIFIER detail::tvec4<T> mul
+	GLM_FUNC_QUALIFIER detail::tvec4<T> mul
-(
+	(
-	detail::tvec4<T> const & v, 
+		detail::tvec4<T> const & v, 
-	detail::tmat4x4<T> const & m
+		detail::tmat4x4<T> const & m
-)
+	)
-{
+	{
-    return v * m;
+		return v * m;
-}
+	}
 
-template <typename genType>
+	template <typename genType>
-GLM_FUNC_QUALIFIER genType div(genType const & a, genType const & b)
+	GLM_FUNC_QUALIFIER genType div(genType const & a, genType const & b)
-{
+	{
-    return a / b;
+		return a / b;
-}
+	}
-
-template <typename genTypeT, typename genTypeU, typename genTypeV> 
-GLM_FUNC_QUALIFIER genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c)
-{
-	return a * b + c;
-}
 
+	template <typename genTypeT, typename genTypeU, typename genTypeV> 
+	GLM_FUNC_QUALIFIER genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c)
+	{
+		return a * b + c;
+	}
 }//namespace glm

glm/gtx/wrap.inl

@@ -10,157 +10,156 @@
 // - GLM core
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace glm{
+namespace glm
-
-template <typename genType> 
-GLM_FUNC_QUALIFIER genType clamp
-(
-	genType const & Texcoord
-)
 {
-	return glm::clamp(Texcoord, genType(0), genType(1));
+	template <typename genType> 
-}
+	GLM_FUNC_QUALIFIER genType clamp
+	(
+		genType const & Texcoord
+	)
+	{
+		return glm::clamp(Texcoord, genType(0), genType(1));
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> clamp
+	GLM_FUNC_QUALIFIER detail::tvec2<T> clamp
-(
+	(
-	detail::tvec2<T> const & Texcoord
+		detail::tvec2<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec2<T> Result;
+		detail::tvec2<T> Result;
-	for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
+		for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
-		Result[i] = clamp(Texcoord[i]);
+			Result[i] = clamp(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> clamp
+	GLM_FUNC_QUALIFIER detail::tvec3<T> clamp
-(
+	(
-	detail::tvec3<T> const & Texcoord
+		detail::tvec3<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec3<T> Result;
+		detail::tvec3<T> Result;
-	for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
+		for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
-		Result[i] = clamp(Texcoord[i]);
+			Result[i] = clamp(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> clamp
+	GLM_FUNC_QUALIFIER detail::tvec4<T> clamp
-(
+	(
-	detail::tvec4<T> const & Texcoord
+		detail::tvec4<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec4<T> Result;
+		detail::tvec4<T> Result;
-	for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
+		for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
-		Result[i] = clamp(Texcoord[i]);
+			Result[i] = clamp(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-////////////////////////
+	////////////////////////
-// repeat
+	// repeat
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType repeat
+	GLM_FUNC_QUALIFIER genType repeat
-(
+	(
-	genType const & Texcoord
+		genType const & Texcoord
-)
+	)
-{
+	{
-	return glm::fract(Texcoord);
+		return glm::fract(Texcoord);
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> repeat
+	GLM_FUNC_QUALIFIER detail::tvec2<T> repeat
-(
+	(
-	detail::tvec2<T> const & Texcoord
+		detail::tvec2<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec2<T> Result;
+		detail::tvec2<T> Result;
-	for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
+		for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
-		Result[i] = repeat(Texcoord[i]);
+			Result[i] = repeat(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> repeat
+	GLM_FUNC_QUALIFIER detail::tvec3<T> repeat
-(
+	(
-	detail::tvec3<T> const & Texcoord
+		detail::tvec3<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec3<T> Result;
+		detail::tvec3<T> Result;
-	for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
+		for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
-		Result[i] = repeat(Texcoord[i]);
+			Result[i] = repeat(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> repeat
+	GLM_FUNC_QUALIFIER detail::tvec4<T> repeat
-(
+	(
-	detail::tvec4<T> const & Texcoord
+		detail::tvec4<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec4<T> Result;
+		detail::tvec4<T> Result;
-	for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
+		for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
-		Result[i] = repeat(Texcoord[i]);
+			Result[i] = repeat(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-////////////////////////
+	////////////////////////
-// mirrorRepeat
+	// mirrorRepeat
 
-template <typename genType> 
+	template <typename genType> 
-GLM_FUNC_QUALIFIER genType mirrorRepeat
+	GLM_FUNC_QUALIFIER genType mirrorRepeat
-(
+	(
-	genType const & Texcoord
+		genType const & Texcoord
-)
+	)
-{
+	{
-	genType const Clamp = genType(int(glm::floor(Texcoord)) % 2);
+		genType const Clamp = genType(int(glm::floor(Texcoord)) % 2);
-	genType const Floor = glm::floor(Texcoord);
+		genType const Floor = glm::floor(Texcoord);
-	genType const Rest = Texcoord - Floor;
+		genType const Rest = Texcoord - Floor;
-	genType const Mirror = Clamp + Rest;
+		genType const Mirror = Clamp + Rest;
 
-	genType Out;
+		genType Out;
-	if(Mirror >= genType(1))
+		if(Mirror >= genType(1))
-		Out = genType(1) - Rest;
+			Out = genType(1) - Rest;
-	else
+		else
-		Out = Rest;
+			Out = Rest;
-	return Out;
+		return Out;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec2<T> mirrorRepeat
+	GLM_FUNC_QUALIFIER detail::tvec2<T> mirrorRepeat
-(
+	(
-	detail::tvec2<T> const & Texcoord
+		detail::tvec2<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec2<T> Result;
+		detail::tvec2<T> Result;
-	for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
+		for(typename detail::tvec2<T>::size_type i = 0; i < detail::tvec2<T>::value_size(); ++i)
-		Result[i] = mirrorRepeat(Texcoord[i]);
+			Result[i] = mirrorRepeat(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
 
-template <typename T> 
+	template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec3<T> mirrorRepeat
+	GLM_FUNC_QUALIFIER detail::tvec3<T> mirrorRepeat
-(
+	(
-	detail::tvec3<T> const & Texcoord
+		detail::tvec3<T> const & Texcoord
-)
+	)
-{
+	{
-	detail::tvec3<T> Result;
+		detail::tvec3<T> Result;
-	for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
+		for(typename detail::tvec3<T>::size_type i = 0; i < detail::tvec3<T>::value_size(); ++i)
-		Result[i] = mirrorRepeat(Texcoord[i]);
+			Result[i] = mirrorRepeat(Texcoord[i]);
-	return Result;
+		return Result;
-}
+	}
-
-template <typename T> 
-GLM_FUNC_QUALIFIER detail::tvec4<T> mirrorRepeat
-(
-	detail::tvec4<T> const & Texcoord
-)
-{
-	detail::tvec4<T> Result;
-	for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
-		Result[i] = mirrorRepeat(Texcoord[i]);
-	return Result;
-}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec4<T> mirrorRepeat
+	(
+		detail::tvec4<T> const & Texcoord
+	)
+	{
+		detail::tvec4<T> Result;
+		for(typename detail::tvec4<T>::size_type i = 0; i < detail::tvec4<T>::value_size(); ++i)
+			Result[i] = mirrorRepeat(Texcoord[i]);
+		return Result;
+	}
 }//namespace glm