diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:10:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:10:27 +0000 |
| commit | 80529930ea3bc874c8da22c66343745ff6fdd45b (patch) | |
| tree | 6441b090f24cf33638c5257e6b9eea4f14929503 /game/vehicles/railVehicle.cpp | |
| parent | Merge branch 'glcontainer-fix' (diff) | |
| download | ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.tar.bz2 ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.tar.xz ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.zip | |
Simplify vector addition/subtraction with differnt types
Automatically applies correct rounding with float to int operations, adjusts test
expectations accordingly.
Diffstat (limited to 'game/vehicles/railVehicle.cpp')
| -rw-r--r-- | game/vehicles/railVehicle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp index 4a1fdab..59d1e83 100644 --- a/game/vehicles/railVehicle.cpp +++ b/game/vehicles/railVehicle.cpp @@ -51,7 +51,7 @@ RailVehicle::intersectRay(const Ray<GlobalPosition3D> & ray, BaryPosition & bary constexpr const auto Z = 3900.F; const glm::mat3 moveBy = location.getRotationTransform(); const auto cornerVertices = cuboidCorners(-X, X, -Y, Y, 0.F, Z) * [&moveBy, this](const auto & corner) { - return location.position() + GlobalPosition3D(moveBy * corner); + return location.position() + (moveBy * corner); }; static constexpr const std::array<glm::vec<3, uint8_t>, 10> triangles {{ // Front |