Explorar o código

Fixed build, added boost test

Christophe Riccio %!s(int64=14) %!d(string=hai) anos
pai
achega
9c3faaca40

+ 3 - 0
test/core/core_func_common.cpp

@@ -10,6 +10,9 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/epsilon.hpp>
 #include <cstdio>
+#include <boost/array.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread.hpp>
 
 int test_modf()
 {

+ 2 - 2
test/core/core_type_mat2x2.cpp

@@ -11,8 +11,8 @@
 
 static int test_operators()
 {
+	glm::mat2x2 l(1.0f);
 	glm::mat2x2 m(1.0f);
-	glm::mat2x2 n(1.0f);
 	glm::vec2 u(1.0f);
 	glm::vec2 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static int test_operators()
 	glm::mat2x2 p = x * m;
 	glm::mat2x2 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat2x3.cpp

@@ -11,8 +11,8 @@
 
 static int test_operators()
 {
+	glm::mat2x3 l(1.0f);
 	glm::mat2x3 m(1.0f);
-	glm::mat2x3 n(1.0f);
 	glm::vec2 u(1.0f);
 	glm::vec3 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static int test_operators()
 	glm::mat2x3 p = x * m;
 	glm::mat2x3 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat2x4.cpp

@@ -11,8 +11,8 @@
 
 static int test_operators()
 {
+	glm::mat2x4 l(1.0f);
 	glm::mat2x4 m(1.0f);
-	glm::mat2x4 n(1.0f);
 	glm::vec2 u(1.0f);
 	glm::vec4 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static int test_operators()
 	glm::mat2x4 p = x * m;
 	glm::mat2x4 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat3x2.cpp

@@ -11,8 +11,8 @@
 
 static bool test_operators()
 {
+	glm::mat3x2 l(1.0f);
 	glm::mat3x2 m(1.0f);
-	glm::mat3x2 n(1.0f);
 	glm::vec3 u(1.0f);
 	glm::vec2 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static bool test_operators()
 	glm::mat3x2 p = x * m;
 	glm::mat3x2 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat3x3.cpp

@@ -36,8 +36,8 @@ int test_mat3x3()
 
 static int test_operators()
 {
+	glm::mat3x3 l(1.0f);
 	glm::mat3x3 m(1.0f);
-	glm::mat3x3 n(1.0f);
 	glm::vec3 u(1.0f);
 	glm::vec3 v(1.0f);
 	float x = 1.0f;
@@ -48,7 +48,7 @@ static int test_operators()
 	glm::mat3x3 p = x * m;
 	glm::mat3x3 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat3x4.cpp

@@ -11,8 +11,8 @@
 
 static bool test_operators()
 {
+	glm::mat3x4 l(1.0f);
 	glm::mat3x4 m(1.0f);
-	glm::mat3x4 n(1.0f);
 	glm::vec3 u(1.0f);
 	glm::vec4 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static bool test_operators()
 	glm::mat3x4 p = x * m;
 	glm::mat3x4 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat4x2.cpp

@@ -11,8 +11,8 @@
 
 static int test_operators()
 {
+	glm::mat4x2 l(1.0f);
 	glm::mat4x2 m(1.0f);
-	glm::mat4x2 n(1.0f);
 	glm::vec4 u(1.0f);
 	glm::vec2 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static int test_operators()
 	glm::mat4x2 p = x * m;
 	glm::mat4x2 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat4x3.cpp

@@ -11,8 +11,8 @@
 
 static int test_operators()
 {
+	glm::mat4x3 l(1.0f);
 	glm::mat4x3 m(1.0f);
-	glm::mat4x3 n(1.0f);
 	glm::vec4 u(1.0f);
 	glm::vec3 v(1.0f);
 	float x = 1.0f;
@@ -23,7 +23,7 @@ static int test_operators()
 	glm::mat4x3 p = x * m;
 	glm::mat4x3 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }

+ 2 - 2
test/core/core_type_mat4x4.cpp

@@ -39,8 +39,8 @@ int test_mat4x4()
 
 static bool test_operators()
 {
+	glm::mat4x4 l(1.0f);
 	glm::mat4x4 m(1.0f);
-	glm::mat4x4 n(1.0f);
 	glm::vec4 u(1.0f);
 	glm::vec4 v(1.0f);
 	float x = 1.0f;
@@ -51,7 +51,7 @@ static bool test_operators()
 	glm::mat4x4 p = x * m;
 	glm::mat4x4 q = m * x;
 	bool R = m != q;
-	bool S = m == n;
+	bool S = m == l;
 
 	return (S && !R) ? 0 : 1;
 }