diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 13:51:33 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 14:14:13 +0000 |
| commit | 7fba471728f2216d7e3b7900297fc3b3531e286c (patch) | |
| tree | 5caef3b2efc23aefccb215ec9005cd8e7d2e91b8 /game/vehicles/railVehicle.h | |
| parent | Fix todo for handling a terrain walk from outside the mesh (diff) | |
| parent | Model positions as integers (diff) | |
| download | ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.bz2 ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.xz ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.zip | |
Merge branch 'ints' into terrain
Conflicts fix, compiles, some test failures remain.
Trees not added, possibility of OM invalid handle assertion failures,
normals broken due to integer overflow in Newell's method.
Diffstat (limited to 'game/vehicles/railVehicle.h')
| -rw-r--r-- | game/vehicles/railVehicle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h index f34643e..20d1ea1 100644 --- a/game/vehicles/railVehicle.h +++ b/game/vehicles/railVehicle.h @@ -17,12 +17,12 @@ public: void move(const Train *, float & trailBy); - [[nodiscard]] bool intersectRay(const Ray &, glm::vec2 *, float *) const override; + [[nodiscard]] bool intersectRay(const Ray &, Position2D *, float *) const override; RailVehicleClassPtr rvClass; using LV = RailVehicleClass::LocationVertex; - using BLocation = BufferedLocationT<glm::mat4 LV::*, RailVehicleClass::Instance &>; - BLocation location; - std::array<BLocation, 2> bogies; + BufferedLocationUpdater location; + std::array<BufferedLocationUpdater, 2> bogies; }; + using RailVehiclePtr = std::unique_ptr<RailVehicle>; |