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

some more min/max wrappings 2

Browse Source
This commit is contained in:
Steven French 2024-08-19 15:14:37 +12:00
parent 74eb4f745f
commit 731c903164
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
glm/ext/scalar_common.inl
View File

@ -39,33 +39,33 @@ namespace glm
# endif # endif
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T fmin(T a, T b, T c) GLM_FUNC_QUALIFIER T (fmin)(T a, T b, T c)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input");
if (isnan(a)) if (isnan(a))
return fmin(b, c); return (fmin)(b, c);
if (isnan(b)) if (isnan(b))
return fmin(a, c); return (fmin)(a, c);
if (isnan(c)) if (isnan(c))
return min(a, b); return min(a, b);
return min(a, b, c); return (min)(a, b, c);
} }
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T fmin(T a, T b, T c, T d) GLM_FUNC_QUALIFIER T (fmin)(T a, T b, T c, T d)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input");
if (isnan(a)) if (isnan(a))
return fmin(b, c, d); return (fmin)(b, c, d);
if (isnan(b)) if (isnan(b))
return min(a, fmin(c, d)); return (min)(a, (fmin)(c, d));
if (isnan(c)) if (isnan(c))
return fmin(min(a, b), d); return (fmin)(min(a, b), d);
if (isnan(d)) if (isnan(d))
return min(a, b, c); return (min)(a, b, c);
return min(a, b, c, d); return (min)(a, b, c, d);
} }
@ -73,44 +73,44 @@ namespace glm
using std::fmax; using std::fmax;
# else # else
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T fmax(T a, T b) GLM_FUNC_QUALIFIER T (fmax)(T a, T b)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input");
if (isnan(a)) if (isnan(a))
return b; return b;
return max(a, b); return (max)(a, b);
} }
# endif # endif
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T fmax(T a, T b, T c) GLM_FUNC_QUALIFIER T (fmax)(T a, T b, T c)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input");
if (isnan(a)) if (isnan(a))
return fmax(b, c); return (fmax)(b, c);
if (isnan(b)) if (isnan(b))
return fmax(a, c); return (fmax)(a, c);
if (isnan(c)) if (isnan(c))
return max(a, b); return (max)(a, b);
return max(a, b, c); return (max)(a, b, c);
} }
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T fmax(T a, T b, T c, T d) GLM_FUNC_QUALIFIER T (fmax)(T a, T b, T c, T d)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input");
if (isnan(a)) if (isnan(a))
return fmax(b, c, d); return (fmax)(b, c, d);
if (isnan(b)) if (isnan(b))
return max(a, fmax(c, d)); return (max)(a, (fmax)(c, d));
if (isnan(c)) if (isnan(c))
return fmax(max(a, b), d); return (fmax)((max)(a, b), d);
if (isnan(d)) if (isnan(d))
return max(a, b, c); return (max)(a, b, c);
return max(a, b, c, d); return (max)(a, b, c, d);
} }
// fclamp // fclamp
@ -118,7 +118,7 @@ namespace glm
GLM_FUNC_QUALIFIER genType fclamp(genType x, genType minVal, genType maxVal) GLM_FUNC_QUALIFIER genType fclamp(genType x, genType minVal, genType maxVal)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fclamp' only accept floating-point or integer inputs"); GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fclamp' only accept floating-point or integer inputs");
return fmin(fmax(x, minVal), maxVal); return fmin((fmax)(x, minVal), maxVal);
} }
template<typename genType> template<typename genType>