1 files changed, 35 insertions, 15 deletions

diff --git a/lib/ray.h b/lib/ray.h
index a831270..642cd4d 100644
--- a/lib/ray.h
+++ b/lib/ray.h
@@ -27,8 +27,7 @@ public:
 		const auto n2 = crossProduct(direction, n);
 		const auto c1 = p1 + PositionType((glm::dot(RelativePosition3D(start - p1), n2) / glm::dot(d1, n2)) * d1);
 		const auto difflength = glm::length(diff);
-		if (glm::length(RelativePosition3D(c1 - p1)) > difflength
-				|| glm::length(RelativePosition3D(c1 - e1)) > difflength) {
+		if (::distance(c1, p1) > difflength || ::distance(c1, e1) > difflength) {
 			return std::numeric_limits<typename PositionType::value_type>::infinity();
 		}
 		return static_cast<PositionType::value_type>(glm::abs(glm::dot(n, RelativePosition3D(p1 - start))));
@@ -54,34 +53,55 @@ 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
-	intersectSphere(const PositionType centre, const PositionType::value_type size, PositionType & position,
-			Normal3D & normal) const
+	struct IntersectSphereResult {
+		PositionType position;
+		Normal3D normal;
+	};
+
+	std::optional<IntersectSphereResult>
+	intersectSphere(const PositionType centre, const PositionType::value_type size) const
 	{
+		IntersectSphereResult out;
 		if constexpr (std::is_floating_point_v<typename PositionType::value_type>) {
-			return glm::intersectRaySphere(start, direction, centre, size, position, normal);
+			if (glm::intersectRaySphere(start, direction, centre, size, out.position, out.normal)) {
+				return out;
+			}
 		}
 		else {
 			const RelativePosition3D cr = centre - start;
 			RelativePosition3D positionF {};
-			const auto r = glm::intersectRaySphere(
-					{}, direction, cr, static_cast<RelativeDistance>(size), positionF, normal);
-			position = GlobalPosition3D(positionF) + start;
-			return r;
+			if (glm::intersectRaySphere(
+						{}, direction, cr, static_cast<RelativeDistance>(size), positionF, out.normal)) {
+				out.position = GlobalPosition3D(positionF) + start;
+				return out;
+			}
 		}
+		return std::nullopt;
 	}
 };