From 7ad46a0e239c7e68c4436e632a77a0d8a14b6333 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 5 Jan 2024 20:08:26 +0000
Subject: Inline functions of GeometricPlane

---
 lib/geometricPlane.cpp | 28 ----------------------------
 lib/geometricPlane.h   | 30 +++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 lib/geometricPlane.cpp

(limited to 'lib')

diff --git a/lib/geometricPlane.cpp b/lib/geometricPlane.cpp
deleted file mode 100644
index 567f98a..0000000
--- a/lib/geometricPlane.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "geometricPlane.h"
-#include "ray.h"
-#include <glm/geometric.hpp>
-#include <glm/gtx/intersect.hpp>
-
-GeometricPlane::PlaneRelation
-GeometricPlane::getRelation(Position3D p) const
-{
-	const auto d = glm::dot(normal, p - origin);
-	return d < 0.F ? PlaneRelation::Below : d > 0.F ? PlaneRelation::Above : PlaneRelation::On;
-}
-
-bool
-GeometricPlane::isIntersect(PlaneRelation a, PlaneRelation b)
-{
-	return ((a == PlaneRelation::Above && b == PlaneRelation::Below)
-			|| (a == PlaneRelation::Below && b == PlaneRelation::Above));
-}
-
-std::optional<GeometricPlane::DistAndPosition>
-GeometricPlane::getRayIntersectPosition(const Ray & ray) const
-{
-	float dist {};
-	if (!glm::intersectRayPlane(ray.start, ray.direction, origin, normal, dist)) {
-		return {};
-	}
-	return DistAndPosition {dist, ray.start + (ray.direction * dist)};
-}
diff --git a/lib/geometricPlane.h b/lib/geometricPlane.h
index c74beff..5be76ec 100644
--- a/lib/geometricPlane.h
+++ b/lib/geometricPlane.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include "config/types.h"
+#include "ray.h"
+#include <glm/geometric.hpp>
+#include <glm/gtx/intersect.hpp>
 #include <glm/vec3.hpp>
 #include <optional>
 
-class Ray;
-
 class GeometricPlane {
 public:
 	struct DistAndPosition {
@@ -17,8 +18,27 @@ public:
 	Position3D origin;
 	Normal3D normal;
 
-	[[nodiscard]] PlaneRelation getRelation(Position3D point) const;
-	[[nodiscard]] std::optional<DistAndPosition> getRayIntersectPosition(const Ray &) const;
+	[[nodiscard]] inline PlaneRelation
+	getRelation(Position3D point) const
+	{
+		const auto d = glm::dot(normal, point - origin);
+		return d < 0.F ? PlaneRelation::Below : d > 0.F ? PlaneRelation::Above : PlaneRelation::On;
+	}
+
+	[[nodiscard]] inline std::optional<DistAndPosition>
+	getRayIntersectPosition(const Ray & ray) const
+	{
+		float dist {};
+		if (!glm::intersectRayPlane(ray.start, ray.direction, origin, normal, dist)) {
+			return {};
+		}
+		return DistAndPosition {dist, ray.start + (ray.direction * dist)};
+	}
 
-	static bool isIntersect(PlaneRelation a, PlaneRelation b);
+	inline static bool
+	isIntersect(PlaneRelation a, PlaneRelation b)
+	{
+		return ((a == PlaneRelation::Above && b == PlaneRelation::Below)
+				|| (a == PlaneRelation::Below && b == PlaneRelation::Above));
+	}
 };
-- 
cgit v1.2.3