From 72ab29786f6d4c97a92cb95c75091537490e2d0f Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 6 May 2023 16:42:08 +0100
Subject: Templated BufferedLocation and single buffer storage for RVC
 locations

---
 game/vehicles/railVehicle.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'game/vehicles/railVehicle.h')

diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h
index 247bf66..f34643e 100644
--- a/game/vehicles/railVehicle.h
+++ b/game/vehicles/railVehicle.h
@@ -8,12 +8,10 @@
 #include <memory>
 #include <utility>
 
-class SceneShader;
-class ShadowMapper;
 class Ray;
-
 class Train;
-class RailVehicle : Selectable {
+
+class RailVehicle : Selectable, RailVehicleClass::Instance {
 public:
 	explicit RailVehicle(RailVehicleClassPtr rvc);
 
@@ -22,7 +20,9 @@ public:
 	[[nodiscard]] bool intersectRay(const Ray &, glm::vec2 *, float *) const override;
 
 	RailVehicleClassPtr rvClass;
-	BufferedLocation location;
-	std::array<BufferedLocation, 2> bogies;
+	using LV = RailVehicleClass::LocationVertex;
+	using BLocation = BufferedLocationT<glm::mat4 LV::*, RailVehicleClass::Instance &>;
+	BLocation location;
+	std::array<BLocation, 2> bogies;
 };
 using RailVehiclePtr = std::unique_ptr<RailVehicle>;
-- 
cgit v1.2.3