AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Better follow GLSL min and max specification #372

Browse Source
This commit is contained in:
Christophe Riccio 2017-08-20 16:53:50 +02:00
parent 3358f33870
commit fc53581c68
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/func_common.inl
View File

@ -15,7 +15,7 @@ namespace glm
GLM_FUNC_QUALIFIER genType min(genType x, genType y) GLM_FUNC_QUALIFIER genType min(genType x, genType y)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point or integer inputs"); GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point or integer inputs");
return x < y ? x : y; return (y < x) ? y : x;
} }
// max // max
@ -24,7 +24,7 @@ namespace glm
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point or integer inputs"); GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point or integer inputs");
return x > y ? x : y; return (x < y) ? y : x;
} }
// abs // abs

1
readme.md
View File

@ -97,6 +97,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
- Fixed Visual C++ 2017.2 warning regarding __has_feature definision #655 - Fixed Visual C++ 2017.2 warning regarding __has_feature definision #655
- Fixed documentation warnings - Fixed documentation warnings
- Fixed GLM_HAS_OPENMP when OpenMP is not enabled - Fixed GLM_HAS_OPENMP when OpenMP is not enabled
- Fixed Better follow GLSL min and max specification #372
#### Deprecation: #### Deprecation:
- Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler