Branch free refract and reflect

glm/detail/func_common.inl

@@ -200,8 +200,6 @@ namespace detail
 			"'sign' only accept signed inputs");
 
 		return detail::compute_sign<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x);
-
-		//return vecType<T, P>(glm::lessThan(vecType<T, P>(0), x)) - vecType<T, P>(glm::lessThan(x, vecType<T, P>(0)));
 	}
 
 	// floor
@@ -506,7 +504,7 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'smoothstep' only accept floating-point inputs");
 
-		genType tmp = clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1));
+		genType const tmp(clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1)));
 		return tmp * tmp * (genType(3) - genType(2) * tmp);
 	}
 
@@ -515,7 +513,7 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'smoothstep' only accept floating-point inputs");
 
-		vecType<T, P> tmp = clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1));
+		vecType<T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
 		return tmp * tmp * (static_cast<T>(3) - static_cast<T>(2) * tmp);
 	}
 
@@ -524,11 +522,14 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'smoothstep' only accept floating-point inputs");
 
-		vecType<T, P> tmp = clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1));
+		vecType<T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
 		return tmp * tmp * (static_cast<T>(3) - static_cast<T>(2) * tmp);
 	}
 
 	// TODO: Not working on MinGW...
+#	if GLM_HAS_CXX11_STL
+		usign std::isnan;
+#	else
 		template <typename genType> 
 		GLM_FUNC_QUALIFIER bool isnan(genType x)
 		{
@@ -550,6 +551,7 @@ namespace detail
 				return std::isnan(x);
 #			endif
 		}
+#	endif
 
 	template <typename T, precision P, template <typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<bool, P> isnan(vecType<T, P> const & x)
@@ -559,6 +561,9 @@ namespace detail
 		return detail::functor1<bool, T, P, vecType>::call(isnan, x);
 	}
 
+#	if GLM_HAS_CXX11_STL
+		using std::isinf;
+#	else
 		template <typename genType> 
 		GLM_FUNC_QUALIFIER bool isinf(genType x)
 		{
@@ -581,6 +586,7 @@ namespace detail
 				return std::isinf(x);
 #			endif
 	}
+#	endif
 
 	template <typename T, precision P, template <typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER vecType<bool, P> isinf(vecType<T, P> const & x)

glm/detail/func_geometric.inl

@@ -174,12 +174,9 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'refract' only accept floating-point inputs");
 
-		genType dotValue = dot(N, I);
+		genType const dotValue(dot(N, I));
-		genType k = static_cast<genType>(1) - eta * eta * (static_cast<genType>(1) - dotValue * dotValue);
+		genType const k(static_cast<genType>(1) - eta * eta * (static_cast<genType>(1) - dotValue * dotValue));
-		if(k < static_cast<genType>(0))
+		return (eta * I - (eta * dotValue + sqrt(k)) * N) * static_cast<genType>(k >= static_cast<genType>(0));
-			return static_cast<genType>(0);
-		else
-			return eta * I - (eta * dotValue + sqrt(k)) * N;
 	}
 
 	template <typename T, precision P, template <typename, precision> class vecType>
@@ -187,11 +184,8 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'refract' only accept floating-point inputs");
 
-		T dotValue = dot(N, I);
+		T const dotValue(dot(N, I));
-		T k = static_cast<T>(1) - eta * eta * (static_cast<T>(1) - dotValue * dotValue);
+		T const k(static_cast<T>(1) - eta * eta * (static_cast<T>(1) - dotValue * dotValue));
-		if(k < static_cast<T>(0))
+		return (eta * I - (eta * dotValue + std::sqrt(k)) * N) * static_cast<genType>(k >= static_cast<genType>(0));
-			return vecType<T, P>(0);
-		else
-			return eta * I - (eta * dotValue + std::sqrt(k)) * N;
 	}
 }//namespace glm