Use a single buffer for the location/rotation data of all renderable objects

Removes the BufferedLocation and BufferedLocationUpdater mess.
Note: appears to break bogie rendering in asset factory test only, same
symptom as broken network render test? (out of date buffer data)

1 files changed, 6 insertions, 6 deletions

diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h
index c599649..f424ffc 100644
--- a/game/scenary/foliage.h
+++ b/game/scenary/foliage.h
@@ -18,13 +18,13 @@ class Foliage : public Asset, public Renderable, public StdTypeDefs<Foliage> {
 public:
 	[[nodiscard]] std::any createAt(const Location &) const override;
 
-	struct LocationVertex {
-		glm::mat3 rotation;
-		float yaw;
-		GlobalPosition3D position;
+	struct InstanceVertex {
+		CommonLocationInstance location;
+		// float scale;
+		// something colorBias;
 	};
 
-	mutable InstanceVertices<LocationVertex> instances;
+	mutable InstanceVertices<InstanceVertex> instances;
 	void preFrame(const Frustum &, const Frustum &) override;
 	void render(const SceneShader &, const Frustum &) const override;
 	void shadows(const ShadowMapper &, const Frustum &) const override;
@@ -43,5 +43,5 @@ protected:
 	glTextures<GL_TEXTURE_2D_ARRAY, 3> billboard;
 
 private:
-	InstanceVertices<Foliage::LocationVertex>::PartitionResult instancePartitions;
+	InstanceVertices<InstanceVertex>::PartitionResult instancePartitions;
 };