Avoid out parameters with Ray::intersectTriangle

2 files changed, 9 insertions, 6 deletions

diff --git a/game/geoData.cpp b/game/geoData.cpp
index db0f3f4..b886efd 100644
--- a/game/geoData.cpp
+++ b/game/geoData.cpp
@@ -121,11 +121,9 @@ GeoData::intersectRay(const Ray<GlobalPosition3D> & ray, FaceHandle face) const
 	walkUntil(PointFace {ray.start, face},
 			ray.start.xy() + (ray.direction.xy() * ::difference(extents.max.xy(), extents.min.xy())),
 			[&out, &ray, this](const auto & step) {
-				BaryPosition bari {};
-				RelativeDistance dist {};
 				const auto t = triangle<3>(step.current);
-				if (ray.intersectTriangle(t.x, t.y, t.z, bari, dist)) {
-					out.emplace(t * bari, step.current);
+				if (const auto inter = ray.intersectTriangle(t.x, t.y, t.z)) {
+					out.emplace(t * inter->bary, step.current);
 					return true;
 				}
 				return false;
diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp
index 59d1e83..4a0a22d 100644
--- a/game/vehicles/railVehicle.cpp
+++ b/game/vehicles/railVehicle.cpp
@@ -72,7 +72,12 @@ RailVehicle::intersectRay(const Ray<GlobalPosition3D> & ray, BaryPosition & bary
 	}};
 	return std::any_of(
 			triangles.begin(), triangles.end(), [&cornerVertices, &ray, &baryPos, &distance](const auto & idx) {
-				return ray.intersectTriangle(
-						cornerVertices[idx[0]], cornerVertices[idx[1]], cornerVertices[idx[2]], baryPos, distance);
+				if (const auto inter = ray.intersectTriangle(
+							cornerVertices[idx[0]], cornerVertices[idx[1]], cornerVertices[idx[2]])) {
+					baryPos = inter->bary;
+					distance = inter->distance;
+					return true;
+				};
+				return false;
 			});
 }