From 51eb25ea0f1373ca0442b02049406af38eae3b33 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 12 Jan 2024 19:35:58 +0000
Subject: Add model support for point lights

Still invokes non-instanced point light shader
---
 game/scenary/illuminator.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp
index 6f51506..3de4e52 100644
--- a/game/scenary/illuminator.cpp
+++ b/game/scenary/illuminator.cpp
@@ -11,10 +11,17 @@ Illuminator::SpotLight::persist(Persistence::PersistenceStore & store)
 			&& STORE_MEMBER(arc);
 }
 
+bool
+Illuminator::PointLight::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(position) && STORE_MEMBER(colour) && STORE_MEMBER(kq);
+}
+
 bool
 Illuminator::persist(Persistence::PersistenceStore & store)
 {
 	return STORE_TYPE && STORE_HELPER(bodyMesh, Asset::MeshConstruct)
+			&& STORE_HELPER(pointLight, Persistence::Appender<decltype(pointLight)>)
 			&& STORE_HELPER(spotLight, Persistence::Appender<decltype(spotLight)>) && Asset::persist(store);
 }
 
@@ -32,6 +39,14 @@ Illuminator::postLoad()
 	std::transform(spotLight.begin(), spotLight.end(), std::back_inserter(spotLightInstances), [this](const auto & s) {
 		return instancesSpotLight.acquire(*s);
 	});
+	VertexArrayObject {instancesPointLightVAO}
+			.addAttribs<PointLightVertex, &PointLightVertex::position, &PointLightVertex::colour,
+					&PointLightVertex::kq>(instancesPointLight.bufferName(), 0)
+			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 1);
+	std::transform(
+			pointLight.begin(), pointLight.end(), std::back_inserter(pointLightInstances), [this](const auto & s) {
+				return instancesPointLight.acquire(*s);
+			});
 }
 
 void
@@ -55,6 +70,11 @@ Illuminator::lights(const SceneShader & shader) const
 			glBindVertexArray(instancesSpotLightVAO);
 			glDrawArraysInstanced(GL_POINTS, 0, static_cast<GLsizei>(scount), static_cast<GLsizei>(count));
 		}
+		if (const auto pcount = instancesPointLight.size()) {
+			shader.pointLightInst.use();
+			glBindVertexArray(instancesPointLightVAO);
+			glDrawArraysInstanced(GL_POINTS, 0, static_cast<GLsizei>(pcount), static_cast<GLsizei>(count));
+		}
 
 		glBindVertexArray(0);
 	}
-- 
cgit v1.2.3