X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fgeometry.hpp;h=f9f87c4f9d14462f31af92b16247e5a6aad584e9;hb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;hp=f4498f5fa743ec734edc84aa90a87eb1d55757ab;hpb=0580ff3941fe5f5ea25c96e737edba1541d9271f;p=blank.git

diff --git a/src/model/geometry.hpp b/src/model/geometry.hpp
index f4498f5..f9f87c4 100644
--- a/src/model/geometry.hpp
+++ b/src/model/geometry.hpp
@@ -13,6 +13,31 @@ constexpr float PI_0p5 = PI * 0.5f;
 constexpr float PI_1p5 = PI * 1.5f;
 constexpr float PI_2p0 = PI * 2.0f;
 
+constexpr float DEG_RAD_FACTOR = PI / 180.0f;
+constexpr float RAD_DEG_FACTOR = 180.0f / PI;
+
+constexpr float deg2rad(float d) {
+	return d * DEG_RAD_FACTOR;
+}
+
+constexpr float rad2deg(float r) {
+	return r * RAD_DEG_FACTOR;
+}
+
+
+template<class T>
+T manhattan_distance(const glm::tvec3<T> &a, const glm::tvec3<T> &b) {
+	glm::tvec3<T> diff(abs(a - b));
+	return diff.x + diff.y + diff.z;
+}
+
+template<class T>
+T manhattan_radius(const glm::tvec3<T> &v) {
+	glm::tvec3<T> a(abs(v));
+	return std::max(a.x, std::max(a.y, a.z));
+}
+
+
 struct AABB {
 	glm::vec3 min;
 	glm::vec3 max;
@@ -22,6 +47,10 @@ struct AABB {
 		if (max.y < min.y) std::swap(max.y, min.y);
 		if (max.z < min.z) std::swap(max.z, min.z);
 	}
+
+	glm::vec3 Center() const noexcept {
+		return min + (max - min) * 0.5f;
+	}
 };
 
 struct Ray {
@@ -40,7 +69,9 @@ bool Intersection(
 	const AABB &a_box,
 	const glm::mat4 &a_m,
 	const AABB &b_box,
-	const glm::mat4 &b_m) noexcept;
+	const glm::mat4 &b_m,
+	float &depth,
+	glm::vec3 &normal) noexcept;
 
 bool CullTest(const AABB &box, const glm::mat4 &MVP) noexcept;