From 4cb312773e76bd7fa0fc5481026da146387c73aa Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 19 Jan 2011 12:48:04 +0000 Subject: [PATCH] Added test for == operators --- test/core/core_type_mat2x2.cpp | 2 ++ test/core/core_type_mat2x3.cpp | 2 ++ test/core/core_type_mat2x4.cpp | 2 ++ test/core/core_type_mat3x2.cpp | 2 ++ test/core/core_type_mat3x3.cpp | 2 ++ test/core/core_type_mat3x4.cpp | 2 ++ test/core/core_type_mat4x2.cpp | 2 ++ test/core/core_type_mat4x3.cpp | 2 ++ test/core/core_type_mat4x4.cpp | 2 ++ test/core/core_type_vec1.cpp | 17 ++++++++++++++++- test/core/core_type_vec2.cpp | 17 ++++++++++++++++- test/core/core_type_vec3.cpp | 17 ++++++++++++++++- test/core/core_type_vec4.cpp | 22 +++++++++++++++++++++- 13 files changed, 87 insertions(+), 4 deletions(-) diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp index 6d710abf9..b537a43fa 100644 --- a/test/core/core_type_mat2x2.cpp +++ b/test/core/core_type_mat2x2.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat2x2 o = m / x; glm::mat2x2 p = x * m; glm::mat2x2 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp index 30197aaf5..e275edde4 100644 --- a/test/core/core_type_mat2x3.cpp +++ b/test/core/core_type_mat2x3.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat2x3 o = m / x; glm::mat2x3 p = x * m; glm::mat2x3 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp index 2fd2efadd..1e077ed51 100644 --- a/test/core/core_type_mat2x4.cpp +++ b/test/core/core_type_mat2x4.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat2x4 o = m / x; glm::mat2x4 p = x * m; glm::mat2x4 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp index 5bc661743..8f56fd712 100644 --- a/test/core/core_type_mat3x2.cpp +++ b/test/core/core_type_mat3x2.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat3x2 o = m / x; glm::mat3x2 p = x * m; glm::mat3x2 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index b6a143b14..a9eb33254 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -46,6 +46,8 @@ static bool test_operators() glm::mat3x3 o = m / x; glm::mat3x3 p = x * m; glm::mat3x3 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp index 828376294..5aef20e69 100644 --- a/test/core/core_type_mat3x4.cpp +++ b/test/core/core_type_mat3x4.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat3x4 o = m / x; glm::mat3x4 p = x * m; glm::mat3x4 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp index c0f8b694c..eaf972ac0 100644 --- a/test/core/core_type_mat4x2.cpp +++ b/test/core/core_type_mat4x2.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat4x2 o = m / x; glm::mat4x2 p = x * m; glm::mat4x2 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp index bf570fc7f..60758edbb 100644 --- a/test/core/core_type_mat4x3.cpp +++ b/test/core/core_type_mat4x3.cpp @@ -21,6 +21,8 @@ static bool test_operators() glm::mat4x3 o = m / x; glm::mat4x3 p = x * m; glm::mat4x3 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 9539c75d6..fe1075de3 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -48,6 +48,8 @@ static bool test_operators() glm::mat4x4 o = m / x; glm::mat4x4 p = x * m; glm::mat4x4 q = m * x; + bool R = m != q; + bool S = m == m; return true; } diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index 43aaf59ee..9ac344422 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -9,7 +9,22 @@ #include +static bool test_operators() +{ + glm::vec4 A(1.0f); + glm::vec4 B(1.0f); + bool R = A != B; + bool S = A == B; + + return true; +} + int main() { - return -1; + bool Result = true; + + Result = Result && test_operators(); + + assert(Result); + return Result; } diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index b806c1ffc..c45ad499b 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -9,7 +9,22 @@ #include +static bool test_operators() +{ + glm::vec4 A(1.0f); + glm::vec4 B(1.0f); + bool R = A != B; + bool S = A == B; + + return true; +} + int main() { - return -1; + bool Result = true; + + Result = Result && test_operators(); + + assert(Result); + return Result; } diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index efbd336fb..249cc693b 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -9,7 +9,22 @@ #include +static bool test_operators() +{ + glm::vec4 A(1.0f); + glm::vec4 B(1.0f); + bool R = A != B; + bool S = A == B; + + return true; +} + int main() { - return -1; + bool Result = true; + + Result = Result && test_operators(); + + assert(Result); + return Result; } diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index b0650c5ff..afd160662 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -33,12 +33,24 @@ __m128 swizzle(glm::vec4 const & v) return _mm_shuffle_ps(Src, Src, mask<(int(W) << 6) | (int(Z) << 4) | (int(Y) << 2) | (int(X) << 0)>::value); } -void test_hvec4() +bool test_hvec4() { glm::hvec4 const A = glm::hvec4(0, 1, 2, 3); //glm::hvec4 B = glm::swizzle(A); //glm::vec4 B = glm::detail::tvec##(glm::vec4::_size)(); + + return true; +} + +static bool test_operators() +{ + glm::vec4 A(1.0f); + glm::vec4 B(1.0f); + bool R = A != B; + bool S = A == B; + + return true; } int main() @@ -48,6 +60,14 @@ int main() __m128 DataA = swizzle(glm::vec4(1.0f, 2.0f, 3.0f, 4.0f)); __m128 DataB = swizzle(glm::vec4(1.0f, 2.0f, 3.0f, 4.0f)); + bool Result = true; + + Result = Result && test_operators(); + Result = Result && test_hvec4(); + + assert(Result); + return Result; + return 0; }