Browse Source

Use template instanciation

Christophe Riccio 11 years ago
parent
commit
1cd48f1523
2 changed files with 88 additions and 75 deletions
  1. 3 3
      glm/detail/func_exponential.inl
  2. 85 72
      glm/gtc/reciprocal.inl

+ 3 - 3
glm/detail/func_exponential.inl

@@ -83,7 +83,7 @@ namespace detail
 	template <typename T, precision P, template <typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<T, P> pow(vecType<T, P> const & base, vecType<T, P> const & exponent)
 	{
-		return detail::functor2<T, P, vecType>::call(::std::pow, base, exponent);
+		return detail::functor2<T, P, vecType>::call(pow, base, exponent);
 	}
 
 	// exp
@@ -91,7 +91,7 @@ namespace detail
 	template <typename T, precision P, template <typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<T, P> exp(vecType<T, P> const & x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(::std::exp, x);
+		return detail::functor1<T, T, P, vecType>::call(exp, x);
 	}
 
 	// log
@@ -99,7 +99,7 @@ namespace detail
 	template <typename T, precision P, template <typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(::std::log, x);
+		return detail::functor1<T, T, P, vecType>::call(log, x);
 	}
 
 	//exp2, ln2 = 0.69314718055994530941723212145818f

+ 85 - 72
glm/gtc/reciprocal.inl

@@ -33,80 +33,82 @@ namespace glm
 {
 	// sec
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType sec
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType sec(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sec' only accept floating-point values");
-
 		return genType(1) / glm::cos(angle);
 	}
 
-	VECTORIZE_VEC(sec)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> sec(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sec' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(sec, x);
+	}
 
 	// csc
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType csc
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType csc(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csc' only accept floating-point values");
-
 		return genType(1) / glm::sin(angle);
 	}
 
-	VECTORIZE_VEC(csc)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> csc(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csc' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(csc, x);
+	}
 
 	// cot
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType cot
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType cot(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'cot' only accept floating-point values");
-
 		return genType(1) / glm::tan(angle);
 	}
 
-	VECTORIZE_VEC(cot)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> cot(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'cot' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(cot, x);
+	}
 
 	// asec
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType asec
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType asec(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asec' only accept floating-point values");
-	
 		return acos(genType(1) / x);
 	}
 
-	VECTORIZE_VEC(asec)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> asec(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asec' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(asec, x);
+	}
 
 	// acsc
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType acsc
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType acsc(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsc' only accept floating-point values");
-
 		return asin(genType(1) / x);
 	}
 
-	VECTORIZE_VEC(acsc)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> acsc(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsc' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(acsc, x);
+	}
 
 	// acot
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType acot
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType acot(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acot' only accept floating-point values");
 
@@ -114,89 +116,100 @@ namespace glm
 		return pi_over_2 - atan(x);
 	}
 
-	VECTORIZE_VEC(acot)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> acot(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acot' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(acot, x);
+	}
 
 	// sech
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType sech
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType sech(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sech' only accept floating-point values");
-
 		return genType(1) / glm::cosh(angle);
 	}
 
-	VECTORIZE_VEC(sech)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> sech(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sech' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(sech, x);
+	}
 
 	// csch
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType csch
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType csch(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csch' only accept floating-point values");
-
 		return genType(1) / glm::sinh(angle);
 	}
 
-	VECTORIZE_VEC(csch)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> csch(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csch' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(csch, x);
+	}
 
 	// coth
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType coth
-	(
-		genType const & angle
-	)
+	GLM_FUNC_QUALIFIER genType coth(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'coth' only accept floating-point values");
-
 		return glm::cosh(angle) / glm::sinh(angle);
 	}
 
-	VECTORIZE_VEC(coth)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> coth(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'coth' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(coth, x);
+	}
 
 	// asech
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType asech
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType asech(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asech' only accept floating-point values");
-
 		return acosh(genType(1) / x);
 	}
 
-	VECTORIZE_VEC(asech)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> asech(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asech' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(asech, x);
+	}
 
 	// acsch
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType acsch
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType acsch(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsch' only accept floating-point values");
-
-		return asinh(genType(1) / x);
+		return acsch(genType(1) / x);
 	}
 
-	VECTORIZE_VEC(acsch)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> acsch(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsch' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(acsch, x);
+	}
 
 	// acoth
 	template <typename genType>
-	GLM_FUNC_QUALIFIER genType acoth
-	(
-		genType const & x
-	)
+	GLM_FUNC_QUALIFIER genType acoth(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acoth' only accept floating-point values");
-
 		return atanh(genType(1) / x);
 	}
 
-	VECTORIZE_VEC(acoth)
+	template <typename T, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> acoth(vecType<T, P> const & x)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acoth' only accept floating-point inputs");
+		return detail::functor1<T, T, P, vecType>::call(acoth, x);
+	}
 }//namespace glm