Fixed merge
This commit is contained in:
commit
cb05c4c00f
@ -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…
x
Reference in New Issue
Block a user