Browse Source

Clean up vecType

Christophe Riccio 8 years ago
parent
commit
5212c26da2
2 changed files with 5 additions and 26 deletions
  1. 2 22
      glm/detail/_noise.hpp
  2. 3 4
      glm/detail/_swizzle.hpp

+ 2 - 22
glm/detail/_noise.hpp

@@ -40,13 +40,7 @@ namespace detail
 	{
 		return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
 	}
-/*
-	template<typename T, precision P, template<typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<L, T, P> permute(vecType<L, T, P> const & x)
-	{
-		return mod289(((x * T(34)) + T(1)) * x);
-	}
-*/
+
 	template<typename T>
 	GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
 	{
@@ -70,14 +64,7 @@ namespace detail
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
-/*
-	template<typename T, precision P, template<typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorInvSqrt(vecType<L, T, P> const & r)
-	{
-		return T(1.79284291400159) - T(0.85373472095314) * r;
-	}
-*/
-	
+
 	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> fade(vec<2, T, P> const & t)
 	{
@@ -95,13 +82,6 @@ namespace detail
 	{
 		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
 	}
-/*
-	template<typename T, precision P, template<typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<L, T, P> fade(vecType<L, T, P> const & t)
-	{
-		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
-	}
-*/
 }//namespace detail
 }//namespace glm
 

+ 3 - 4
glm/detail/_swizzle.hpp

@@ -47,10 +47,9 @@ namespace detail
 	/*
 		Template parameters:
 
-		ValueType = type of scalar values (e.g. float, double)
-		VecType   = class the swizzle is applies to (e.g. vec<3, float>)
-		N         = number of components in the vector (e.g. 3)
-		E0...3    = what index the n-th element of this swizzle refers to in the unswizzled vec
+		T			= type of scalar values (e.g. float, double)
+		N			= number of components in the vector (e.g. 3)
+		E0...3		= what index the n-th element of this swizzle refers to in the unswizzled vec
 
 		DUPLICATE_ELEMENTS = 1 if there is a repeated element, 0 otherwise (used to specialize swizzles
 			containing duplicate elements so that they cannot be used as r-values).