From 84358a17c18aa8e23f9508f4fa3a864e27d51697 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 24 Apr 2025 01:31:27 +0100
Subject: Avoid out parameters with Ray::intersectTriangle

---
 lib/ray.h | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/ray.h b/lib/ray.h
index 793e21e..2b117b7 100644
--- a/lib/ray.h
+++ b/lib/ray.h
@@ -53,17 +53,29 @@ public:
 		}
 	}
 
-	bool
-	intersectTriangle(const PositionType t0, const PositionType t1, const PositionType t2, BaryPosition & bary,
-			RelativeDistance & distance) const
+	struct IntersectTriangleResult {
+		BaryPosition bary;
+		RelativeDistance distance;
+	};
+
+	std::optional<IntersectTriangleResult>
+	intersectTriangle(const PositionType t0, const PositionType t1, const PositionType t2) const
 	{
+		IntersectTriangleResult out;
 		if constexpr (std::is_floating_point_v<typename PositionType::value_type>) {
-			return glm::intersectRayTriangle(start, direction, t0, t1, t2, bary, distance) && distance >= 0.F;
+			if (glm::intersectRayTriangle(start, direction, t0, t1, t2, out.bary, out.distance)
+					&& out.distance >= 0.F) {
+				return out;
+			}
 		}
 		else {
 			const RelativePosition3D t0r = t0 - start, t1r = t1 - start, t2r = t2 - start;
-			return glm::intersectRayTriangle({}, direction, t0r, t1r, t2r, bary, distance) && distance >= 0.F;
+			if (glm::intersectRayTriangle({}, direction, t0r, t1r, t2r, out.bary, out.distance)
+					&& out.distance >= 0.F) {
+				return out;
+			}
 		}
+		return std::nullopt;
 	}
 
 	bool
-- 
cgit v1.2.3