X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgeometry.cpp;h=05387a5bd10036f2798ccc2a0c1655c82ce49743;hb=38abfe4f5342f20b56052ac3090694eabf028d16;hp=c5f806997fae8cee4d9e26311ec0067dd607e808;hpb=4d0ef1687987a0801469c7262f81efd36636605a;p=blank.git

diff --git a/src/geometry.cpp b/src/geometry.cpp
index c5f8069..05387a5 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -1,37 +1,41 @@
 #include "geometry.hpp"
 
+#include <limits>
+
 
 namespace blank {
 
-bool Intersection(const Ray &ray, const AABB &aabb, const glm::mat4 &M, float *dist) {
+bool Intersection(
+	const Ray &ray,
+	const AABB &aabb,
+	const glm::mat4 &M,
+	float *dist,
+	glm::vec3 *normal
+) {
 	float t_min = 0.0f;
-	float t_max = 1.0e5f;
+	float t_max = std::numeric_limits<float>::infinity();
 	const glm::vec3 aabb_pos(M[3].x, M[3].y, M[3].z);
 	const glm::vec3 delta = aabb_pos - ray.orig;
 
+	glm::vec3 t1(t_min, t_min, t_min), t2(t_max, t_max, t_max);
+
 	{ // X
 		const glm::vec3 xaxis(M[0].x, M[0].y, M[0].z);
 		const float e = glm::dot(xaxis, delta);
 		const float f = glm::dot(ray.dir, xaxis);
 
-		if (std::abs(f) > 0.001f) {
-			float t1 = (e + aabb.min.x) / f;
-			float t2 = (e + aabb.max.x) / f;
+		if (std::abs(f) > std::numeric_limits<float>::epsilon()) {
+			t1.x = (e + aabb.min.x) / f;
+			t2.x = (e + aabb.max.x) / f;
+
+			t_min = std::max(t_min, std::min(t1.x, t2.x));
+			t_max = std::min(t_max, std::max(t1.x, t2.x));
 
-			if (t1 > t2) {
-				std::swap(t1, t2);
-			}
-			if (t1 > t_min) {
-				t_min = t1;
-			}
-			if (t2 < t_max) {
-				t_max = t2;
-			}
 			if (t_max < t_min) {
 				return false;
 			}
 		} else {
-			if (aabb.min.x - e > 0.0f || aabb.max.x < 0.0f) {
+			if (aabb.min.x - e < 0.0f || -aabb.max.x - e > 0.0f) {
 				return false;
 			}
 		}
@@ -42,24 +46,18 @@ bool Intersection(const Ray &ray, const AABB &aabb, const glm::mat4 &M, float *d
 		const float e = glm::dot(yaxis, delta);
 		const float f = glm::dot(ray.dir, yaxis);
 
-		if (std::abs(f) > 0.001f) {
-			float t1 = (e + aabb.min.y) / f;
-			float t2 = (e + aabb.max.y) / f;
+		if (std::abs(f) > std::numeric_limits<float>::epsilon()) {
+			t1.y = (e + aabb.min.y) / f;
+			t2.y = (e + aabb.max.y) / f;
+
+			t_min = std::max(t_min, std::min(t1.y, t2.y));
+			t_max = std::min(t_max, std::max(t1.y, t2.y));
 
-			if (t1 > t2) {
-				std::swap(t1, t2);
-			}
-			if (t1 > t_min) {
-				t_min = t1;
-			}
-			if (t2 < t_max) {
-				t_max = t2;
-			}
 			if (t_max < t_min) {
 				return false;
 			}
 		} else {
-			if (aabb.min.y - e > 0.0f || aabb.max.y < 0.0f) {
+			if (aabb.min.y - e < 0.0f || -aabb.max.y - e > 0.0f) {
 				return false;
 			}
 		}
@@ -70,33 +68,83 @@ bool Intersection(const Ray &ray, const AABB &aabb, const glm::mat4 &M, float *d
 		const float e = glm::dot(zaxis, delta);
 		const float f = glm::dot(ray.dir, zaxis);
 
-		if (std::abs(f) > 0.001f) {
-			float t1 = (e + aabb.min.z) / f;
-			float t2 = (e + aabb.max.z) / f;
+		if (std::abs(f) > std::numeric_limits<float>::epsilon()) {
+			t1.z = (e + aabb.min.z) / f;
+			t2.z = (e + aabb.max.z) / f;
+
+			t_min = std::max(t_min, std::min(t1.z, t2.z));
+			t_max = std::min(t_max, std::max(t1.z, t2.z));
 
-			if (t1 > t2) {
-				std::swap(t1, t2);
-			}
-			if (t1 > t_min) {
-				t_min = t1;
-			}
-			if (t2 < t_max) {
-				t_max = t2;
-			}
 			if (t_max < t_min) {
 				return false;
 			}
 		} else {
-			if (aabb.min.z - e > 0.0f || aabb.max.z < 0.0f) {
+			if (aabb.min.z - e < 0.0f || -aabb.max.z - e > 0.0f) {
 				return false;
 			}
 		}
 	}
 
+	glm::vec3 min_all(min(t1, t2));
+
 	if (dist) {
 		*dist = t_min;
 	}
+	if (normal) {
+		glm::vec4 norm(0.0f);
+		if (min_all.x > min_all.y) {
+			if (min_all.x > min_all.z) {
+				norm.x = t2.x < t1.x ? 1 : -1;
+			} else {
+				norm.z = t2.z < t1.z ? 1 : -1;
+			}
+		} else if (min_all.y > min_all.z) {
+			norm.y = t2.y < t1.y ? 1 : -1;
+		} else {
+			norm.z = t2.z < t1.z ? 1 : -1;
+		}
+		norm = M * norm;
+		*normal = glm::vec3(norm);
+	}
 	return true;
 }
 
+bool CullTest(const AABB &box, const glm::mat4 &MVP) {
+	// transform corners into clip space
+	glm::vec4 corners[8] = {
+		{ box.min.x, box.min.y, box.min.z, 1.0f },
+		{ box.min.x, box.min.y, box.max.z, 1.0f },
+		{ box.min.x, box.max.y, box.min.z, 1.0f },
+		{ box.min.x, box.max.y, box.max.z, 1.0f },
+		{ box.max.x, box.min.y, box.min.z, 1.0f },
+		{ box.max.x, box.min.y, box.max.z, 1.0f },
+		{ box.max.x, box.max.y, box.min.z, 1.0f },
+		{ box.max.x, box.max.y, box.max.z, 1.0f },
+	};
+	for (glm::vec4 &corner : corners) {
+		corner = MVP * corner;
+		corner /= corner.w;
+	}
+
+	int hits[6] = { 0, 0, 0, 0, 0, 0 };
+
+	// check how many corners lie outside
+	for (const glm::vec4 &corner : corners) {
+		if (corner.x >  1.0f) ++hits[0];
+		if (corner.x < -1.0f) ++hits[1];
+		if (corner.y >  1.0f) ++hits[2];
+		if (corner.y < -1.0f) ++hits[3];
+		if (corner.z >  1.0f) ++hits[4];
+		if (corner.z < -1.0f) ++hits[5];
+	}
+
+	// if all corners are outside any given clip plane, the test is true
+	for (int hit : hits) {
+		if (hit == 8) return true;
+	}
+
+	// otherwise the box might still get culled completely, but can't say for sure ;)
+	return false;
+}
+
 }