Fixed any and all for scalars

master
Christophe Riccio ago%!(EXTRA string=13 years)
parent 59b9a780e9
commit 6799127ec6
  1. 10
      glm/gtx/scalar_relational.inl
  2. 12
      test/gtx/gtx_scalar_relational.cpp

@ -71,20 +71,18 @@ namespace glm
GLM_FUNC_QUALIFIER bool any
(
bool const & x,
bool const & y
bool const & x
)
{
return x || y;
return x;
}
GLM_FUNC_QUALIFIER bool all
(
bool const & x,
bool const & y
bool const & x
)
{
return x && y;
return x;
}
GLM_FUNC_QUALIFIER bool not_

@ -135,10 +135,8 @@ int test_any()
{
int Error(0);
Error += glm::any(true, true) ? 0 : 1;
Error += glm::any(true, false) ? 0 : 1;
Error += glm::any(false, true) ? 0 : 1;
Error += glm::any(false, false) ? 1 : 0;
Error += glm::any(true) ? 0 : 1;
Error += glm::any(false) ? 1 : 0;
return Error;
}
@ -147,10 +145,8 @@ int test_all()
{
int Error(0);
Error += glm::all(true, true) ? 0 : 1;
Error += glm::all(true, false) ? 1 : 0;
Error += glm::all(false, true) ? 1 : 0;
Error += glm::all(false, false) ? 1 : 0;
Error += glm::all(true) ? 0 : 1;
Error += glm::all(false) ? 1 : 0;
return Error;
}

Loading…
Cancel
Save