From c977c02ba3a6ad6ada3f1a458b41a77f2be2b871 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 1 May 2023 21:29:01 +0100
Subject: Refactor InstanceVertices in terms of glContainer

---
 game/vehicles/railVehicleClass.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'game/vehicles/railVehicleClass.cpp')

diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 64a21be..148081f 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -46,26 +46,24 @@ RailVehicleClass::postLoad()
 void
 RailVehicleClass::render(const SceneShader & shader) const
 {
-	if (const auto count = instancesBody.count()) {
+	if (const auto count = instancesBody.size()) {
 		if (texture) {
 			texture->bind();
 		}
 		shader.basicInst.use();
 		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
-		bogies.front()->DrawInstanced(
-				instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().count()));
-		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().count()));
+		bogies.front()->DrawInstanced(instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().size()));
+		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().size()));
 	}
 }
 
 void
 RailVehicleClass::shadows(const ShadowMapper & mapper) const
 {
-	if (const auto count = instancesBody.count()) {
+	if (const auto count = instancesBody.size()) {
 		mapper.dynamicPointInst.use();
 		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
-		bogies.front()->DrawInstanced(
-				instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().count()));
-		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().count()));
+		bogies.front()->DrawInstanced(instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().size()));
+		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().size()));
 	}
 }
-- 
cgit v1.2.3


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/railVehicleClass.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'game/vehicles/railVehicleClass.cpp')

diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 148081f..324148c 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -4,6 +4,7 @@
 #include "gfx/gl/vertexArrayObject.h"
 #include "gfx/models/mesh.h"
 #include "gfx/models/texture.h"
+#include "stream_support.h"
 #include <algorithm>
 #include <array>
 #include <cache.h>
@@ -34,36 +35,36 @@ void
 RailVehicleClass::postLoad()
 {
 	texture = getTexture();
-	bodyMesh->configureVAO(instanceVAO).addAttribs<glm::mat4>(instancesBody.bufferName(), 1);
+	bodyMesh->configureVAO(instanceVAO).addAttribs<LocationVertex, &LocationVertex::body>(instances.bufferName(), 1);
 	bogies.front()
 			->configureVAO(instancesBogiesVAO.front())
-			.addAttribs<glm::mat4>(instancesBogies.front().bufferName(), 1);
+			.addAttribs<LocationVertex, &LocationVertex::front>(instances.bufferName(), 1);
 	bogies.back()
 			->configureVAO(instancesBogiesVAO.back())
-			.addAttribs<glm::mat4>(instancesBogies.back().bufferName(), 1);
+			.addAttribs<LocationVertex, &LocationVertex::back>(instances.bufferName(), 1);
 }
 
 void
 RailVehicleClass::render(const SceneShader & shader) const
 {
-	if (const auto count = instancesBody.size()) {
+	if (const auto count = static_cast<GLsizei>(instances.size())) {
 		if (texture) {
 			texture->bind();
 		}
 		shader.basicInst.use();
-		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
-		bogies.front()->DrawInstanced(instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().size()));
-		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().size()));
+		bodyMesh->DrawInstanced(instanceVAO, count);
+		bogies.front()->DrawInstanced(instancesBogiesVAO.front(), count);
+		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), count);
 	}
 }
 
 void
 RailVehicleClass::shadows(const ShadowMapper & mapper) const
 {
-	if (const auto count = instancesBody.size()) {
+	if (const auto count = static_cast<GLsizei>(instances.size())) {
 		mapper.dynamicPointInst.use();
-		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
-		bogies.front()->DrawInstanced(instancesBogiesVAO.front(), static_cast<GLsizei>(instancesBogies.front().size()));
-		bogies.back()->DrawInstanced(instancesBogiesVAO.back(), static_cast<GLsizei>(instancesBogies.back().size()));
+		bodyMesh->DrawInstanced(instanceVAO, count);
+		bogies.front()->DrawInstanced(instanceVAO, count);
+		bogies.back()->DrawInstanced(instanceVAO, count);
 	}
 }
-- 
cgit v1.2.3