mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed swizzle tests

Browse Source
This commit is contained in:
Christophe Riccio 2013-09-15 14:40:21 +02:00
parent 6838815f9f
commit ca3927b61a
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/core/core_func_swizzle.cpp
View File

@ -16,11 +16,10 @@ int test_ivec2_swizzle()
int Error = 0; int Error = 0;
glm::ivec2 A(1, 2); glm::ivec2 A(1, 2);
glm::ivec2 B = A.xy(); glm::ivec2 B = A.yx();
glm::ivec2 C(0); glm::ivec2 C = B.yx();
C.xy() = B.xy();
Error += A == B ? 0 : 1; Error += A != B ? 0 : 1;
Error += A == C ? 0 : 1; Error += A == C ? 0 : 1;
return Error; return Error;
@ -31,11 +30,10 @@ int test_ivec3_swizzle()
int Error = 0; int Error = 0;
glm::ivec3 A(1, 2, 3); glm::ivec3 A(1, 2, 3);
glm::ivec3 B = A.xyz(); glm::ivec3 B = A.zyx();
glm::ivec3 C(0); glm::ivec3 C = B.zyx();
C.xyz() = B.xyz();
Error += A == B ? 0 : 1; Error += A != B ? 0 : 1;
Error += A == C ? 0 : 1; Error += A == C ? 0 : 1;
return Error; return Error;
@ -46,11 +44,10 @@ int test_ivec4_swizzle()
int Error = 0; int Error = 0;
glm::ivec4 A(1, 2, 3, 4); glm::ivec4 A(1, 2, 3, 4);
glm::ivec4 B = A.xyzw(); glm::ivec4 B = A.wzyx();
glm::ivec4 C(0); glm::ivec4 C = B.wzyx();
C.xyzw() = B.xyzw();
Error += A == B ? 0 : 1; Error += A != B ? 0 : 1;
Error += A == C ? 0 : 1; Error += A == C ? 0 : 1;
return Error; return Error;
@ -61,13 +58,12 @@ int test_vec4_swizzle()
int Error = 0; int Error = 0;
glm::vec4 A(1, 2, 3, 4); glm::vec4 A(1, 2, 3, 4);
glm::vec4 B = A.xyzw(); glm::vec4 B = A.wzyx();
glm::vec4 C(0); glm::vec4 C = B.wzyx();
//C.xyzw() = B.xyzw();
float f = glm::dot(C.wzyx(), C.xyzw()); float f = glm::dot(C.wzyx(), C.xyzw());
Error += A == B ? 0 : 1; Error += A != B ? 0 : 1;
Error += A == C ? 0 : 1; Error += A == C ? 0 : 1;
return Error; return Error;