1 files changed, 20 insertions, 10 deletions

diff --git a/gfx/aabb.h b/gfx/aabb.h
index 229d516..a661f66 100644
--- a/gfx/aabb.h
+++ b/gfx/aabb.h
@@ -1,31 +1,41 @@
 #pragma once
 
-#include "config/types.h"
+#include "maths.h"
 #include <algorithm>
 #include <tuple>
 
-class AxisAlignedBoundingBox {
+template<Arithmetic T, glm::qualifier Q = glm::defaultp> class AxisAlignedBoundingBox {
 public:
+	using V = glm::vec<3, T, Q>;
 	AxisAlignedBoundingBox() = default;
 
-	AxisAlignedBoundingBox(const GlobalPosition3D & min, const GlobalPosition3D & max) : min {min}, max {max} { }
+	AxisAlignedBoundingBox(const V & min, const V & max) : min {min}, max {max} { }
 
-	AxisAlignedBoundingBox & operator+=(const GlobalPosition3D & point);
+	AxisAlignedBoundingBox &
+	operator+=(const V & point)
+	{
+		min = glm::min(min, point);
+		max = glm::max(max, point);
+		return *this;
+	}
 
-	AxisAlignedBoundingBox operator-(const GlobalPosition3D & viewPoint) const;
+	AxisAlignedBoundingBox
+	operator-(const V & viewPoint) const
+	{
+		return {min - viewPoint, max - viewPoint};
+	}
 
 	[[nodiscard]] static AxisAlignedBoundingBox
 	fromPoints(auto && points)
 	{
-		using Limits = std::numeric_limits<GlobalDistance>;
-		static constexpr const auto INITIAL
-				= std::make_pair(GlobalPosition3D {Limits::max()}, GlobalPosition3D {Limits::min()});
-		return std::make_from_tuple<AxisAlignedBoundingBox>(
+		using Limits = std::numeric_limits<T>;
+		static constexpr const auto INITIAL = std::make_pair(V {Limits::max()}, V {Limits::min()});
+		return std::make_from_tuple<AxisAlignedBoundingBox<T, Q>>(
 				std::ranges::fold_left(points, INITIAL, [](const auto & prev, const auto & point) {
 					auto & [min, max] = prev;
 					return std::make_pair(glm::min(min, point), glm::max(max, point));
 				}));
 	}
 
-	GlobalPosition3D min, max;
+	V min, max;
 };