mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed issue #18 glm::clamp and NaN's

Browse Source
This commit is contained in:
Christophe Riccio 2012-12-13 11:26:59 +01:00
parent a7fb9f31fd
commit 931b7bcdd6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/func_common.inl
View File

@ -332,11 +332,7 @@ namespace detail
detail::type<valType>::is_int || detail::type<valType>::is_int ||
detail::type<valType>::is_uint, "'clamp' only accept numbers"); detail::type<valType>::is_uint, "'clamp' only accept numbers");
// Old implementation, less predictable branching return min(maxVal, max(minVal, x));
//if(x >= maxVal) return maxVal;
//if(x <= minVal) return minVal;
//return x;
return max(min(x, maxVal), minVal);
} }
template <typename T> template <typename T>