Merge branch 'instancing-pt2'

1 files changed, 4 insertions, 8 deletions

diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h
index bbf4df9..247bf66 100644
--- a/game/vehicles/railVehicle.h
+++ b/game/vehicles/railVehicle.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "gfx/renderable.h"
+#include "gfx/gl/bufferedLocation.h"
 #include "railVehicleClass.h"
 #include <array>
 #include <game/selectable.h>
 #include <glm/glm.hpp>
-#include <location.hpp>
 #include <memory>
 #include <utility>
 
@@ -14,19 +13,16 @@ class ShadowMapper;
 class Ray;
 
 class Train;
-class RailVehicle : public Renderable, Selectable {
+class RailVehicle : Selectable {
 public:
 	explicit RailVehicle(RailVehicleClassPtr rvc);
 
 	void move(const Train *, float & trailBy);
 
-	void render(const SceneShader & shader) const override;
-	void shadows(const ShadowMapper & shadowMapper) const override;
 	[[nodiscard]] bool intersectRay(const Ray &, glm::vec2 *, float *) const override;
 
-	Location location;
-
 	RailVehicleClassPtr rvClass;
-	std::array<Location, 2> bogies;
+	BufferedLocation location;
+	std::array<BufferedLocation, 2> bogies;
 };
 using RailVehiclePtr = std::unique_ptr<RailVehicle>;