organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-05 05:25:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

wrap std::numeric_limits<>::min/max in brackets

Browse source
This commit is contained in:
Steven French 2024-04-17 00:34:44 +12:00
parent 33b0eb9fa3
commit 45f7e7513a
9 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/ext/quaternion_exponential.inl
View file

@ -60,7 +60,7 @@ namespace glm
//VectorMagnitude to 0. here; we could use denorm_int() compiling a
//project with unsafe maths optimizations might make the comparison
//always false, even when VectorMagnitude is 0.
if (VectorMagnitude < std::numeric_limits<T>::min()) {
if (VectorMagnitude < (std::numeric_limits<T>::min)()) {
//Equivalent to raising a real number to a power
return qua<T, Q>::wxyz(pow(x.w, y), 0, 0, 0);
}

10
glm/ext/scalar_ulp.inl
View file

@ -198,7 +198,7 @@ namespace glm
GLM_FUNC_QUALIFIER float nextFloat(float x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<float>::max());
return std::nextafter(x, (std::numeric_limits<float>::max)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MAX);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
@ -212,9 +212,9 @@ namespace glm
GLM_FUNC_QUALIFIER double nextFloat(double x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<double>::max());
return std::nextafter(x, (std::numeric_limits<double>::max)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafter(x, std::numeric_limits<double>::max());
return detail::nextafter(x, (std::numeric_limits<double>::max)());
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return __builtin_nextafter(x, DBL_MAX);
# else
@ -237,7 +237,7 @@ namespace glm
GLM_FUNC_QUALIFIER float prevFloat(float x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<float>::min());
return std::nextafter(x, (std::numeric_limits<float>::min)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MIN);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
@ -250,7 +250,7 @@ namespace glm
GLM_FUNC_QUALIFIER double prevFloat(double x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<double>::min());
return std::nextafter(x, (std::numeric_limits<double>::min)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return _nextafter(x, DBL_MIN);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)

8
glm/gtc/packing.inl
View file

@ -687,7 +687,7 @@ namespace detail
GLM_STATIC_ASSERT(std::numeric_limits<uintType>::is_integer, "uintType must be an integer type");
GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
return vec<L, uintType, Q>(round(clamp(v, static_cast<floatType>(0), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<uintType>::max())));
return vec<L, uintType, Q>(round(clamp(v, static_cast<floatType>(0), static_cast<floatType>(1)) * static_cast<floatType>((std::numeric_limits<uintType>::max)())));
}
template<typename floatType, length_t L, typename uintType, qualifier Q>
@ -696,7 +696,7 @@ namespace detail
GLM_STATIC_ASSERT(std::numeric_limits<uintType>::is_integer, "uintType must be an integer type");
GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
return vec<L, floatType, Q>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<uintType>::max()));
return vec<L, floatType, Q>(v) * (static_cast<floatType>(1) / static_cast<floatType>((std::numeric_limits<uintType>::max)()));
}
template<typename intType, length_t L, typename floatType, qualifier Q>
@ -705,7 +705,7 @@ namespace detail
GLM_STATIC_ASSERT(std::numeric_limits<intType>::is_integer, "uintType must be an integer type");
GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
return vec<L, intType, Q>(round(clamp(v , static_cast<floatType>(-1), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<intType>::max())));
return vec<L, intType, Q>(round(clamp(v , static_cast<floatType>(-1), static_cast<floatType>(1)) * static_cast<floatType>((std::numeric_limits<intType>::max)())));
}
template<typename floatType, length_t L, typename intType, qualifier Q>
@ -714,7 +714,7 @@ namespace detail
GLM_STATIC_ASSERT(std::numeric_limits<intType>::is_integer, "uintType must be an integer type");
GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
return clamp(vec<L, floatType, Q>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<intType>::max())), static_cast<floatType>(-1), static_cast<floatType>(1));
return clamp(vec<L, floatType, Q>(v) * (static_cast<floatType>(1) / static_cast<floatType>((std::numeric_limits<intType>::max)())), static_cast<floatType>(-1), static_cast<floatType>(1));
}
GLM_FUNC_QUALIFIER uint8 packUnorm2x4(vec2 const& v)

26
glm/gtc/random.inl
View file

@ -22,7 +22,7 @@ namespace detail
GLM_FUNC_QUALIFIER static vec<1, uint8, P> call()
{
return vec<1, uint8, P>(
static_cast<uint8>(std::rand() % std::numeric_limits<uint8>::max()));
static_cast<uint8>(std::rand() % (std::numeric_limits<uint8>::max)()));
}
};
@ -32,8 +32,8 @@ namespace detail
GLM_FUNC_QUALIFIER static vec<2, uint8, P> call()
{
return vec<2, uint8, P>(
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max());
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)());
}
};
@ -43,9 +43,9 @@ namespace detail
GLM_FUNC_QUALIFIER static vec<3, uint8, P> call()
{
return vec<3, uint8, P>(
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max());
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)());
}
};
@ -55,10 +55,10 @@ namespace detail
GLM_FUNC_QUALIFIER static vec<4, uint8, P> call()
{
return vec<4, uint8, P>(
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max(),
std::rand() % std::numeric_limits<uint8>::max());
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)(),
std::rand() % (std::numeric_limits<uint8>::max)());
}
};
@ -178,7 +178,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, float, Q> call(vec<L, float, Q> const& Min, vec<L, float, Q> const& Max)
{
return vec<L, float, Q>(compute_rand<L, uint32, Q>::call()) / static_cast<float>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
return vec<L, float, Q>(compute_rand<L, uint32, Q>::call()) / static_cast<float>((std::numeric_limits<uint32>::max)()) * (Max - Min) + Min;
}
};
@ -187,7 +187,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, double, Q> call(vec<L, double, Q> const& Min, vec<L, double, Q> const& Max)
{
return vec<L, double, Q>(compute_rand<L, uint64, Q>::call()) / static_cast<double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
return vec<L, double, Q>(compute_rand<L, uint64, Q>::call()) / static_cast<double>((std::numeric_limits<uint64>::max)()) * (Max - Min) + Min;
}
};
@ -196,7 +196,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, long double, Q> call(vec<L, long double, Q> const& Min, vec<L, long double, Q> const& Max)
{
return vec<L, long double, Q>(compute_rand<L, uint64, Q>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
return vec<L, long double, Q>(compute_rand<L, uint64, Q>::call()) / static_cast<long double>((std::numeric_limits<uint64>::max)()) * (Max - Min) + Min;
}
};
}//namespace detail

