From ca3927b61a976ebbf1b62b3aa0b6da89a9ba3274 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 15 Sep 2013 14:40:21 +0200 Subject: [PATCH] Fixed swizzle tests --- test/core/core_func_swizzle.cpp | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/test/core/core_func_swizzle.cpp b/test/core/core_func_swizzle.cpp index ca9169f6..5aa0ed19 100644 --- a/test/core/core_func_swizzle.cpp +++ b/test/core/core_func_swizzle.cpp @@ -16,11 +16,10 @@ int test_ivec2_swizzle() int Error = 0; glm::ivec2 A(1, 2); - glm::ivec2 B = A.xy(); - glm::ivec2 C(0); - C.xy() = B.xy(); + glm::ivec2 B = A.yx(); + glm::ivec2 C = B.yx(); - Error += A == B ? 0 : 1; + Error += A != B ? 0 : 1; Error += A == C ? 0 : 1; return Error; @@ -31,11 +30,10 @@ int test_ivec3_swizzle() int Error = 0; glm::ivec3 A(1, 2, 3); - glm::ivec3 B = A.xyz(); - glm::ivec3 C(0); - C.xyz() = B.xyz(); + glm::ivec3 B = A.zyx(); + glm::ivec3 C = B.zyx(); - Error += A == B ? 0 : 1; + Error += A != B ? 0 : 1; Error += A == C ? 0 : 1; return Error; @@ -46,11 +44,10 @@ int test_ivec4_swizzle() int Error = 0; glm::ivec4 A(1, 2, 3, 4); - glm::ivec4 B = A.xyzw(); - glm::ivec4 C(0); - C.xyzw() = B.xyzw(); + glm::ivec4 B = A.wzyx(); + glm::ivec4 C = B.wzyx(); - Error += A == B ? 0 : 1; + Error += A != B ? 0 : 1; Error += A == C ? 0 : 1; return Error; @@ -61,13 +58,12 @@ int test_vec4_swizzle() int Error = 0; glm::vec4 A(1, 2, 3, 4); - glm::vec4 B = A.xyzw(); - glm::vec4 C(0); - //C.xyzw() = B.xyzw(); + glm::vec4 B = A.wzyx(); + glm::vec4 C = B.wzyx(); float f = glm::dot(C.wzyx(), C.xyzw()); - Error += A == B ? 0 : 1; + Error += A != B ? 0 : 1; Error += A == C ? 0 : 1; return Error;