From 5d77861141543b02f1d1028d0d2ad1e98192e682 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Aug 2017 22:40:33 +0200 Subject: [PATCH] Fixed warnings --- test/gtc/gtc_packing.cpp | 2 +- test/gtc/gtc_quaternion.cpp | 2 +- test/gtc/gtc_random.cpp | 12 ++++++------ test/gtx/gtx_matrix_factorisation.cpp | 18 ++++++++++-------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp index 8fdf2ec6..98b2f9d6 100644 --- a/test/gtc/gtc_packing.cpp +++ b/test/gtc/gtc_packing.cpp @@ -46,7 +46,7 @@ void print_11bits(glm::uint const & s) void print_value(float const & s) { - printf("%2.5f, ", static_cast(s); + printf("%2.5f, ", static_cast(s)); print_bits(s); printf(", "); // print_11bits(detail::floatTo11bit(s)); diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index 824865b4..41c70a91 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -118,7 +118,7 @@ int test_quat_euler() } { - glm::dquat q(1.0f, 0.0f, 0.0f, 1.0f); + glm::dquat q(1.0, 0.0, 0.0, 1.0); double Roll = glm::roll(q); double Pitch = glm::pitch(q); double Yaw = glm::yaw(q); diff --git a/test/gtc/gtc_random.cpp b/test/gtc/gtc_random.cpp index d744ea5c..ac339d61 100644 --- a/test/gtc/gtc_random.cpp +++ b/test/gtc/gtc_random.cpp @@ -203,7 +203,7 @@ int test_linearRand() { float ResultFloat = 0.0f; - double ResultDouble = 0.0f; + double ResultDouble = 0.0; for(std::size_t i = 0; i < TestSamples; ++i) { ResultFloat += glm::linearRand(-1.0f, 1.0f); @@ -225,8 +225,8 @@ int test_circularRand() { std::size_t Max = TestSamples; float ResultFloat = 0.0f; - double ResultDouble = 0.0f; - double Radius = 2.0f; + double ResultDouble = 0.0; + double Radius = 2.0; for(std::size_t i = 0; i < Max; ++i) { @@ -251,9 +251,9 @@ int test_sphericalRand() float ResultFloatA = 0.0f; float ResultFloatB = 0.0f; float ResultFloatC = 0.0f; - double ResultDoubleA = 0.0f; - double ResultDoubleB = 0.0f; - double ResultDoubleC = 0.0f; + double ResultDoubleA = 0.0; + double ResultDoubleB = 0.0; + double ResultDoubleC = 0.0; for(std::size_t i = 0; i < Max; ++i) { diff --git a/test/gtx/gtx_matrix_factorisation.cpp b/test/gtx/gtx_matrix_factorisation.cpp index ac3ec92f..7526d364 100644 --- a/test/gtx/gtx_matrix_factorisation.cpp +++ b/test/gtx/gtx_matrix_factorisation.cpp @@ -3,13 +3,13 @@ #include #include -float const epsilon = 1e-10f; - template class matType> int test_qr(matType m) { int Error = 0; + T const epsilon = static_cast(1e-10); + matType<(C < R ? C : R), R, T, P> q(-999); matType r(-999); @@ -45,6 +45,8 @@ int test_rq(matType m) { int Error = 0; + T const epsilon = static_cast(1e-10); + matType q(-999); matType<(C < R ? C : R), R, T, P> r(-999); @@ -82,22 +84,22 @@ int main() int Error = 0; //Test QR square - Error += test_qr(glm::dmat3(12, 6, -4, -51, 167, 24, 4, -68, -41)) ? 1 : 0; + Error += test_qr(glm::dmat3(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0)) ? 1 : 0; //Test RQ square - Error += test_rq(glm::dmat3(12, 6, -4, -51, 167, 24, 4, -68, -41)) ? 1 : 0; + Error += test_rq(glm::dmat3(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0)) ? 1 : 0; //Test QR triangular 1 - Error += test_qr(glm::dmat3x4(12, 6, -4, -51, 167, 24, 4, -68, -41, 7, 2, 15)) ? 1 : 0; + Error += test_qr(glm::dmat3x4(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0, 7.0, 2.0, 15.0)) ? 1 : 0; //Test QR triangular 2 - Error += test_qr(glm::dmat4x3(12, 6, -4, -51, 167, 24, 4, -68, -41, 7, 2, 15)) ? 1 : 0; + Error += test_qr(glm::dmat4x3(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0, 7.0, 2.0, 15.0)) ? 1 : 0; //Test RQ triangular 1 : Fails at the triangular test - Error += test_rq(glm::dmat3x4(12, 6, -4, -51, 167, 24, 4, -68, -41, 7, 2, 15)) ? 1 : 0; + Error += test_rq(glm::dmat3x4(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0, 7.0, 2.0, 15.0)) ? 1 : 0; //Test QR triangular 2 - Error += test_rq(glm::dmat4x3(12, 6, -4, -51, 167, 24, 4, -68, -41, 7, 2, 15)) ? 1 : 0; + Error += test_rq(glm::dmat4x3(12.0, 6.0, -4.0, -51.0, 167.0, 24.0, 4.0, -68.0, -41.0, 7.0, 2.0, 15.0)) ? 1 : 0; return Error; }