mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-29 19:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed any and all for scalars

Browse Source
This commit is contained in:
Christophe Riccio 2013-02-04 19:17:47 +01:00
parent 59b9a780e9
commit 6799127ec6
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/gtx/scalar_relational.inl
View File

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

12
test/gtx/gtx_scalar_relational.cpp
View File

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