mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-16 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

...and some more... ugh

Browse Source
This commit is contained in:
Adrian Stephens 2017-06-30 20:08:07 -07:00
parent 54c9b0d825
commit 187f37b29d
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glm/detail/type_vec1.inl
View File

@ -101,7 +101,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator+=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator+=(U scalar)
{
this->x += static_cast<T>(scalar);
return *this;
@ -117,7 +117,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator-=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator-=(U scalar)
{
this->x -= static_cast<T>(scalar);
return *this;
@ -133,7 +133,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator*=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator*=(U scalar)
{
this->x *= static_cast<T>(scalar);
return *this;
@ -149,7 +149,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator/=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator/=(U scalar)
{
this->x /= static_cast<T>(scalar);
return *this;
@ -199,7 +199,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator%=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator%=(U scalar)
{
this->x %= static_cast<T>(scalar);
return *this;
@ -215,7 +215,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator&=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator&=(U scalar)
{
this->x &= static_cast<T>(scalar);
return *this;
@ -231,7 +231,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator|=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator|=(U scalar)
{
this->x |= static_cast<T>(scalar);
return *this;
@ -247,7 +247,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator^=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator^=(U scalar)
{
this->x ^= static_cast<T>(scalar);
return *this;
@ -263,7 +263,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator<<=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator<<=(U scalar)
{
this->x <<= static_cast<T>(scalar);
return *this;
@ -271,7 +271,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER tvec1<T, P> & tvec1<T, P>::operator<<=(tvec1<U, P> const & v)
GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator<<=(vec<1, U, P> const & v)
{
this->x <<= static_cast<T>(v.x);
return *this;
@ -279,7 +279,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) tvec1<T, P>::operator>>=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 1, T, P, U) vec<1, T, P>::operator>>=(U scalar)
{
this->x >>= static_cast<T>(scalar);
return *this;

20
glm/detail/type_vec2.inl
View File

@ -121,7 +121,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator+=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator+=(U scalar)
{
this->x += static_cast<T>(scalar);
this->y += static_cast<T>(scalar);
@ -148,7 +148,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator-=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator-=(U scalar)
{
this->x -= static_cast<T>(scalar);
this->y -= static_cast<T>(scalar);
@ -175,7 +175,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator*=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator*=(U scalar)
{
this->x *= static_cast<T>(scalar);
this->y *= static_cast<T>(scalar);
@ -202,7 +202,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator/=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator/=(U scalar)
{
this->x /= static_cast<T>(scalar);
this->y /= static_cast<T>(scalar);
@ -265,7 +265,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator%=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator%=(U scalar)
{
this->x %= static_cast<T>(scalar);
this->y %= static_cast<T>(scalar);
@ -292,7 +292,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator&=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator&=(U scalar)
{
this->x &= static_cast<T>(scalar);
this->y &= static_cast<T>(scalar);
@ -319,7 +319,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator|=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator|=(U scalar)
{
this->x |= static_cast<T>(scalar);
this->y |= static_cast<T>(scalar);
@ -346,7 +346,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator^=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator^=(U scalar)
{
this->x ^= static_cast<T>(scalar);
this->y ^= static_cast<T>(scalar);
@ -373,7 +373,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator<<=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator<<=(U scalar)
{
this->x <<= static_cast<T>(scalar);
this->y <<= static_cast<T>(scalar);
@ -400,7 +400,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) tvec2<T, P>::operator>>=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 2, T, P, U) vec<2, T, P>::operator>>=(U scalar)
{
this->x >>= static_cast<T>(scalar);
this->y >>= static_cast<T>(scalar);

20
glm/detail/type_vec3.inl
View File

@ -152,7 +152,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator+=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator+=(U scalar)
{
this->x += static_cast<T>(scalar);
this->y += static_cast<T>(scalar);
@ -182,7 +182,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator-=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator-=(U scalar)
{
this->x -= static_cast<T>(scalar);
this->y -= static_cast<T>(scalar);
@ -212,7 +212,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator*=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator*=(U scalar)
{
this->x *= static_cast<T>(scalar);
this->y *= static_cast<T>(scalar);
@ -242,7 +242,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_DECL GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator/=(U v)
GLM_FUNC_DECL GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator/=(U v)
{
this->x /= static_cast<T>(v);
this->y /= static_cast<T>(v);
@ -310,7 +310,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator%=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator%=(U scalar)
{
this->x %= scalar;
this->y %= scalar;
@ -340,7 +340,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator&=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator&=(U scalar)
{
this->x &= scalar;
this->y &= scalar;
@ -370,7 +370,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator|=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator|=(U scalar)
{
this->x |= scalar;
this->y |= scalar;
@ -400,7 +400,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator^=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator^=(U scalar)
{
this->x ^= scalar;
this->y ^= scalar;
@ -430,7 +430,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator<<=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator<<=(U scalar)
{
this->x <<= scalar;
this->y <<= scalar;
@ -460,7 +460,7 @@ namespace glm
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) tvec3<T, P>::operator>>=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 3, T, P, U) vec<3, T, P>::operator>>=(U scalar)
{
this->x >>= static_cast<T>(scalar);
this->y >>= static_cast<T>(scalar);

20
glm/detail/type_vec4.inl
View File

@ -365,7 +365,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator+=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator+=(U scalar)
{
return (*this = detail::compute_vec4_add<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -386,7 +386,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator-=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator-=(U scalar)
{
return (*this = detail::compute_vec4_sub<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -407,7 +407,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator*=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator*=(U scalar)
{
return (*this = detail::compute_vec4_mul<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -428,7 +428,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator/=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator/=(U scalar)
{
return (*this = detail::compute_vec4_div<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -489,7 +489,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator%=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator%=(U scalar)
{
return (*this = detail::compute_vec4_mod<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -510,7 +510,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator&=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator&=(U scalar)
{
return (*this = detail::compute_vec4_and<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -531,7 +531,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator|=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator|=(U scalar)
{
return (*this = detail::compute_vec4_or<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -552,7 +552,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator^=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator^=(U scalar)
{
return (*this = detail::compute_vec4_xor<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -573,7 +573,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator<<=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator<<=(U scalar)
{
return (*this = detail::compute_vec4_shift_left<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}
@ -594,7 +594,7 @@ namespace detail
template<typename T, precision P>
template<typename U>
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) tvec4<T, P>::operator>>=(U scalar)
GLM_FUNC_QUALIFIER GLM_ONLY_SCALAR2(vec, 4, T, P, U) vec<4, T, P>::operator>>=(U scalar)
{
return (*this = detail::compute_vec4_shift_right<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
}