mewin/glm
1
0
Fork 0
Code Releases Activity

Added openBounded and closeBounded

Browse Source
This commit is contained in:
Christophe Riccio 2017-09-20 23:10:52 +02:00
parent bfa6c9e192
commit 083782185e
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/ext/ext_vector_relational.cpp
View File

@ -31,12 +31,36 @@ int test_notEqual()
return Error; return Error;
} }
int test_openBounded()
{
int Error = 0;
Error += glm::all(glm::openBounded(glm::ivec2(2), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
Error += !glm::all(glm::openBounded(glm::ivec2(1), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
Error += !glm::all(glm::openBounded(glm::ivec2(3), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
return Error;
}
int test_closeBounded()
{
int Error = 0;
Error += glm::all(glm::closeBounded(glm::ivec2(2), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
Error += glm::all(glm::closeBounded(glm::ivec2(1), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
Error += glm::all(glm::closeBounded(glm::ivec2(3), glm::ivec2(1), glm::ivec2(3))) ? 0 : 1;
return Error;
}
int main() int main()
{ {
int Error = 0; int Error = 0;
Error += test_equal(); Error += test_equal();
Error += test_notEqual(); Error += test_notEqual();
Error += test_openBounded();
Error += test_closeBounded();
return Error; return Error;
} }

2
test/gtc/gtc_integer.cpp
View File

@ -26,7 +26,7 @@ namespace log2_
glm::ivec3 D0(glm::log2(glm::vec3(16.f))); glm::ivec3 D0(glm::log2(glm::vec3(16.f)));
glm::ivec4 E0(glm::log2(glm::vec4(16.f))); glm::ivec4 E0(glm::log2(glm::vec4(16.f)));
int A1 = glm::log2(int(1024)); int A1 = glm::log2(int(16));
glm::ivec1 B1 = glm::log2(glm::ivec1(16)); glm::ivec1 B1 = glm::log2(glm::ivec1(16));
glm::ivec2 C1 = glm::log2(glm::ivec2(16)); glm::ivec2 C1 = glm::log2(glm::ivec2(16));
glm::ivec3 D1 = glm::log2(glm::ivec3(16)); glm::ivec3 D1 = glm::log2(glm::ivec3(16));