From 80529930ea3bc874c8da22c66343745ff6fdd45b Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 24 Feb 2024 00:10:27 +0000 Subject: Simplify vector addition/subtraction with differnt types Automatically applies correct rounding with float to int operations, adjusts test expectations accordingly. --- game/vehicles/railVehicle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'game/vehicles') 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 & 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, 10> triangles {{ // Front -- cgit v1.2.3