From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/gtx/fast_trigonometry.inl | 84 +++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'external/include/glm/gtx/fast_trigonometry.inl') diff --git a/external/include/glm/gtx/fast_trigonometry.inl b/external/include/glm/gtx/fast_trigonometry.inl index f576c17..a733160 100644 --- a/external/include/glm/gtx/fast_trigonometry.inl +++ b/external/include/glm/gtx/fast_trigonometry.inl @@ -4,45 +4,45 @@ namespace glm{ namespace detail { - template class vecType> - GLM_FUNC_QUALIFIER vecType taylorCos(vecType const & x) + template + GLM_FUNC_QUALIFIER vec taylorCos(vec const& x) { return static_cast(1) - - (x * x) / 2.f - + (x * x * x * x) / 24.f - - (x * x * x * x * x * x) / 720.f - + (x * x * x * x * x * x * x * x) / 40320.f; + - (x * x) * (1.f / 2.f) + + ((x * x) * (x * x)) * (1.f / 24.f) + - (((x * x) * (x * x)) * (x * x)) * (1.f / 720.f) + + (((x * x) * (x * x)) * ((x * x) * (x * x))) * (1.f / 40320.f); } - template + template GLM_FUNC_QUALIFIER T cos_52s(T x) { T const xx(x * x); return (T(0.9999932946) + xx * (T(-0.4999124376) + xx * (T(0.0414877472) + xx * T(-0.0012712095)))); } - template class vecType> - GLM_FUNC_QUALIFIER vecType cos_52s(vecType const & x) + template + GLM_FUNC_QUALIFIER vec cos_52s(vec const& x) { - return detail::functor1::call(cos_52s, x); + return detail::functor1::call(cos_52s, x); } }//namespace detail // wrapAngle - template + template GLM_FUNC_QUALIFIER T wrapAngle(T angle) { return abs(mod(angle, two_pi())); } - template class vecType> - GLM_FUNC_QUALIFIER vecType wrapAngle(vecType const & x) + template + GLM_FUNC_QUALIFIER vec wrapAngle(vec const& x) { - return detail::functor1::call(wrapAngle, x); + return detail::functor1::call(wrapAngle, x); } // cos - template + template GLM_FUNC_QUALIFIER T fastCos(T x) { T const angle(wrapAngle(x)); @@ -57,87 +57,87 @@ namespace detail return detail::cos_52s(two_pi() - angle); } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastCos(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastCos(vec const& x) { - return detail::functor1::call(fastCos, x); + return detail::functor1::call(fastCos, x); } // sin - template + template GLM_FUNC_QUALIFIER T fastSin(T x) { return fastCos(half_pi() - x); } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastSin(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastSin(vec const& x) { - return detail::functor1::call(fastSin, x); + return detail::functor1::call(fastSin, x); } // tan - template + template GLM_FUNC_QUALIFIER T fastTan(T x) { return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539)); } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastTan(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastTan(vec const& x) { - return detail::functor1::call(fastTan, x); + return detail::functor1::call(fastTan, x); } // asin - template + template GLM_FUNC_QUALIFIER T fastAsin(T x) { return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159)); } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastAsin(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastAsin(vec const& x) { - return detail::functor1::call(fastAsin, x); + return detail::functor1::call(fastAsin, x); } // acos - template + template GLM_FUNC_QUALIFIER T fastAcos(T x) { return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2) } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastAcos(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastAcos(vec const& x) { - return detail::functor1::call(fastAcos, x); + return detail::functor1::call(fastAcos, x); } // atan - template + template GLM_FUNC_QUALIFIER T fastAtan(T y, T x) { T sgn = sign(y) * sign(x); return abs(fastAtan(y / x)) * sgn; } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastAtan(vecType const & y, vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastAtan(vec const& y, vec const& x) { - return detail::functor2::call(fastAtan, y, x); + return detail::functor2::call(fastAtan, y, x); } - template + template GLM_FUNC_QUALIFIER T fastAtan(T x) { return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909)); } - template class vecType> - GLM_FUNC_QUALIFIER vecType fastAtan(vecType const & x) + template + GLM_FUNC_QUALIFIER vec fastAtan(vec const& x) { - return detail::functor1::call(fastAtan, x); + return detail::functor1::call(fastAtan, x); } }//namespace glm -- cgit v1.2.3