mirror of
https://github.com/g-truc/glm.git
synced 2025-04-04 21:15:03 +00:00
Merge 140c3118c2
into 2d4c4b4dd3
This commit is contained in:
commit
faddfb13fc
8 changed files with 42 additions and 3 deletions
|
@ -301,6 +301,9 @@ namespace glm
|
|||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2);
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator!(vec<1, bool, Q> const& v);
|
||||
}//namespace glm
|
||||
|
||||
#ifndef GLM_EXTERNAL_TEMPLATE
|
||||
|
|
|
@ -550,4 +550,11 @@ namespace glm
|
|||
{
|
||||
return vec<1, bool, Q>(v1.x || v2.x);
|
||||
}
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, bool, Q> operator!(vec<1, bool, Q> const& v)
|
||||
{
|
||||
return vec<1, bool, Q>(
|
||||
!v.x);
|
||||
}
|
||||
}//namespace glm
|
||||
|
|
|
@ -399,6 +399,9 @@ namespace glm
|
|||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2);
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator!(vec<2, bool, Q> const& v);
|
||||
}//namespace glm
|
||||
|
||||
#ifndef GLM_EXTERNAL_TEMPLATE
|
||||
|
|
|
@ -912,4 +912,12 @@ namespace glm
|
|||
{
|
||||
return vec<2, bool, Q>(v1.x || v2.x, v1.y || v2.y);
|
||||
}
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, bool, Q> operator!(vec<2, bool, Q> const& v)
|
||||
{
|
||||
return vec<2, bool, Q>(
|
||||
!v.x,
|
||||
!v.y);
|
||||
}
|
||||
}//namespace glm
|
||||
|
|
|
@ -437,9 +437,8 @@ namespace glm
|
|||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2);
|
||||
|
||||
|
||||
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator!(vec<3, bool, Q> const& v);
|
||||
}//namespace glm
|
||||
|
||||
#ifndef GLM_EXTERNAL_TEMPLATE
|
||||
|
|
|
@ -827,6 +827,16 @@ namespace glm
|
|||
{
|
||||
return vec<3, bool, Q>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z);
|
||||
}
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, bool, Q> operator!(vec<3, bool, Q> const& v)
|
||||
{
|
||||
return vec<3, bool, Q>(
|
||||
!v.x,
|
||||
!v.y,
|
||||
!v.z);
|
||||
}
|
||||
|
||||
}//namespace glm
|
||||
|
||||
|
||||
|
|
|
@ -507,6 +507,9 @@ namespace glm
|
|||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2);
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator!(vec<4, bool, Q> const& v);
|
||||
}//namespace glm
|
||||
|
||||
#ifndef GLM_EXTERNAL_TEMPLATE
|
||||
|
|
|
@ -1018,6 +1018,12 @@ namespace detail
|
|||
{
|
||||
return vec<4, bool, Q>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z, v1.w || v2.w);
|
||||
}
|
||||
|
||||
template<qualifier Q>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> operator!(vec<4, bool, Q> const& v)
|
||||
{
|
||||
return vec<4, bool, Q>(!v.x, !v.y, !v.z, !v.w);
|
||||
}
|
||||
}//namespace glm
|
||||
|
||||
#if GLM_CONFIG_SIMD == GLM_ENABLE
|
||||
|
|
Loading…
Add table
Reference in a new issue