Browse Source

Removed VECTORIZE_VEC for GTX

Christophe Riccio 11 years ago
parent
commit
86eae996e4
2 changed files with 16 additions and 9 deletions
  1. 10 3
      glm/gtx/log_base.hpp
  2. 6 6
      glm/gtx/log_base.inl

+ 10 - 3
glm/gtx/log_base.hpp

@@ -51,10 +51,17 @@ namespace glm
 
 	//! Logarithm for any base.
 	//! From GLM_GTX_log_base.
-	template <typename genType> 
+	template <typename genType>
 	GLM_FUNC_DECL genType log(
-		genType const & x, 
-		genType const & base);
+		genType x,
+		genType base);
+
+	//! Logarithm for any base.
+	//! From GLM_GTX_log_base.
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<T, P> sign(
+		vecType<T, P> const & x,
+		vecType<T, P> const & base);
 
 	/// @}
 }//namespace glm

+ 6 - 6
glm/gtx/log_base.inl

@@ -10,15 +10,15 @@
 namespace glm
 {
 	template <typename genType> 
-	GLM_FUNC_QUALIFIER genType log(
-		genType const & x, 
-		genType const & base)
+	GLM_FUNC_QUALIFIER genType log(genType const & x, genType const & base)
 	{
 		assert(x != genType(0));
-
 		return glm::log(x) / glm::log(base);
 	}
 
-	VECTORIZE_VEC_SCA(log)
-	VECTORIZE_VEC_VEC(log)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x, vecType<T, P> const & base)
+	{
+		return glm::log(x) / glm::log(base);
+	}
 }//namespace glm