diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-04-24 01:31:27 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-04-24 01:31:27 +0100 |
| commit | 84358a17c18aa8e23f9508f4fa3a864e27d51697 (patch) | |
| tree | 3ccf5d616a629056a1b007fc718e26940f019800 /game/geoData.cpp | |
| parent | Fix all warnings game/network/* (diff) | |
| download | ilt-84358a17c18aa8e23f9508f4fa3a864e27d51697.tar.bz2 ilt-84358a17c18aa8e23f9508f4fa3a864e27d51697.tar.xz ilt-84358a17c18aa8e23f9508f4fa3a864e27d51697.zip | |
Avoid out parameters with Ray::intersectTriangle
Diffstat (limited to 'game/geoData.cpp')
| -rw-r--r-- | game/geoData.cpp | 6 |
1 files changed, 2 insertions, 4 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; |