diff --git a/test/gtc/gtc_matrix_access.cpp b/test/gtc/gtc_matrix_access.cpp index 4bcf214f..7dc8ded5 100644 --- a/test/gtc/gtc_matrix_access.cpp +++ b/test/gtc/gtc_matrix_access.cpp @@ -2,7 +2,7 @@ // OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2010-09-16 -// Updated : 2011-05-07 +// Updated : 2013-05-10 // Licence : This source is under MIT licence // File : test/gtc/matrix_access.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -12,344 +12,344 @@ int test_mat2x2_row_set() { - int Error = 0; - - glm::mat2x2 m(1); - + int Error = 0; + + glm::mat2x2 m(1); + m = glm::row(m, 0, glm::vec2( 0, 1)); m = glm::row(m, 1, glm::vec2( 4, 5)); - Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - return Error; + return Error; } int test_mat2x2_col_set() { - int Error = 0; - - glm::mat2x2 m(1); - + int Error = 0; + + glm::mat2x2 m(1); + m = glm::column(m, 0, glm::vec2( 0, 1)); m = glm::column(m, 1, glm::vec2( 4, 5)); - Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - return Error; + return Error; } int test_mat2x3_row_set() { - int Error = 0; - - glm::mat2x3 m(1); - + int Error = 0; + + glm::mat2x3 m(1); + m = glm::row(m, 0, glm::vec2( 0, 1)); m = glm::row(m, 1, glm::vec2( 4, 5)); m = glm::row(m, 2, glm::vec2( 8, 9)); - Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec2( 8, 9) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec2( 8, 9) ? 0 : 1; - return Error; + return Error; } int test_mat2x3_col_set() { - int Error = 0; - - glm::mat2x3 m(1); - + int Error = 0; + + glm::mat2x3 m(1); + m = glm::column(m, 0, glm::vec3( 0, 1, 2)); m = glm::column(m, 1, glm::vec3( 4, 5, 6)); - Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - return Error; + return Error; } int test_mat2x4_row_set() { - int Error = 0; - - glm::mat2x4 m(1); - + int Error = 0; + + glm::mat2x4 m(1); + m = glm::row(m, 0, glm::vec2( 0, 1)); m = glm::row(m, 1, glm::vec2( 4, 5)); m = glm::row(m, 2, glm::vec2( 8, 9)); m = glm::row(m, 3, glm::vec2(12, 13)); - Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec2( 8, 9) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec2( 8, 9) ? 0 : 1; Error += glm::row(m, 3) == glm::vec2(12, 13) ? 0 : 1; - return Error; + return Error; } int test_mat2x4_col_set() { - int Error = 0; - - glm::mat2x4 m(1); - + int Error = 0; + + glm::mat2x4 m(1); + m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); - Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - return Error; + return Error; } int test_mat3x2_row_set() { - int Error = 0; - - glm::mat3x2 m(1); - + int Error = 0; + + glm::mat3x2 m(1); + m = glm::row(m, 0, glm::vec3( 0, 1, 2)); m = glm::row(m, 1, glm::vec3( 4, 5, 6)); - Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - return Error; + return Error; } int test_mat3x2_col_set() { - int Error = 0; - - glm::mat3x2 m(1); - + int Error = 0; + + glm::mat3x2 m(1); + m = glm::column(m, 0, glm::vec2( 0, 1)); m = glm::column(m, 1, glm::vec2( 4, 5)); m = glm::column(m, 2, glm::vec2( 8, 9)); - Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec2( 8, 9) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec2( 8, 9) ? 0 : 1; - return Error; + return Error; } int test_mat3x3_row_set() { - int Error = 0; - - glm::mat3x3 m(1); - + int Error = 0; + + glm::mat3x3 m(1); + m = glm::row(m, 0, glm::vec3( 0, 1, 2)); m = glm::row(m, 1, glm::vec3( 4, 5, 6)); m = glm::row(m, 2, glm::vec3( 8, 9, 10)); - Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; - return Error; + return Error; } int test_mat3x3_col_set() { - int Error = 0; - - glm::mat3x3 m(1); - + int Error = 0; + + glm::mat3x3 m(1); + m = glm::column(m, 0, glm::vec3( 0, 1, 2)); m = glm::column(m, 1, glm::vec3( 4, 5, 6)); m = glm::column(m, 2, glm::vec3( 8, 9, 10)); - Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; - return Error; + return Error; } int test_mat3x4_row_set() { - int Error = 0; - - glm::mat3x4 m(1); - + int Error = 0; + + glm::mat3x4 m(1); + m = glm::row(m, 0, glm::vec3( 0, 1, 2)); m = glm::row(m, 1, glm::vec3( 4, 5, 6)); m = glm::row(m, 2, glm::vec3( 8, 9, 10)); m = glm::row(m, 3, glm::vec3(12, 13, 14)); - Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; Error += glm::row(m, 3) == glm::vec3(12, 13, 14) ? 0 : 1; - return Error; + return Error; } int test_mat3x4_col_set() { - int Error = 0; - - glm::mat3x4 m(1); - + int Error = 0; + + glm::mat3x4 m(1); + m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); m = glm::column(m, 2, glm::vec4( 8, 9, 10, 11)); - Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; - return Error; + return Error; } int test_mat4x2_row_set() { - int Error = 0; - - glm::mat4x2 m(1); - + int Error = 0; + + glm::mat4x2 m(1); + m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); - Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - return Error; + return Error; } int test_mat4x2_col_set() { - int Error = 0; - - glm::mat4x2 m(1); - + int Error = 0; + + glm::mat4x2 m(1); + m = glm::column(m, 0, glm::vec2( 0, 1)); m = glm::column(m, 1, glm::vec2( 4, 5)); m = glm::column(m, 2, glm::vec2( 8, 9)); m = glm::column(m, 3, glm::vec2(12, 13)); - Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec2( 8, 9) ? 0 : 1; - Error += glm::column(m, 3) == glm::vec2(12, 13) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec2( 0, 1) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec2( 4, 5) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec2( 8, 9) ? 0 : 1; + Error += glm::column(m, 3) == glm::vec2(12, 13) ? 0 : 1; - return Error; + return Error; } int test_mat4x3_row_set() { - int Error = 0; - - glm::mat4x3 m(1); - + int Error = 0; + + glm::mat4x3 m(1); + m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); m = glm::row(m, 2, glm::vec4( 8, 9, 10, 11)); - Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; - return Error; + return Error; } int test_mat4x3_col_set() { - int Error = 0; - - glm::mat4x3 m(1); - + int Error = 0; + + glm::mat4x3 m(1); + m = glm::column(m, 0, glm::vec3( 0, 1, 2)); m = glm::column(m, 1, glm::vec3( 4, 5, 6)); m = glm::column(m, 2, glm::vec3( 8, 9, 10)); m = glm::column(m, 3, glm::vec3(12, 13, 14)); - Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; - Error += glm::column(m, 3) == glm::vec3(12, 13, 14) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec3( 0, 1, 2) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec3( 4, 5, 6) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec3( 8, 9, 10) ? 0 : 1; + Error += glm::column(m, 3) == glm::vec3(12, 13, 14) ? 0 : 1; - return Error; + return Error; } int test_mat4x4_row_set() { - int Error = 0; - - glm::mat4 m(1); - + int Error = 0; + + glm::mat4 m(1); + m = glm::row(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::row(m, 1, glm::vec4( 4, 5, 6, 7)); m = glm::row(m, 2, glm::vec4( 8, 9, 10, 11)); m = glm::row(m, 3, glm::vec4(12, 13, 14, 15)); - Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - Error += glm::row(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; - Error += glm::row(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1; + Error += glm::row(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::row(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::row(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; + Error += glm::row(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1; - return Error; + return Error; } int test_mat4x4_col_set() { - int Error = 0; - - glm::mat4 m(1); - + int Error = 0; + + glm::mat4 m(1); + m = glm::column(m, 0, glm::vec4( 0, 1, 2, 3)); m = glm::column(m, 1, glm::vec4( 4, 5, 6, 7)); m = glm::column(m, 2, glm::vec4( 8, 9, 10, 11)); m = glm::column(m, 3, glm::vec4(12, 13, 14, 15)); - Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; - Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; - Error += glm::column(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; - Error += glm::column(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1; + Error += glm::column(m, 0) == glm::vec4( 0, 1, 2, 3) ? 0 : 1; + Error += glm::column(m, 1) == glm::vec4( 4, 5, 6, 7) ? 0 : 1; + Error += glm::column(m, 2) == glm::vec4( 8, 9, 10, 11) ? 0 : 1; + Error += glm::column(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1; - return Error; + return Error; } int test_mat4x4_row_get() { - int Error = 0; - - glm::mat4 m(1); - - glm::vec4 A = glm::row(m, 0); - Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1; - glm::vec4 B = glm::row(m, 1); - Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1; - glm::vec4 C = glm::row(m, 2); - Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1; - glm::vec4 D = glm::row(m, 3); - Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1; + int Error = 0; - return Error; + glm::mat4 m(1); + + glm::vec4 A = glm::row(m, 0); + Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1; + glm::vec4 B = glm::row(m, 1); + Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1; + glm::vec4 C = glm::row(m, 2); + Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1; + glm::vec4 D = glm::row(m, 3); + Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1; + + return Error; } int test_mat4x4_col_get() { - int Error = 0; - - glm::mat4 m(1); - - glm::vec4 A = glm::column(m, 0); - Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1; - glm::vec4 B = glm::column(m, 1); - Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1; - glm::vec4 C = glm::column(m, 2); - Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1; - glm::vec4 D = glm::column(m, 3); - Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1; - - return Error; + int Error = 0; + + glm::mat4 m(1); + + glm::vec4 A = glm::column(m, 0); + Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1; + glm::vec4 B = glm::column(m, 1); + Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1; + glm::vec4 C = glm::column(m, 2); + Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1; + glm::vec4 D = glm::column(m, 3); + Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1; + + return Error; } int main() @@ -357,26 +357,26 @@ int main() int Error = 0; Error += test_mat2x2_row_set(); - Error += test_mat2x2_col_set(); + Error += test_mat2x2_col_set(); Error += test_mat2x3_row_set(); - Error += test_mat2x3_col_set(); + Error += test_mat2x3_col_set(); Error += test_mat2x4_row_set(); - Error += test_mat2x4_col_set(); + Error += test_mat2x4_col_set(); Error += test_mat3x2_row_set(); - Error += test_mat3x2_col_set(); + Error += test_mat3x2_col_set(); Error += test_mat3x3_row_set(); - Error += test_mat3x3_col_set(); + Error += test_mat3x3_col_set(); Error += test_mat3x4_row_set(); - Error += test_mat3x4_col_set(); + Error += test_mat3x4_col_set(); Error += test_mat4x2_row_set(); - Error += test_mat4x2_col_set(); + Error += test_mat4x2_col_set(); Error += test_mat4x3_row_set(); - Error += test_mat4x3_col_set(); + Error += test_mat4x3_col_set(); Error += test_mat4x4_row_set(); - Error += test_mat4x4_col_set(); + Error += test_mat4x4_col_set(); - Error += test_mat4x4_row_get(); - Error += test_mat4x4_col_get(); + Error += test_mat4x4_row_get(); + Error += test_mat4x4_col_get(); return Error; }