X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fgeometry%2FIntersectionTest.cpp;h=ded47b92437f721613761d61531a121aa500eb71;hb=aee07b0f8d8c0d9af66dd7507938d83985d53833;hp=521647e5115b9a3e23aeb168fa1fb81eb2dfb9ea;hpb=ab0ba4313c473378b4516e3702d524dc1d1fc5d4;p=blank.git

diff --git a/tst/geometry/IntersectionTest.cpp b/tst/geometry/IntersectionTest.cpp
index 521647e..ded47b9 100644
--- a/tst/geometry/IntersectionTest.cpp
+++ b/tst/geometry/IntersectionTest.cpp
@@ -21,7 +21,7 @@ void IntersectionTest::tearDown() {
 
 
 void IntersectionTest::testSimpleRayBoxIntersection() {
-	Ray ray{ { 0, 0, 0 }, { 1, 0, 0 } }; // at origin, pointing right
+	Ray ray{ { 0, 0, 0 }, { 1, 0, 0 }, { } }; // at origin, pointing right
 	ray.Update();
 	AABB box{ { -1, -1, -1 }, { 1, 1, 1 } }; // 2x2x2 cube centered around origin
 
@@ -68,7 +68,7 @@ void IntersectionTest::testSimpleRayBoxIntersection() {
 }
 
 void IntersectionTest::testRayBoxIntersection() {
-	Ray ray{ { 0, 0, 0 }, { 1, 0, 0 } }; // at origin, pointing right
+	Ray ray{ { 0, 0, 0 }, { 1, 0, 0 }, { } }; // at origin, pointing right
 	AABB box{ { -1, -1, -1 }, { 1, 1, 1 } }; // 2x2x2 cube centered around origin
 	glm::mat4 M(1); // no transformation
 
@@ -87,7 +87,7 @@ void IntersectionTest::testRayBoxIntersection() {
 	// should be 4 units to the left now
 	ray.orig.x = -5;
 	CPPUNIT_ASSERT_MESSAGE(
-		"ray pointing at box doesn't intersect",
+		"ray pointing at box to the right doesn't intersect",
 		Intersection(ray, box, M, &distance, &normal)
 	);
 	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
@@ -102,10 +102,101 @@ void IntersectionTest::testRayBoxIntersection() {
 	// move ray to the other side, so it's pointing away now
 	ray.orig.x = 5;
 	CPPUNIT_ASSERT_MESSAGE(
-		"ray pointing away from box still intersects",
+		"ray pointing away from box to the left still intersects",
 		!Intersection(ray, box, M)
 	);
 
+	// turn ray around
+	ray.dir.x = -1;
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing at box to the left does not intersect",
+		Intersection(ray, box, M, &distance, &normal)
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"intersection distance way off",
+		4.0f, distance, delta
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong surface normal at intersection point",
+		glm::vec3(1, 0, 0), normal
+	);
+
+	// ray below
+	ray.orig = { 0, -5, 0 };
+	ray.dir = { 0, 1, 0 };
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing at box above does not intersect",
+		Intersection(ray, box, M, &distance, &normal)
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"intersection distance way off",
+		4.0f, distance, delta
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong surface normal at intersection point",
+		glm::vec3(0, -1, 0), normal
+	);
+
+	// turn ray around
+	ray.dir.y = -1;
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing away from box above still intersects",
+		!Intersection(ray, box, M)
+	);
+
+	// move ray above
+	ray.orig.y = 5;
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing at box below does not intersect",
+		Intersection(ray, box, M, &distance, &normal)
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"intersection distance way off",
+		4.0f, distance, delta
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong surface normal at intersection point",
+		glm::vec3(0, 1, 0), normal
+	);
+
+	// ray behind
+	ray.orig = { 0, 0, -5 };
+	ray.dir = { 0, 0, 1 };
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing at box in front does not intersect",
+		Intersection(ray, box, M, &distance, &normal)
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"intersection distance way off",
+		4.0f, distance, delta
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong surface normal at intersection point",
+		glm::vec3(0, 0, -1), normal
+	);
+
+	// turn ray around
+	ray.dir.z = -1;
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing away from box in front still intersects",
+		!Intersection(ray, box, M)
+	);
+
+	// move ray in front
+	ray.orig.z = 5;
+	CPPUNIT_ASSERT_MESSAGE(
+		"ray pointing at box behind does not intersect",
+		Intersection(ray, box, M, &distance, &normal)
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"intersection distance way off",
+		4.0f, distance, delta
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong surface normal at intersection point",
+		glm::vec3(0, 0, 1), normal
+	);
+
 	// 45 deg down from 4 units away, so should be about 4 * sqrt(2)
 	ray.orig = { -5.0f, 4.5f, 0.0f };
 	ray.dir = { 0.70710678118654752440f, -0.70710678118654752440f, 0.0f };
@@ -165,7 +256,7 @@ void IntersectionTest::testBoxBoxIntersection() {
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
 		"bad intersection normal (with rotation)",
-		glm::vec3(1, 0, 0), abs(normal) // normal can be in + or - x, therefore abs()
+		glm::vec3(1, 0, 0), glm::abs(normal) // normal can be in + or - x, therefore abs()
 	);
 
 	Mb = glm::translate(glm::vec3(3, 0, 0)); // 3 to the right