diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 01:10:26 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 01:10:26 +0000 |
| commit | 95eed94c9294f719724283e672cc7c83b2abd282 (patch) | |
| tree | f0078bdacea65bfb03be3700c6e0f0c896336778 /lib/ray.cpp | |
| parent | Helper to create a cubiod from dimensions (diff) | |
| download | ilt-95eed94c9294f719724283e672cc7c83b2abd282.tar.bz2 ilt-95eed94c9294f719724283e672cc7c83b2abd282.tar.xz ilt-95eed94c9294f719724283e672cc7c83b2abd282.zip | |
Unified crossProduct
Diffstat (limited to 'lib/ray.cpp')
| -rw-r--r-- | lib/ray.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ray.cpp b/lib/ray.cpp index 9fb3648..254ad14 100644 --- a/lib/ray.cpp +++ b/lib/ray.cpp @@ -1,4 +1,5 @@ #include "ray.h" +#include "maths.h" #include <algorithm> Ray @@ -14,8 +15,8 @@ Ray::distanceToLine(const Position3D & p1, const Position3D & e1) const const auto diff = p1 - e1; const auto d1 = glm::normalize(diff); const auto &p2 = start, &d2 = direction; - const auto n = glm::cross(d1, d2); - const auto n2 = glm::cross(d2, n); + const auto n = crossProduct(d1, d2); + const auto n2 = crossProduct(d2, n); const auto c1 = p1 + (glm::dot((p2 - p1), n2) / glm::dot(d1, n2)) * d1; const auto difflength = glm::length(diff); if (glm::length(c1 - p1) > difflength || glm::length(c1 - e1) > difflength) { |