mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio
2018-07-11 17:49:15 +02:00
parent 2098b073ff
commit 0f2e1fa493
49 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glm/gtx/bit.inl
View File

@@ -22,7 +22,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> highestBitValue(vec<L, T, Q> const& v)
{
return detail::functor1<L, T, T, Q>::call(highestBitValue, v);
return detail::functor1<vec, L, T, T, Q>::call(highestBitValue, v);
}
///////////////////
@@ -37,7 +37,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> lowestBitValue(vec<L, T, Q> const& v)
{
return detail::functor1<L, T, T, Q>::call(lowestBitValue, v);
return detail::functor1<vec, L, T, T, Q>::call(lowestBitValue, v);
}
///////////////////
@@ -52,7 +52,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoAbove(vec<L, T, Q> const& v)
{
return detail::functor1<L, T, T, Q>::call(powerOfTwoAbove, v);
return detail::functor1<vec, L, T, T, Q>::call(powerOfTwoAbove, v);
}
///////////////////
@@ -67,7 +67,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoBelow(vec<L, T, Q> const& v)
{
return detail::functor1<L, T, T, Q>::call(powerOfTwoBelow, v);
return detail::functor1<vec, L, T, T, Q>::call(powerOfTwoBelow, v);
}
/////////////////////
@@ -87,7 +87,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoNearest(vec<L, T, Q> const& v)
{
return detail::functor1<L, T, T, Q>::call(powerOfTwoNearest, v);
return detail::functor1<vec, L, T, T, Q>::call(powerOfTwoNearest, v);
}
}//namespace glm

2
glm/gtx/common.inl
View File

@@ -13,7 +13,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
{
return detail::functor2<L, T, Q>::call(std::fmod, a, b);
return detail::functor2<vec, L, T, Q>::call(std::fmod, a, b);
}
};

8
glm/gtx/extended_min_max.inl
View File

@@ -158,13 +158,13 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fmin(vec<L, T, Q> const& a, T b)
{
return detail::functor2<L, T, Q>::call(fmin, a, vec<L, T, Q>(b));
return detail::functor2<vec, L, T, Q>::call(fmin, a, vec<L, T, Q>(b));
}
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fmin(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
{
return detail::functor2<L, T, Q>::call(fmin, a, b);
return detail::functor2<vec, L, T, Q>::call(fmin, a, b);
}
// fmax
@@ -188,13 +188,13 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fmax(vec<L, T, Q> const& a, T b)
{
return detail::functor2<L, T, Q>::call(fmax, a, vec<L, T, Q>(b));
return detail::functor2<vec, L, T, Q>::call(fmax, a, vec<L, T, Q>(b));
}
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fmax(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
{
return detail::functor2<L, T, Q>::call(fmax, a, b);
return detail::functor2<vec, L, T, Q>::call(fmax, a, b);
}
// fclamp

8
glm/gtx/fast_exponential.inl
View File

@@ -84,7 +84,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastExp(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastExp, x);
return detail::functor1<vec, L, T, T, Q>::call(fastExp, x);
}
// fastLog
@@ -106,7 +106,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastLog(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastLog, x);
return detail::functor1<vec, L, T, T, Q>::call(fastLog, x);
}
//fastExp2, ln2 = 0.69314718055994530941723212145818f
@@ -119,7 +119,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastExp2(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastExp2, x);
return detail::functor1<vec, L, T, T, Q>::call(fastExp2, x);
}
// fastLog2, ln2 = 0.69314718055994530941723212145818f
@@ -132,6 +132,6 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastLog2(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastLog2, x);
return detail::functor1<vec, L, T, T, Q>::call(fastLog2, x);
}
}//namespace glm

2
glm/gtx/fast_square_root.inl
View File

@@ -15,7 +15,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastSqrt(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastSqrt, x);
return detail::functor1<vec, L, T, T, Q>::call(fastSqrt, x);
}
// fastInversesqrt

18
glm/gtx/fast_trigonometry.inl
View File

@@ -24,7 +24,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> cos_52s(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(cos_52s, x);
return detail::functor1<vec, L, T, T, Q>::call(cos_52s, x);
}
}//namespace detail
@@ -38,7 +38,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> wrapAngle(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(wrapAngle, x);
return detail::functor1<vec, L, T, T, Q>::call(wrapAngle, x);
}
// cos
@@ -60,7 +60,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastCos(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastCos, x);
return detail::functor1<vec, L, T, T, Q>::call(fastCos, x);
}
// sin
@@ -73,7 +73,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastSin(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastSin, x);
return detail::functor1<vec, L, T, T, Q>::call(fastSin, x);
}
// tan
@@ -86,7 +86,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastTan(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastTan, x);
return detail::functor1<vec, L, T, T, Q>::call(fastTan, x);
}
// asin
@@ -99,7 +99,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastAsin(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastAsin, x);
return detail::functor1<vec, L, T, T, Q>::call(fastAsin, x);
}
// acos
@@ -112,7 +112,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastAcos(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastAcos, x);
return detail::functor1<vec, L, T, T, Q>::call(fastAcos, x);
}
// atan
@@ -126,7 +126,7 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastAtan(vec<L, T, Q> const& y, vec<L, T, Q> const& x)
{
return detail::functor2<L, T, Q>::call(fastAtan, y, x);
return detail::functor2<vec, L, T, Q>::call(fastAtan, y, x);
}
template<typename T>
@@ -138,6 +138,6 @@ namespace detail
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, T, Q> fastAtan(vec<L, T, Q> const& x)
{
return detail::functor1<L, T, T, Q>::call(fastAtan, x);
return detail::functor1<vec, L, T, T, Q>::call(fastAtan, x);
}
}//namespace glm