10
glm/gtc/ulp.inl
View file

@ -8,7 +8,7 @@ namespace glm
GLM_FUNC_QUALIFIER float next_float(float x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<float>::max());
return std::nextafter(x, (std::numeric_limits<float>::max)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MAX);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
@ -22,9 +22,9 @@ namespace glm
GLM_FUNC_QUALIFIER double next_float(double x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<double>::max());
return std::nextafter(x, (std::numeric_limits<double>::max)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafter(x, std::numeric_limits<double>::max());
return detail::nextafter(x, (std::numeric_limits<double>::max)());
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return __builtin_nextafter(x, DBL_MAX);
# else
@ -47,7 +47,7 @@ namespace glm
GLM_FUNC_QUALIFIER float prev_float(float x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<float>::min());
return std::nextafter(x, (std::numeric_limits<float>::min)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return detail::nextafterf(x, FLT_MIN);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
@ -60,7 +60,7 @@ namespace glm
GLM_FUNC_QUALIFIER double prev_float(double x)
{
# if GLM_HAS_CXX11_STL
return std::nextafter(x, std::numeric_limits<double>::min());
return std::nextafter(x, (std::numeric_limits<double>::min)());
# elif((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
return _nextafter(x, DBL_MIN);
# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID)

2
glm/gtx/common.inl
View file

@ -34,7 +34,7 @@ namespace detail
# if GLM_HAS_CXX11_STL
return std::fpclassify(x) == FP_SUBNORMAL;
# else
return epsilonNotEqual(x, static_cast<T>(0), epsilon<T>()) && std::fabs(x) < std::numeric_limits<T>::min();
return epsilonNotEqual(x, static_cast<T>(0), epsilon<T>()) && std::fabs(x) < (std::numeric_limits<T>::min)();
# endif
}

4
glm/gtx/compatibility.inl
View file

@ -15,9 +15,9 @@ namespace glm
return _isfinite(x) != 0;
# else
if (std::numeric_limits<genType>::is_integer || std::denorm_absent == std::numeric_limits<genType>::has_denorm)
return std::numeric_limits<genType>::min() <= x && std::numeric_limits<genType>::max() >= x;
return (std::numeric_limits<genType>::min)() <= x && (std::numeric_limits<genType>::max)() >= x;
else
return -std::numeric_limits<genType>::max() <= x && std::numeric_limits<genType>::max() >= x;
return -(std::numeric_limits<genType>::max)() <= x && (std::numeric_limits<genType>::max)() >= x;
# endif
}

10
glm/gtx/component_wise.inl
View file

@ -14,8 +14,8 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, floatType, Q> call(vec<L, T, Q> const& v)
{
floatType const Min = static_cast<floatType>(std::numeric_limits<T>::min());
floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max());
floatType const Min = static_cast<floatType>((std::numeric_limits<T>::min)());
floatType const Max = static_cast<floatType>((std::numeric_limits<T>::max)());
return (vec<L, floatType, Q>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1);
}
};
@ -25,7 +25,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, floatType, Q> call(vec<L, T, Q> const& v)
{
return vec<L, floatType, Q>(v) / static_cast<floatType>(std::numeric_limits<T>::max());
return vec<L, floatType, Q>(v) / static_cast<floatType>((std::numeric_limits<T>::max)());
}
};
@ -47,7 +47,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, floatType, Q> const& v)
{
floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()) + static_cast<floatType>(0.5);
floatType const Max = static_cast<floatType>((std::numeric_limits<T>::max)()) + static_cast<floatType>(0.5);
vec<L, floatType, Q> const Scaled(v * Max);
vec<L, T, Q> const Result(Scaled - static_cast<floatType>(0.5));
return Result;
@ -59,7 +59,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, floatType, Q> const& v)
{
return vec<L, T, Q>(vec<L, floatType, Q>(v) * static_cast<floatType>(std::numeric_limits<T>::max()));
return vec<L, T, Q>(vec<L, floatType, Q>(v) * static_cast<floatType>(((std::numeric_limits<T>::max))()));
}
};

2
glm/gtx/float_notmalize.inl
View file

@ -7,7 +7,7 @@ namespace glm
template<length_t L, typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, float, Q> floatNormalize(vec<L, T, Q> const& v)
{
return vec<L, float, Q>(v) / static_cast<float>(std::numeric_limits<T>::max());
return vec<L, float, Q>(v) / static_cast<float>((std::numeric_limits<T>::max)());
}
}//namespace glm