From fb78c88576d9fed90ee69dfa35a9fbd3179ff486 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan.goodliffe@octal.co.uk>
Date: Mon, 30 Mar 2026 13:04:36 +0100
Subject: 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)
---
 game/scenary/illuminator.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'game/scenary/illuminator.cpp')

diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp
index 4398853..e991baa 100644
--- a/game/scenary/illuminator.cpp
+++ b/game/scenary/illuminator.cpp
@@ -11,8 +11,8 @@ std::weak_ptr<glVertexArray> Illuminator::commonInstanceVAO, Illuminator::common
 std::any
 Illuminator::createAt(const Location & position) const
 {
-	return std::make_shared<InstanceVertices<LocationVertex>::InstanceProxy>(
-			instances.acquire(position.getRotationTransform(), position.pos));
+	return std::make_shared<InstanceVertices<InstanceVertex>::InstanceProxy>(
+			instances.acquire(locationData->acquire(position)));
 }
 
 bool
@@ -46,8 +46,7 @@ Illuminator::postLoad()
 	glDebugScope _ {0};
 	if (!(instanceVAO = commonInstanceVAO.lock())) {
 		commonInstanceVAO = instanceVAO = std::make_shared<glVertexArray>();
-		bodyMesh->configureVAO(*instanceVAO, 0)
-				.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(1);
+		bodyMesh->configureVAO(*instanceVAO, 0).addAttribs<InstanceVertex, &InstanceVertex::location>(1);
 	}
 	if (!spotLight.empty()) {
 		if (!(instancesSpotLightVAO = commonInstancesSpotLightVAO.lock())) {
@@ -55,7 +54,7 @@ Illuminator::postLoad()
 			instancesSpotLightVAO->configure()
 					.addAttribs<SpotLightVertex, &SpotLightVertex::position, &SpotLightVertex::direction,
 							&SpotLightVertex::colour, &SpotLightVertex::kq, &SpotLightVertex::arc>(0)
-					.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(1);
+					.addAttribs<InstanceVertex, &InstanceVertex::location>(1);
 		}
 		std::transform(
 				spotLight.begin(), spotLight.end(), std::back_inserter(spotLightInstances), [this](const auto & s) {
@@ -68,7 +67,7 @@ Illuminator::postLoad()
 			instancesPointLightVAO->configure()
 					.addAttribs<PointLightVertex, &PointLightVertex::position, &PointLightVertex::colour,
 							&PointLightVertex::kq>(0)
-					.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(1);
+					.addAttribs<InstanceVertex, &InstanceVertex::location>(1);
 		}
 		std::transform(
 				pointLight.begin(), pointLight.end(), std::back_inserter(pointLightInstances), [this](const auto & s) {
-- 
cgit v1.3