diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 18:02:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 18:02:56 +0000 |
| commit | 509c955aac687a6e8daa80906d593cb24f83c64d (patch) | |
| tree | 0b551c1a26a2c08973e9dcf298f9da286687fc20 /game/network/rail.h | |
| parent | Merge branch 'template-types' (diff) | |
| parent | Simplify find_arcs_radius (diff) | |
| download | ilt-509c955aac687a6e8daa80906d593cb24f83c64d.tar.bz2 ilt-509c955aac687a6e8daa80906d593cb24f83c64d.tar.xz ilt-509c955aac687a6e8daa80906d593cb24f83c64d.zip | |
Merge branch 'global-network'
Diffstat (limited to 'game/network/rail.h')
| -rw-r--r-- | game/network/rail.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/game/network/rail.h b/game/network/rail.h index 4a1932f..986b0aa 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -32,7 +32,7 @@ public: NO_MOVE(RailLink); protected: - [[nodiscard]] Position3D vehiclePositionOffset() const override; + [[nodiscard]] RelativePosition3D vehiclePositionOffset() const override; [[nodiscard]] static Mesh::Ptr defaultMesh(const std::span<Vertex> vertices); Mesh::Ptr mesh; @@ -45,22 +45,22 @@ public: RailLinkStraight(const Node::Ptr &, const Node::Ptr &); private: - RailLinkStraight(Node::Ptr, Node::Ptr, const Position3D & diff); + RailLinkStraight(Node::Ptr, Node::Ptr, const RelativePosition3D & diff); }; class RailLinkCurve : public RailLink, public LinkCurve { public: - RailLinkCurve(const Node::Ptr &, const Node::Ptr &, Position2D); + RailLinkCurve(const Node::Ptr &, const Node::Ptr &, GlobalPosition2D); private: - RailLinkCurve(const Node::Ptr &, const Node::Ptr &, Position3D, const Arc); + RailLinkCurve(const Node::Ptr &, const Node::Ptr &, GlobalPosition3D, const Arc); }; class RailLinks : public NetworkOf<RailLink>, public WorldObject { public: RailLinks(); - std::shared_ptr<RailLink> addLinksBetween(Position3D start, Position3D end); + std::shared_ptr<RailLink> addLinksBetween(GlobalPosition3D start, GlobalPosition3D end); private: void tick(TickDuration elapsed) override; |