Updated GLM version w/ now standard radians as angles.

includes/glm/gtx/matrix_major_storage.hpp

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -12,6 +12,10 @@
 /// The above copyright notice and this permission notice shall be included in
 /// all copies or substantial portions of the Software.
 /// 
+/// Restrictions:
+///		By making use of the Software for military purposes, you choose to make
+///		a Bunny unhappy.
+/// 
 /// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 /// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 /// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,13 +40,12 @@
 /// <glm/gtx/matrix_major_storage.hpp> need to be included to use these functionalities.
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef GLM_GTX_matrix_major_storage
-#define GLM_GTX_matrix_major_storage GLM_VERSION
+#pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
-#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
 #	pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
 #endif
 
@@ -53,91 +56,89 @@ namespace glm
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat2x2<T> rowMajor2(
-		detail::tvec2<T> const & v1, 
-		detail::tvec2<T> const & v2);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
+		tvec2<T, P> const & v1, 
+		tvec2<T, P> const & v2);
 		
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat2x2<T> rowMajor2(
-		detail::tmat2x2<T> const & m);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
+		tmat2x2<T, P> const & m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat3x3<T> rowMajor3(
-		detail::tvec3<T> const & v1, 
-		detail::tvec3<T> const & v2, 
-		detail::tvec3<T> const & v3);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
+		tvec3<T, P> const & v1, 
+		tvec3<T, P> const & v2, 
+		tvec3<T, P> const & v3);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat3x3<T> rowMajor3(
-		detail::tmat3x3<T> const & m);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
+		tmat3x3<T, P> const & m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat4x4<T> rowMajor4(
-		detail::tvec4<T> const & v1, 
-		detail::tvec4<T> const & v2,
-		detail::tvec4<T> const & v3, 
-		detail::tvec4<T> const & v4);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
+		tvec4<T, P> const & v1, 
+		tvec4<T, P> const & v2,
+		tvec4<T, P> const & v3, 
+		tvec4<T, P> const & v4);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat4x4<T> rowMajor4(
-		detail::tmat4x4<T> const & m);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
+		tmat4x4<T, P> const & m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat2x2<T> colMajor2(
-		detail::tvec2<T> const & v1, 
-		detail::tvec2<T> const & v2);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
+		tvec2<T, P> const & v1, 
+		tvec2<T, P> const & v2);
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat2x2<T> colMajor2(
-		detail::tmat2x2<T> const & m);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
+		tmat2x2<T, P> const & m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat3x3<T> colMajor3(
-		detail::tvec3<T> const & v1, 
-		detail::tvec3<T> const & v2, 
-		detail::tvec3<T> const & v3);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
+		tvec3<T, P> const & v1, 
+		tvec3<T, P> const & v2, 
+		tvec3<T, P> const & v3);
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat3x3<T> colMajor3(
-		detail::tmat3x3<T> const & m);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
+		tmat3x3<T, P> const & m);
 		
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat4x4<T> colMajor4(
-		detail::tvec4<T> const & v1, 
-		detail::tvec4<T> const & v2, 
-		detail::tvec4<T> const & v3, 
-		detail::tvec4<T> const & v4);
+	template <typename T, precision P>
+	GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
+		tvec4<T, P> const & v1, 
+		tvec4<T, P> const & v2, 
+		tvec4<T, P> const & v3, 
+		tvec4<T, P> const & v4);
 				
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T> 
-	detail::tmat4x4<T> colMajor4(
-		detail::tmat4x4<T> const & m);
+	template <typename T, precision P> 
+	GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
+		tmat4x4<T, P> const & m);
 
 	/// @}
 }//namespace glm
 
 #include "matrix_major_storage.inl"
-
-#endif//GLM_GTX_matrix_major_storage