Browse Source

Started removing GLMvalType

Christophe Riccio 15 years ago
parent
commit
1b91fe7790
3 changed files with 5 additions and 6 deletions
  1. 0 1
      glm/core/type_vec4.hpp
  2. 1 1
      glm/glm.hpp
  3. 4 4
      glm/gtx/vector_query.hpp

+ 0 - 1
glm/core/type_vec4.hpp

@@ -15,7 +15,6 @@
 #include "type_int.hpp"
 #include "type_size.hpp"
 #include "_swizzle.hpp"
-#include "_detail.hpp"
 
 namespace glm
 {

+ 1 - 1
glm/glm.hpp

@@ -13,7 +13,7 @@
 #define glm_glm
 
 //! TODO: to delete
-#define GLMvalType typename genType::value_type
+//#define GLMvalType typename genType::value_type
 
 #include <cmath>
 #include <climits>

+ 4 - 4
glm/gtx/vector_query.hpp

@@ -41,15 +41,15 @@ namespace glm
 		bool areCollinear(
 			const genType & v0, 
 			const genType & v1, 
-			const GLMvalType epsilon = std::numeric_limits<GLMvalType>::epsilon());
+			typename genType::value_type const epsilon = std::numeric_limits<GLMvalType>::epsilon());
 		
         //! Check if two vectors are opposites.
 		//! From GLM_GTX_vector_query extensions.
 		template <typename genType> 
 		bool areOpposite(
-			const genType & v0, 
-			const genType & v1, 
-			const GLMvalType epsilon = std::numeric_limits<GLMvalType>::epsilon());
+			genType const & v0, 
+			genType const & v1, 
+			typename genType::value_type const epsilon = std::numeric_limits<GLMvalType>::epsilon());
 		
         //! Check if two vectors are orthogonals.
 		//! From GLM_GTX_vector_query extensions.