Browse Source

Fixed warnings

Christophe Riccio 8 years ago
parent
commit
5d77861141

+ 1 - 1
test/gtc/gtc_packing.cpp

@@ -46,7 +46,7 @@ void print_11bits(glm::uint const & s)
 
 
 void print_value(float const & s)
 void print_value(float const & s)
 {
 {
-	printf("%2.5f, ", static_cast<double>(s);
+	printf("%2.5f, ", static_cast<double>(s));
 	print_bits(s);
 	print_bits(s);
 	printf(", ");
 	printf(", ");
 //	print_11bits(detail::floatTo11bit(s));
 //	print_11bits(detail::floatTo11bit(s));

+ 1 - 1
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 Roll = glm::roll(q);
 		double Pitch = glm::pitch(q);
 		double Pitch = glm::pitch(q);
 		double Yaw = glm::yaw(q);
 		double Yaw = glm::yaw(q);

+ 6 - 6
test/gtc/gtc_random.cpp

@@ -203,7 +203,7 @@ int test_linearRand()
 
 
 	{
 	{
 		float ResultFloat = 0.0f;
 		float ResultFloat = 0.0f;
-		double ResultDouble = 0.0f;
+		double ResultDouble = 0.0;
 		for(std::size_t i = 0; i < TestSamples; ++i)
 		for(std::size_t i = 0; i < TestSamples; ++i)
 		{
 		{
 			ResultFloat += glm::linearRand(-1.0f, 1.0f);
 			ResultFloat += glm::linearRand(-1.0f, 1.0f);
@@ -225,8 +225,8 @@ int test_circularRand()
 	{
 	{
 		std::size_t Max = TestSamples;
 		std::size_t Max = TestSamples;
 		float ResultFloat = 0.0f;
 		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)
 		for(std::size_t i = 0; i < Max; ++i)
 		{
 		{
@@ -251,9 +251,9 @@ int test_sphericalRand()
 		float ResultFloatA = 0.0f;
 		float ResultFloatA = 0.0f;
 		float ResultFloatB = 0.0f;
 		float ResultFloatB = 0.0f;
 		float ResultFloatC = 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)
 		for(std::size_t i = 0; i < Max; ++i)
 		{
 		{

+ 10 - 8
test/gtx/gtx_matrix_factorisation.cpp

@@ -3,13 +3,13 @@
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/epsilon.hpp>
 
 
-float const epsilon = 1e-10f;
-
 template <glm::length_t C, glm::length_t R, typename T, glm::precision P, template<glm::length_t, glm::length_t, typename, glm::precision> class matType>
 template <glm::length_t C, glm::length_t R, typename T, glm::precision P, template<glm::length_t, glm::length_t, typename, glm::precision> class matType>
 int test_qr(matType<C, R, T, P> m)
 int test_qr(matType<C, R, T, P> m)
 {
 {
 	int Error = 0;
 	int Error = 0;
 
 
+	T const epsilon = static_cast<T>(1e-10);
+
 	matType<(C < R ? C : R), R, T, P> q(-999);
 	matType<(C < R ? C : R), R, T, P> q(-999);
 	matType<C, (C < R ? C : R), T, P> r(-999);
 	matType<C, (C < R ? C : R), T, P> r(-999);
 
 
@@ -45,6 +45,8 @@ int test_rq(matType<C, R, T, P> m)
 {
 {
 	int Error = 0;
 	int Error = 0;
 
 
+	T const epsilon = static_cast<T>(1e-10);
+
 	matType<C, (C < R ? C : R), T, P> q(-999);
 	matType<C, (C < R ? C : R), T, P> q(-999);
 	matType<(C < R ? C : R), R, T, P> r(-999);
 	matType<(C < R ? C : R), R, T, P> r(-999);
 
 
@@ -82,22 +84,22 @@ int main()
 	int Error = 0;
 	int Error = 0;
 
 
 	//Test QR square
 	//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
 	//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
 	//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
 	//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
 	//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
 	//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;
 	return Error;
 }
 }