4 files changed, 27 insertions, 7 deletions
diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp
index 59d1e83..4a0a22d 100644
--- a/game/vehicles/railVehicle.cpp
+++ b/game/vehicles/railVehicle.cpp
@@ -72,7 +72,12 @@ RailVehicle::intersectRay(const Ray<GlobalPosition3D> & ray, BaryPosition & bary
 	}};
 	return std::any_of(
 			triangles.begin(), triangles.end(), [&cornerVertices, &ray, &baryPos, &distance](const auto & idx) {
-				return ray.intersectTriangle(
-						cornerVertices[idx[0]], cornerVertices[idx[1]], cornerVertices[idx[2]], baryPos, distance);
+				if (const auto inter = ray.intersectTriangle(
+							cornerVertices[idx[0]], cornerVertices[idx[1]], cornerVertices[idx[2]])) {
+					baryPos = inter->bary;
+					distance = inter->distance;
+					return true;
+				};
+				return false;
 			});
 }
diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 34c1359..21f01c8 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -17,6 +17,19 @@ RailVehicleClass::persist(Persistence::PersistenceStore & store)
 			&& STORE_HELPER(bodyMesh, Asset::MeshConstruct) && Asset::persist(store);
 }
 
+std::any
+RailVehicleClass::createAt(const Location & position) const
+{
+	return std::make_shared<InstanceVertices<LocationVertex>::InstanceProxy>(instances.acquire(LocationVertex {
+			.body = position.getRotationTransform(),
+			.front = position.getRotationTransform(),
+			.back = position.getRotationTransform(),
+			.bodyPos = position.pos,
+			.frontPos = {sincos(position.rot.x) * wheelBase * 0.5F, position.pos.z},
+			.backPos = {sincos(position.rot.x) * wheelBase * -0.5F, position.pos.z},
+	}));
+}
+
 void
 RailVehicleClass::postLoad()
 {
@@ -33,7 +46,7 @@ RailVehicleClass::postLoad()
 }
 
 void
-RailVehicleClass::render(const SceneShader & shader) const
+RailVehicleClass::render(const SceneShader & shader, const Frustum &) const
 {
 	if (const auto count = static_cast<GLsizei>(instances.size())) {
 		if (texture) {
@@ -47,7 +60,7 @@ RailVehicleClass::render(const SceneShader & shader) const
 }
 
 void
-RailVehicleClass::shadows(const ShadowMapper & mapper) const
+RailVehicleClass::shadows(const ShadowMapper & mapper, const Frustum &) const
 {
 	if (const auto count = static_cast<GLsizei>(instances.size())) {
 		mapper.dynamicPointInst.use();
diff --git a/game/vehicles/railVehicleClass.h b/game/vehicles/railVehicleClass.h
index 88f08c5..ccff3e2 100644
--- a/game/vehicles/railVehicleClass.h
+++ b/game/vehicles/railVehicleClass.h
@@ -14,8 +14,10 @@ class Location;
 
 class RailVehicleClass : public Renderable, public Asset {
 public:
-	void render(const SceneShader & shader) const override;
-	void shadows(const ShadowMapper & shadowMapper) const override;
+	void render(const SceneShader & shader, const Frustum &) const override;
+	void shadows(const ShadowMapper & shadowMapper, const Frustum &) const override;
+
+	[[nodiscard]] std::any createAt(const Location &) const override;
 
 	struct LocationVertex {
 		glm::mat3 body, front, back;
diff --git a/game/vehicles/train.h b/game/vehicles/train.h
index 4933347..88e30f9 100644
--- a/game/vehicles/train.h
+++ b/game/vehicles/train.h
@@ -15,7 +15,7 @@ class SceneShader;
 class ShadowMapper;
 template<typename> class Ray;
 
-class Train : public Vehicle, public Collection<RailVehicle, false>, public Can<Go>, public Can<Idle> {
+class Train : public Vehicle, public UniqueCollection<RailVehicle>, public Can<Go>, public Can<Idle> {
 public:
 	explicit Train(const Link::CPtr & link, float linkDist = 0) : Vehicle {link, linkDist} { }