diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2026-04-03 12:04:14 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2026-04-03 12:04:14 +0100 |
| commit | 4d04572e48950493ce85255d181be43967f362fd (patch) | |
| tree | f74d055f151472cda3fa3fc0f760eb6219dd9fad /game/vehicles/railVehicle.h | |
| parent | Use std::chrono for worldTime (diff) | |
| parent | Fix direction of difference vector calculating railVehicle new position (diff) | |
| download | ilt-4d04572e48950493ce85255d181be43967f362fd.tar.bz2 ilt-4d04572e48950493ce85255d181be43967f362fd.tar.xz ilt-4d04572e48950493ce85255d181be43967f362fd.zip | |
Merge branch 'shared-locations'
Diffstat (limited to 'game/vehicles/railVehicle.h')
| -rw-r--r-- | game/vehicles/railVehicle.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h index bf1e782..0f341f9 100644 --- a/game/vehicles/railVehicle.h +++ b/game/vehicles/railVehicle.h @@ -1,8 +1,6 @@ #pragma once -#include "gfx/gl/bufferedLocation.h" #include "railVehicleClass.h" -#include <array> #include <game/selectable.h> #include <glm/glm.hpp> #include <memory> @@ -12,16 +10,14 @@ class Train; class RailVehicle : Selectable, RailVehicleClass::Instance { public: - explicit RailVehicle(RailVehicleClassPtr rvc); + explicit RailVehicle(RailVehicleClassPtr rvc, GlobalPosition3D = {}); void move(const Train *, float & trailBy); + [[nodiscard]] Location getLocation() const; [[nodiscard]] bool intersectRay(const Ray<GlobalPosition3D> &, BaryPosition &, RelativeDistance &) const override; RailVehicleClassPtr rvClass; - using LV = RailVehicleClass::LocationVertex; - BufferedLocationUpdater location; - std::array<BufferedLocationUpdater, 2> bogies; }; using RailVehiclePtr = std::unique_ptr<RailVehicle>; |