mewin/glm
1
0
Fork 0
Code Releases 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
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_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
@@ -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");
return x > y ? x : y;
return (x < y) ? y : x;
}
// abs