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.

1 files changed, 7 insertions, 5 deletions

diff --git a/game/network/rail.h b/game/network/rail.h
index 611eb67..4a1932f 100644
--- a/game/network/rail.h
+++ b/game/network/rail.h
@@ -18,6 +18,7 @@ struct Arc;
 // A piece of rail track
 class RailLinkStraight;
 class RailLinkCurve;
+
 class RailLink : public virtual Link, public Renderable {
 public:
 	RailLink() = default;
@@ -31,11 +32,12 @@ public:
 	NO_MOVE(RailLink);
 
 protected:
-	[[nodiscard]] glm::vec3 vehiclePositionOffset() const override;
+	[[nodiscard]] Position3D vehiclePositionOffset() const override;
 	[[nodiscard]] static Mesh::Ptr defaultMesh(const std::span<Vertex> vertices);
 
 	Mesh::Ptr mesh;
 };
+
 RailLink::~RailLink() = default;
 
 class RailLinkStraight : public RailLink, public LinkStraight {
@@ -43,22 +45,22 @@ public:
 	RailLinkStraight(const Node::Ptr &, const Node::Ptr &);
 
 private:
-	RailLinkStraight(Node::Ptr, Node::Ptr, const glm::vec3 & diff);
+	RailLinkStraight(Node::Ptr, Node::Ptr, const Position3D & diff);
 };
 
 class RailLinkCurve : public RailLink, public LinkCurve {
 public:
-	RailLinkCurve(const Node::Ptr &, const Node::Ptr &, glm::vec2);
+	RailLinkCurve(const Node::Ptr &, const Node::Ptr &, Position2D);
 
 private:
-	RailLinkCurve(const Node::Ptr &, const Node::Ptr &, glm::vec3, const Arc);
+	RailLinkCurve(const Node::Ptr &, const Node::Ptr &, Position3D, const Arc);
 };
 
 class RailLinks : public NetworkOf<RailLink>, public WorldObject {
 public:
 	RailLinks();
 
-	std::shared_ptr<RailLink> addLinksBetween(glm::vec3 start, glm::vec3 end);
+	std::shared_ptr<RailLink> addLinksBetween(Position3D start, Position3D end);
 
 private:
 	void tick(TickDuration elapsed) override;