From 37169954148829f5fab731af19cb239abdb68da5 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 15 Nov 2014 00:56:14 +0100 Subject: [PATCH] Fixed white spaces --- test/gtx/gtx_io.cpp | 244 +++++++++++++++++++++----------------------- 1 file changed, 118 insertions(+), 126 deletions(-) diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp index 6a4f3219..05be9bf1 100644 --- a/test/gtx/gtx_io.cpp +++ b/test/gtx/gtx_io.cpp @@ -13,162 +13,154 @@ #include #include -namespace { - - template - std::basic_ostream& - operator<<(std::basic_ostream& os, glm::precision const& a) - { - typename std::basic_ostream::sentry const cerberus(os); +namespace +{ + template + std::basic_ostream& operator<<(std::basic_ostream& os, glm::precision const& a) + { + typename std::basic_ostream::sentry const cerberus(os); - if (cerberus) { - switch (a) { - case glm::highp: os << "hi"; break; - case glm::mediump: os << "md"; break; - case glm::lowp: os << "lo"; break; - } - } + if (cerberus) + { + switch (a) { + case glm::highp: os << "hi"; break; + case glm::mediump: os << "md"; break; + case glm::lowp: os << "lo"; break; + } + } - return os; - } + return os; + } - template - std::basic_string - type_name(std::basic_ostream& os, T const&) - { - std::basic_ostringstream ostr; - - if (typeid(T) == typeid(glm::tquat)) { ostr << "quat"; } - else if (typeid(T) == typeid(glm::tvec2)) { ostr << "vec2"; } - else if (typeid(T) == typeid(glm::tvec3)) { ostr << "vec3"; } - else if (typeid(T) == typeid(glm::tvec4)) { ostr << "vec4"; } - else if (typeid(T) == typeid(glm::tmat2x2)) { ostr << "mat2x2"; } - else if (typeid(T) == typeid(glm::tmat2x3)) { ostr << "mat2x3"; } - else if (typeid(T) == typeid(glm::tmat2x4)) { ostr << "mat2x4"; } - else if (typeid(T) == typeid(glm::tmat3x2)) { ostr << "mat3x2"; } - else if (typeid(T) == typeid(glm::tmat3x3)) { ostr << "mat3x3"; } - else if (typeid(T) == typeid(glm::tmat3x4)) { ostr << "mat3x4"; } - else if (typeid(T) == typeid(glm::tmat4x2)) { ostr << "mat4x2"; } - else if (typeid(T) == typeid(glm::tmat4x3)) { ostr << "mat4x3"; } - else if (typeid(T) == typeid(glm::tmat4x4)) { ostr << "mat4x4"; } - else { ostr << "unknown"; } + template + std::basic_string type_name(std::basic_ostream& os, T const&) + { + std::basic_ostringstream ostr; - ostr << '<' << typeid(U).name() << ',' << P << '>'; + if (typeid(T) == typeid(glm::tquat)) { ostr << "quat"; } + else if (typeid(T) == typeid(glm::tvec2)) { ostr << "vec2"; } + else if (typeid(T) == typeid(glm::tvec3)) { ostr << "vec3"; } + else if (typeid(T) == typeid(glm::tvec4)) { ostr << "vec4"; } + else if (typeid(T) == typeid(glm::tmat2x2)) { ostr << "mat2x2"; } + else if (typeid(T) == typeid(glm::tmat2x3)) { ostr << "mat2x3"; } + else if (typeid(T) == typeid(glm::tmat2x4)) { ostr << "mat2x4"; } + else if (typeid(T) == typeid(glm::tmat3x2)) { ostr << "mat3x2"; } + else if (typeid(T) == typeid(glm::tmat3x3)) { ostr << "mat3x3"; } + else if (typeid(T) == typeid(glm::tmat3x4)) { ostr << "mat3x4"; } + else if (typeid(T) == typeid(glm::tmat4x2)) { ostr << "mat4x2"; } + else if (typeid(T) == typeid(glm::tmat4x3)) { ostr << "mat4x3"; } + else if (typeid(T) == typeid(glm::tmat4x4)) { ostr << "mat4x4"; } + else { ostr << "unknown"; } - return ostr.str(); - } - + ostr << '<' << typeid(U).name() << ',' << P << '>'; + + return ostr.str(); + } } // namespace { template int test_io_quat(OS& os) { - os << '\n' - << typeid(OS).name() - << '\n'; - - glm::tquat const q(1, 0, 0, 0); + os << '\n' << typeid(OS).name() << '\n'; - { - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << type_name(os, q) << ": " << q << '\n'; - } - - { - glm::io::basic_format_saver const iofs(os); - - os << glm::io::unformatted - << type_name(os, q) << ": " << q << '\n'; - } + glm::tquat const q(1, 0, 0, 0); - return 0; + { + glm::io::basic_format_saver const iofs(os); + + os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) + << type_name(os, q) << ": " << q << '\n'; + } + + { + glm::io::basic_format_saver const iofs(os); + + os << glm::io::unformatted + << type_name(os, q) << ": " << q << '\n'; + } + + return 0; } template int test_io_vec(OS& os) { - os << '\n' - << typeid(OS).name() - << '\n'; - - glm::tvec2 const v2(0, 1); - glm::tvec3 const v3(2, 3, 4); - glm::tvec4 const v4(5, 6, 7, 8); + os << '\n' << typeid(OS).name() << '\n'; - os << type_name(os, v2) << ": " << v2 << '\n' - << type_name(os, v3) << ": " << v3 << '\n' - << type_name(os, v4) << ": " << v4 << '\n'; + glm::tvec2 const v2(0, 1); + glm::tvec3 const v3(2, 3, 4); + glm::tvec4 const v4(5, 6, 7, 8); - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << type_name(os, v2) << ": " << v2 << '\n' - << type_name(os, v3) << ": " << v3 << '\n' - << type_name(os, v4) << ": " << v4 << '\n'; + os << type_name(os, v2) << ": " << v2 << '\n' + << type_name(os, v3) << ": " << v3 << '\n' + << type_name(os, v4) << ": " << v4 << '\n'; - return 0; + glm::io::basic_format_saver const iofs(os); + + os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) + << type_name(os, v2) << ": " << v2 << '\n' + << type_name(os, v3) << ": " << v3 << '\n' + << type_name(os, v4) << ": " << v4 << '\n'; + + return 0; } template int test_io_mat(OS& os) { - os << '\n' - << typeid(OS).name() - << '\n'; + os << '\n' << typeid(OS).name() << '\n'; - glm::tvec2 const v2_1( 0, 1); - glm::tvec2 const v2_2( 2, 3); - glm::tvec2 const v2_3( 4, 5); - glm::tvec2 const v2_4( 6, 7); - glm::tvec3 const v3_1( 8, 9, 10); - glm::tvec3 const v3_2(11, 12, 13); - glm::tvec3 const v3_3(14, 15, 16); - glm::tvec3 const v3_4(17, 18, 19); - glm::tvec4 const v4_1(20, 21, 22, 23); - glm::tvec4 const v4_2(24, 25, 26, 27); - glm::tvec4 const v4_3(28, 29, 30, 31); - glm::tvec4 const v4_4(32, 33, 34, 35); + glm::tvec2 const v2_1( 0, 1); + glm::tvec2 const v2_2( 2, 3); + glm::tvec2 const v2_3( 4, 5); + glm::tvec2 const v2_4( 6, 7); + glm::tvec3 const v3_1( 8, 9, 10); + glm::tvec3 const v3_2(11, 12, 13); + glm::tvec3 const v3_3(14, 15, 16); + glm::tvec3 const v3_4(17, 18, 19); + glm::tvec4 const v4_1(20, 21, 22, 23); + glm::tvec4 const v4_2(24, 25, 26, 27); + glm::tvec4 const v4_3(28, 29, 30, 31); + glm::tvec4 const v4_4(32, 33, 34, 35); #if 0 - os << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' - << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' - << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' - << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' - << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' - << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' - << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' - << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' - << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; + os << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' + << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' + << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' + << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' + << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' + << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' + << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' + << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' + << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; #endif + + glm::io::basic_format_saver const iofs(os); + + os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) + << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' + << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' + << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' + << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' + << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' + << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' + << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' + << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' + << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; + + os << glm::io::unformatted + << glm::io::order(glm::io::column_major) + << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' + << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' + << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' + << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' + << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' + << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' + << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' + << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' + << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; - glm::io::basic_format_saver const iofs(os); - - os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2) - << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' - << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' - << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' - << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' - << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' - << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' - << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' - << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' - << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; - - os << glm::io::unformatted - << glm::io::order(glm::io::column_major) - << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2(v2_1, v2_2) << '\n' - << "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3(v3_1, v3_2) << '\n' - << "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4(v4_1, v4_2) << '\n' - << "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2(v2_1, v2_2, v2_3) << '\n' - << "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3(v3_1, v3_2, v3_3) << '\n' - << "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4(v4_1, v4_2, v4_3) << '\n' - << "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2(v2_1, v2_2, v2_3, v2_4) << '\n' - << "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3(v3_1, v3_2, v3_3, v3_4) << '\n' - << "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4(v4_1, v4_2, v4_3, v4_4) << '\n'; - - return 0; + return 0; } int main()