Fixed merge

master
Christophe Riccio ago%!(EXTRA string=14 years)
commit cb05c4c00f
  1. 2
      glm/core/func_common.inl

@ -189,7 +189,7 @@ namespace glm
inline genType trunc(genType const & x) inline genType trunc(genType const & x)
{ {
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'trunc' only accept floating-point inputs"); GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'trunc' only accept floating-point inputs");
return floor(abs(x)); return x < 0 ? -floor(-x) : floor(x);;
} }
template <typename valType> template <typename valType>

Loading…
Cancel
Save