From 00f25bcce58789ad0f8082406f233de461d7ccf2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 9 Jan 2024 20:18:17 +0000
Subject: Add lights resource set and test scene

---
 test/test-assetFactory.cpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'test')

diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index c8183df..e7ba19c 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -9,6 +9,8 @@
 #include "assetFactory/object.h"
 #include "assetFactory/texturePacker.h"
 #include "game/scenary/foliage.h"
+#include "game/scenary/illuminator.h"
+#include "game/scenary/light.h"
 #include "game/scenary/plant.h"
 #include "game/vehicles/railVehicle.h"
 #include "game/vehicles/railVehicleClass.h"
@@ -125,6 +127,29 @@ BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
 	render(6000);
 }
 
+BOOST_AUTO_TEST_CASE(lights, *boost::unit_test::timeout(5))
+{
+	auto mf = AssetFactory::loadXML(RESDIR "/lights.xml");
+	BOOST_REQUIRE(mf);
+	auto rlight = mf->assets.at("r-light");
+	BOOST_REQUIRE(rlight);
+	auto rlight_f = std::dynamic_pointer_cast<Illuminator>(rlight);
+	BOOST_REQUIRE(rlight_f);
+
+	auto light1 = std::make_shared<Light>(rlight_f, Location {{0, 0, 0}, {0, 0, 0}});
+	auto light2 = std::make_shared<Light>(rlight_f, Location {{-4000, 0, 0}, {0, -1, 0}});
+	auto light3 = std::make_shared<Light>(rlight_f, Location {{-4000, -4000, 0}, {0, -3, 0}});
+	auto light4 = std::make_shared<Light>(rlight_f, Location {{3000, 4600, 0}, {0, 1, 0}});
+	objects.objects.push_back(rlight_f);
+
+	// yes I'm hacking some floor to light up as though its a bush
+	auto floorf = std::dynamic_pointer_cast<Foliage>(mf->assets.at("floor"));
+	auto floor = std::make_shared<Plant>(floorf, Location {});
+	objects.objects.push_back(floorf);
+
+	render(6000);
+}
+
 BOOST_AUTO_TEST_SUITE_END();
 
 BOOST_AUTO_TEST_CASE(loadall)
-- 
cgit v1.2.3


From 8740d30b01f6c12e2fcea0450df73736cd17dc87 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 10 Jan 2024 01:10:44 +0000
Subject: Add spot light definition, loader, and rendering

Rendering is untested, data is passed to whatever GL program is currently active.
---
 game/scenary/illuminator.cpp | 27 ++++++++++++++++++++++++---
 game/scenary/illuminator.h   | 21 ++++++++++++++++++++-
 res/lights.xml               |  1 +
 test/test-assetFactory.cpp   |  1 +
 4 files changed, 46 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp
index 4989933..43b6e4e 100644
--- a/game/scenary/illuminator.cpp
+++ b/game/scenary/illuminator.cpp
@@ -4,10 +4,18 @@
 #include "gfx/models/texture.h"
 #include "location.h"
 
+bool
+Illuminator::SpotLight::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(position) && STORE_MEMBER(direction) && STORE_MEMBER(colour) && STORE_MEMBER(kq)
+			&& STORE_MEMBER(arc);
+}
+
 bool
 Illuminator::persist(Persistence::PersistenceStore & store)
 {
-	return STORE_TYPE && STORE_HELPER(bodyMesh, Asset::MeshConstruct) && Asset::persist(store);
+	return STORE_TYPE && STORE_HELPER(bodyMesh, Asset::MeshConstruct)
+			&& STORE_HELPER(spotLight, Persistence::Appender<decltype(spotLight)>) && Asset::persist(store);
 }
 
 void
@@ -16,6 +24,14 @@ Illuminator::postLoad()
 	texture = getTexture();
 	bodyMesh->configureVAO(instanceVAO)
 			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 1);
+	VertexArrayObject {instancesSpotLightVAO}
+			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 0)
+			.addAttribs<SpotLightVertex, &SpotLightVertex::position, &SpotLightVertex::direction,
+					&SpotLightVertex::colour, &SpotLightVertex::kq, &SpotLightVertex::arc>(
+					instancesSpotLight.bufferName(), 1);
+	std::transform(spotLight.begin(), spotLight.end(), std::back_inserter(spotLightInstances), [this](const auto & s) {
+		return instancesSpotLight.acquire(*s);
+	});
 }
 
 void
@@ -34,7 +50,12 @@ void
 Illuminator::lights(const SceneShader &) const
 {
 	if (const auto count = instances.size()) {
-		// shader.pointLight.use();
-		// bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
+		if (const auto scount = instancesSpotLight.size()) {
+			// shader.pointLight.use();
+			glBindVertexArray(instancesSpotLightVAO);
+			glDrawArraysInstanced(GL_POINTS, 0, static_cast<GLsizei>(count), static_cast<GLsizei>(scount));
+		}
+
+		glBindVertexArray(0);
 	}
 }
diff --git a/game/scenary/illuminator.h b/game/scenary/illuminator.h
index db9acfb..99b87eb 100644
--- a/game/scenary/illuminator.h
+++ b/game/scenary/illuminator.h
@@ -11,11 +11,27 @@ class Texture;
 class Illuminator : public Asset, public Renderable, public StdTypeDefs<Illuminator> {
 	Mesh::Ptr bodyMesh;
 	std::shared_ptr<Texture> texture;
-	glVertexArray instanceVAO;
+	glVertexArray instanceVAO, instancesSpotLightVAO;
+
+public:
+	struct SpotLightVertex {
+		RelativePosition3D position;
+		Direction3D direction;
+		RGB colour;
+		RelativeDistance kq;
+		Angle arc;
+	};
+
+	struct SpotLight : Persistence::Persistable, SpotLightVertex, StdTypeDefs<SpotLight> {
+	private:
+		friend Persistence::SelectionPtrBase<std::shared_ptr<SpotLight>>;
+		bool persist(Persistence::PersistenceStore & store) override;
+	};
 
 public:
 	using LocationVertex = std::pair<glm::mat4, GlobalPosition3D>;
 	mutable InstanceVertices<LocationVertex> instances;
+	mutable InstanceVertices<SpotLightVertex> instancesSpotLight;
 	void render(const SceneShader &) const override;
 	void lights(const SceneShader &) const override;
 
@@ -23,4 +39,7 @@ protected:
 	friend Persistence::SelectionPtrBase<std::shared_ptr<Illuminator>>;
 	bool persist(Persistence::PersistenceStore & store) override;
 	void postLoad() override;
+
+	std::vector<SpotLight::Ptr> spotLight;
+	std::vector<InstanceVertices<SpotLightVertex>::InstanceProxy> spotLightInstances;
 };
diff --git a/res/lights.xml b/res/lights.xml
index 137137d..5c11fdf 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -6,6 +6,7 @@
       <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.05,0.05,1.5" position="0,0.1,4" rotation="1.5,0,0" colour="lightslategray"/>
     </bodyMesh>
+    <spotLight position="0,1.4,4.1" direction="0,0,-1" colour=".9,.9,.9" kq="8000" arc="1.5"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index e7ba19c..91a5321 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -49,6 +49,7 @@ public:
 	lights(const SceneShader & shader) const override
 	{
 		shader.pointLight.add({-3, 1, 5}, {1, 1, 1}, .1F);
+		objects.apply(&Renderable::lights, shader);
 	}
 
 	void
-- 
cgit v1.2.3


From b8401062e1d3f5e6554ab7fd9b983ea63cfb05c5 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 10 Jan 2024 19:04:30 +0000
Subject: Initial commit with working light instancing

---
 game/scenary/illuminator.cpp | 10 +++++-----
 gfx/gl/sceneShader.cpp       | 34 +++++-----------------------------
 gfx/gl/sceneShader.h         | 20 +-------------------
 gfx/gl/shaders/spotLight.fs  |  6 ++++--
 gfx/gl/shaders/spotLight.gs  |  6 +++---
 gfx/gl/shaders/spotLight.vs  | 20 +++++++++++++-------
 res/lights.xml               |  4 ++--
 test/test-assetFactory.cpp   |  6 +++---
 test/test-render.cpp         | 29 -----------------------------
 9 files changed, 36 insertions(+), 99 deletions(-)

(limited to 'test')

diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp
index 43b6e4e..6f51506 100644
--- a/game/scenary/illuminator.cpp
+++ b/game/scenary/illuminator.cpp
@@ -25,10 +25,10 @@ Illuminator::postLoad()
 	bodyMesh->configureVAO(instanceVAO)
 			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 1);
 	VertexArrayObject {instancesSpotLightVAO}
-			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 0)
 			.addAttribs<SpotLightVertex, &SpotLightVertex::position, &SpotLightVertex::direction,
 					&SpotLightVertex::colour, &SpotLightVertex::kq, &SpotLightVertex::arc>(
-					instancesSpotLight.bufferName(), 1);
+					instancesSpotLight.bufferName(), 0)
+			.addAttribs<LocationVertex, &LocationVertex::first, &LocationVertex::second>(instances.bufferName(), 1);
 	std::transform(spotLight.begin(), spotLight.end(), std::back_inserter(spotLightInstances), [this](const auto & s) {
 		return instancesSpotLight.acquire(*s);
 	});
@@ -47,13 +47,13 @@ Illuminator::render(const SceneShader & shader) const
 }
 
 void
-Illuminator::lights(const SceneShader &) const
+Illuminator::lights(const SceneShader & shader) const
 {
 	if (const auto count = instances.size()) {
 		if (const auto scount = instancesSpotLight.size()) {
-			// shader.pointLight.use();
+			shader.spotLightInst.use();
 			glBindVertexArray(instancesSpotLightVAO);
-			glDrawArraysInstanced(GL_POINTS, 0, static_cast<GLsizei>(count), static_cast<GLsizei>(scount));
+			glDrawArraysInstanced(GL_POINTS, 0, static_cast<GLsizei>(scount), static_cast<GLsizei>(count));
 		}
 
 		glBindVertexArray(0);
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index ccc1a1d..cdb8d2f 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -21,15 +21,15 @@
 
 SceneShader::SceneShader() :
 	basicInst {dynamicPointInst_vs, material_fs}, landmass {fixedPoint_vs, landmass_fs},
-	absolute {fixedPoint_vs, material_fs}
+	absolute {fixedPoint_vs, material_fs}, spotLightInst {spotLight_vs, spotLight_gs, spotLight_fs}
 {
 }
 
 void
 SceneShader::setViewProjection(const GlobalPosition3D & viewPoint, const glm::mat4 & viewProjection) const
 {
-	for (const auto & prog : std::array<const SceneProgram *, 7> {
-				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLight}) {
+	for (const auto & prog : std::initializer_list<const SceneProgram *> {
+				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLightInst}) {
 		prog->setViewProjection(viewPoint, viewProjection);
 	}
 }
@@ -37,8 +37,8 @@ SceneShader::setViewProjection(const GlobalPosition3D & viewPoint, const glm::ma
 void
 SceneShader::setViewPort(const ViewPort & viewPort) const
 {
-	for (const auto & prog : std::array<const SceneProgram *, 7> {
-				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLight}) {
+	for (const auto & prog : std::initializer_list<const SceneProgram *> {
+				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLightInst}) {
 		prog->setViewPort(viewPort);
 	}
 }
@@ -106,27 +106,3 @@ SceneShader::PointLightShader::add(const Position3D & position, const RGB & colo
 	glBufferData(GL_ARRAY_BUFFER, sizeof(Position3D), glm::value_ptr(position), GL_DYNAMIC_DRAW);
 	glDrawArrays(GL_POINTS, 0, 1);
 }
-
-SceneShader::SpotLightShader::SpotLightShader() :
-	SceneProgram {spotLight_vs, spotLight_gs, spotLight_fs}, directionLoc {*this, "v_direction"},
-	colourLoc {*this, "colour"}, kqLoc {*this, "kq"}, arcLoc {*this, "arc"}, viewPointLoc {*this, "viewPoint"}
-
-{
-	using v3pair = std::pair<Position3D, Direction3D>;
-	VertexArrayObject {va}.addAttribs<v3pair, &v3pair::first, &v3pair::second>(b);
-}
-
-void
-SceneShader::SpotLightShader::add(const Position3D & position, const Direction3D & direction, const RGB & colour,
-		const float kq, const float arc) const
-{
-	Program::use();
-	glBindVertexArray(va);
-	glBindBuffer(GL_ARRAY_BUFFER, b);
-	glUniform3fv(colourLoc, 1, glm::value_ptr(colour));
-	glUniform3fv(directionLoc, 1, glm::value_ptr(direction));
-	glUniform1f(kqLoc, kq);
-	glUniform1f(arcLoc, arc);
-	glBufferData(GL_ARRAY_BUFFER, sizeof(Position3D), glm::value_ptr(position), GL_DYNAMIC_DRAW);
-	glDrawArrays(GL_POINTS, 0, 1);
-}
diff --git a/gfx/gl/sceneShader.h b/gfx/gl/sceneShader.h
index 7ffaacd..7e31cb8 100644
--- a/gfx/gl/sceneShader.h
+++ b/gfx/gl/sceneShader.h
@@ -65,31 +65,13 @@ class SceneShader {
 		glBuffer b;
 	};
 
-	class SpotLightShader : public SceneProgram {
-	public:
-		SpotLightShader();
-
-		void add(const Position3D & position, const Direction3D & direction, const RGB & colour, const float kq,
-				const float arc) const;
-
-	private:
-		UniformLocation directionLoc;
-		UniformLocation colourLoc;
-		UniformLocation kqLoc;
-		UniformLocation arcLoc;
-		UniformLocation viewPointLoc;
-		glVertexArray va;
-		glBuffer b;
-	};
-
 public:
 	SceneShader();
 
 	BasicProgram basic;
 	WaterProgram water;
-	AbsolutePosProgram basicInst, landmass, absolute;
+	AbsolutePosProgram basicInst, landmass, absolute, spotLightInst;
 	PointLightShader pointLight;
-	SpotLightShader spotLight;
 
 	void setViewProjection(const GlobalPosition3D & viewPoint, const glm::mat4 & viewProjection) const;
 	void setViewPort(const ViewPort & viewPort) const;
diff --git a/gfx/gl/shaders/spotLight.fs b/gfx/gl/shaders/spotLight.fs
index 937f922..6d5d332 100644
--- a/gfx/gl/shaders/spotLight.fs
+++ b/gfx/gl/shaders/spotLight.fs
@@ -6,8 +6,10 @@ out vec3 FragColor;
 layout(binding = 0) uniform isampler2D gPosition;
 layout(binding = 1) uniform sampler2D gNormal;
 uniform ivec4 viewPort;
-uniform vec3 colour;
-uniform float kq;
+// uniform vec3 colour;
+// uniform float kq;
+const vec3 colour = vec3(1);
+const float kq = 0.01;
 in vec4 geo_centre;
 in vec4 geo_direction;
 
diff --git a/gfx/gl/shaders/spotLight.gs b/gfx/gl/shaders/spotLight.gs
index b58c169..a2805fe 100644
--- a/gfx/gl/shaders/spotLight.gs
+++ b/gfx/gl/shaders/spotLight.gs
@@ -11,9 +11,9 @@ const vec3[] pyramid = vec3[]( // four-sided
 );
 uniform mat4 viewProjection;
 uniform ivec3 viewPoint;
-uniform float arc;
-
-in vec3 position[];
+// uniform float arc;
+const float arc = 1;
+in ivec3 position[];
 in vec3 direction[];
 in float size[];
 in float cosarc[];
diff --git a/gfx/gl/shaders/spotLight.vs b/gfx/gl/shaders/spotLight.vs
index ac1d1db..a2b755d 100644
--- a/gfx/gl/shaders/spotLight.vs
+++ b/gfx/gl/shaders/spotLight.vs
@@ -1,14 +1,20 @@
 #version 330 core
 
 layout(location = 0) in vec3 v_position;
+layout(location = 1) in vec3 v_direction;
+// layout(location = 2) in vec3 colour;
+// layout(location = 3) in float kq;
+// layout(location = 4) in float arc;
+layout(location = 5) in mat4 model;
+layout(location = 9) in ivec3 modelPos;
+
+const vec3 colour = vec3(1);
+const float kq = 0.01;
+const float arc = 1;
 
-uniform vec3 v_direction;
-uniform vec3 colour;
-uniform float kq;
-uniform float arc;
 uniform ivec3 viewPoint;
 
-out vec3 position;
+out ivec3 position;
 out vec3 direction;
 out float size;
 out float cosarc;
@@ -16,8 +22,8 @@ out float cosarc;
 void
 main()
 {
-	position = v_position;
-	direction = normalize(v_direction);
+	position = modelPos + ivec3(v_position * mat3(model));
+	direction = normalize(v_direction * mat3(model));
 	size = (8000 * sqrt(max(max(colour.r, colour.g), colour.b))) / sqrt(kq);
 	cosarc = cos(arc / 2);
 	gl_Position = vec4(position - viewPoint, 0);
diff --git a/res/lights.xml b/res/lights.xml
index 5c11fdf..536afd2 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -4,9 +4,9 @@
     <bodyMesh id="body">
       <use type="cylinder" scale="0.12,0.12,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
-      <use type="cylinder" scale="0.05,0.05,1.5" position="0,0.1,4" rotation="1.5,0,0" colour="lightslategray"/>
+      <use type="cylinder" scale="0.05,0.05,1.5" position="0,-0.1,4" rotation="-1.5,0,0" colour="lightslategray"/>
     </bodyMesh>
-    <spotLight position="0,1.4,4.1" direction="0,0,-1" colour=".9,.9,.9" kq="8000" arc="1.5"/>
+    <spotLight position="0,1400,4100" direction="0,0,-1" colour=".9,.9,.9" kq="0.01" arc="1.5"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 91a5321..bc93729 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -138,9 +138,9 @@ BOOST_AUTO_TEST_CASE(lights, *boost::unit_test::timeout(5))
 	BOOST_REQUIRE(rlight_f);
 
 	auto light1 = std::make_shared<Light>(rlight_f, Location {{0, 0, 0}, {0, 0, 0}});
-	auto light2 = std::make_shared<Light>(rlight_f, Location {{-4000, 0, 0}, {0, -1, 0}});
-	auto light3 = std::make_shared<Light>(rlight_f, Location {{-4000, -4000, 0}, {0, -3, 0}});
-	auto light4 = std::make_shared<Light>(rlight_f, Location {{3000, 4600, 0}, {0, 1, 0}});
+	auto light2 = std::make_shared<Light>(rlight_f, Location {{-4000, 0, 0}, {0, 2, 0}});
+	auto light3 = std::make_shared<Light>(rlight_f, Location {{-4000, -4000, 0}, {0, 1, 0}});
+	auto light4 = std::make_shared<Light>(rlight_f, Location {{3000, 4600, 0}, {0, 3, 0}});
 	objects.objects.push_back(rlight_f);
 
 	// yes I'm hacking some floor to light up as though its a bush
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 66b4d46..47d146c 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -188,33 +188,4 @@ BOOST_AUTO_TEST_CASE(pointlight)
 	Texture::save(outImage, "/tmp/pointlight.tga");
 }
 
-BOOST_AUTO_TEST_CASE(spotlight)
-{
-	SceneRenderer ss {size, output};
-	ss.camera.setView({-10000, -10000, 60000}, glm::normalize(glm::vec3 {1, 1, -0.5F}));
-
-	class PointLightScene : public TestScene {
-	public:
-		void
-		environment(const SceneShader &, const SceneRenderer & r) const override
-		{
-			r.setAmbientLight({0.2F, 0.2F, 0.2F});
-			r.setDirectionalLight({0.2F, 0.2F, 0.2F}, west + down, *this);
-		}
-
-		void
-		lights(const SceneShader & shader) const override
-		{
-			shader.spotLight.add({50000, 50000, 15000}, down, {1.0, 1.0, 1.0}, 0.01F, 1);
-			shader.spotLight.add({51000, 59500, 1000}, north, {1.0, 1.0, 1.0}, 0.001F, .5);
-			shader.spotLight.add({53000, 59500, 1000}, north, {1.0, 1.0, 1.0}, 0.001F, .5);
-			shader.spotLight.add({60000, 50000, 3000}, north + east, {1.0, 1.0, 1.0}, 0.0001F, .7F);
-		}
-	};
-
-	const PointLightScene scene;
-	ss.render(scene);
-	Texture::save(outImage, "/tmp/spotlight.tga");
-}
-
 BOOST_AUTO_TEST_SUITE_END();
-- 
cgit v1.2.3


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 ++++++++++++++++++++
 game/scenary/illuminator.h   | 17 ++++++++++++++++-
 gfx/gl/sceneShader.cpp       | 27 ++++-----------------------
 gfx/gl/sceneShader.h         | 17 +----------------
 test/test-assetFactory.cpp   |  1 -
 test/test-render.cpp         | 30 ------------------------------
 6 files changed, 41 insertions(+), 71 deletions(-)

(limited to 'test')

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);
 	}
diff --git a/game/scenary/illuminator.h b/game/scenary/illuminator.h
index 99b87eb..a2b287d 100644
--- a/game/scenary/illuminator.h
+++ b/game/scenary/illuminator.h
@@ -11,7 +11,7 @@ class Texture;
 class Illuminator : public Asset, public Renderable, public StdTypeDefs<Illuminator> {
 	Mesh::Ptr bodyMesh;
 	std::shared_ptr<Texture> texture;
-	glVertexArray instanceVAO, instancesSpotLightVAO;
+	glVertexArray instanceVAO, instancesSpotLightVAO, instancesPointLightVAO;
 
 public:
 	struct SpotLightVertex {
@@ -22,16 +22,29 @@ public:
 		Angle arc;
 	};
 
+	struct PointLightVertex {
+		RelativePosition3D position;
+		RGB colour;
+		RelativeDistance kq;
+	};
+
 	struct SpotLight : Persistence::Persistable, SpotLightVertex, StdTypeDefs<SpotLight> {
 	private:
 		friend Persistence::SelectionPtrBase<std::shared_ptr<SpotLight>>;
 		bool persist(Persistence::PersistenceStore & store) override;
 	};
 
+	struct PointLight : Persistence::Persistable, PointLightVertex, StdTypeDefs<PointLight> {
+	private:
+		friend Persistence::SelectionPtrBase<std::shared_ptr<PointLight>>;
+		bool persist(Persistence::PersistenceStore & store) override;
+	};
+
 public:
 	using LocationVertex = std::pair<glm::mat4, GlobalPosition3D>;
 	mutable InstanceVertices<LocationVertex> instances;
 	mutable InstanceVertices<SpotLightVertex> instancesSpotLight;
+	mutable InstanceVertices<PointLightVertex> instancesPointLight;
 	void render(const SceneShader &) const override;
 	void lights(const SceneShader &) const override;
 
@@ -41,5 +54,7 @@ protected:
 	void postLoad() override;
 
 	std::vector<SpotLight::Ptr> spotLight;
+	std::vector<PointLight::Ptr> pointLight;
 	std::vector<InstanceVertices<SpotLightVertex>::InstanceProxy> spotLightInstances;
+	std::vector<InstanceVertices<PointLightVertex>::InstanceProxy> pointLightInstances;
 };
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index cdb8d2f..64bf171 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -1,5 +1,4 @@
 #include "sceneShader.h"
-#include <array>
 #include <gfx/gl/shaders/fs-landmass.h>
 #include <gfx/gl/shaders/fs-material.h>
 #include <gfx/gl/shaders/fs-pointLight.h>
@@ -21,7 +20,8 @@
 
 SceneShader::SceneShader() :
 	basicInst {dynamicPointInst_vs, material_fs}, landmass {fixedPoint_vs, landmass_fs},
-	absolute {fixedPoint_vs, material_fs}, spotLightInst {spotLight_vs, spotLight_gs, spotLight_fs}
+	absolute {fixedPoint_vs, material_fs}, spotLightInst {spotLight_vs, spotLight_gs, spotLight_fs},
+	pointLightInst {pointLight_vs, pointLight_gs, pointLight_fs}
 {
 }
 
@@ -29,7 +29,7 @@ void
 SceneShader::setViewProjection(const GlobalPosition3D & viewPoint, const glm::mat4 & viewProjection) const
 {
 	for (const auto & prog : std::initializer_list<const SceneProgram *> {
-				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLightInst}) {
+				 &basic, &basicInst, &water, &landmass, &absolute, &pointLightInst, &spotLightInst}) {
 		prog->setViewProjection(viewPoint, viewProjection);
 	}
 }
@@ -38,7 +38,7 @@ void
 SceneShader::setViewPort(const ViewPort & viewPort) const
 {
 	for (const auto & prog : std::initializer_list<const SceneProgram *> {
-				 &basic, &basicInst, &water, &landmass, &absolute, &pointLight, &spotLightInst}) {
+				 &basic, &basicInst, &water, &landmass, &absolute, &pointLightInst, &spotLightInst}) {
 		prog->setViewPort(viewPort);
 	}
 }
@@ -87,22 +87,3 @@ SceneShader::WaterProgram::use(float waveCycle) const
 	Program::use();
 	glUniform1f(waveLoc, waveCycle);
 }
-
-SceneShader::PointLightShader::PointLightShader() :
-	SceneProgram {pointLight_vs, pointLight_gs, pointLight_fs}, colourLoc {*this, "colour"}, kqLoc {*this, "kq"},
-	viewPointLoc {*this, "viewPoint"}
-{
-	VertexArrayObject {va}.addAttribs<Position3D>(b);
-}
-
-void
-SceneShader::PointLightShader::add(const Position3D & position, const RGB & colour, const float kq) const
-{
-	Program::use();
-	glBindVertexArray(va);
-	glBindBuffer(GL_ARRAY_BUFFER, b);
-	glUniform3fv(colourLoc, 1, glm::value_ptr(colour));
-	glUniform1f(kqLoc, kq);
-	glBufferData(GL_ARRAY_BUFFER, sizeof(Position3D), glm::value_ptr(position), GL_DYNAMIC_DRAW);
-	glDrawArrays(GL_POINTS, 0, 1);
-}
diff --git a/gfx/gl/sceneShader.h b/gfx/gl/sceneShader.h
index 7e31cb8..813c1bf 100644
--- a/gfx/gl/sceneShader.h
+++ b/gfx/gl/sceneShader.h
@@ -51,27 +51,12 @@ class SceneShader {
 		RequiredUniformLocation waveLoc;
 	};
 
-	class PointLightShader : public SceneProgram {
-	public:
-		PointLightShader();
-
-		void add(const Position3D & position, const RGB & colour, const float kq) const;
-
-	private:
-		UniformLocation colourLoc;
-		UniformLocation kqLoc;
-		UniformLocation viewPointLoc;
-		glVertexArray va;
-		glBuffer b;
-	};
-
 public:
 	SceneShader();
 
 	BasicProgram basic;
 	WaterProgram water;
-	AbsolutePosProgram basicInst, landmass, absolute, spotLightInst;
-	PointLightShader pointLight;
+	AbsolutePosProgram basicInst, landmass, absolute, spotLightInst, pointLightInst;
 
 	void setViewProjection(const GlobalPosition3D & viewPoint, const glm::mat4 & viewProjection) const;
 	void setViewPort(const ViewPort & viewPort) const;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index bc93729..9e278c4 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -48,7 +48,6 @@ public:
 	void
 	lights(const SceneShader & shader) const override
 	{
-		shader.pointLight.add({-3, 1, 5}, {1, 1, 1}, .1F);
 		objects.apply(&Renderable::lights, shader);
 	}
 
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 47d146c..41731dd 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -158,34 +158,4 @@ BOOST_AUTO_TEST_CASE(terrain)
 	Texture::save(outImage, "/tmp/terrain.tga");
 }
 
-BOOST_AUTO_TEST_CASE(pointlight)
-{
-	SceneRenderer ss {size, output};
-	ss.camera.setView({-10000, -10000, 60000}, glm::normalize(glm::vec3 {1, 1, -0.5F}));
-
-	class PointLightScene : public TestScene {
-	public:
-		void
-		environment(const SceneShader &, const SceneRenderer & r) const override
-		{
-			r.setAmbientLight({0.2F, 0.2F, 0.2F});
-			r.setDirectionalLight({0.2F, 0.2F, 0.2F}, west + down, *this);
-		}
-
-		void
-		lights(const SceneShader & shader) const override
-		{
-			for (int x = 50000; x < 100000; x += 20000) {
-				for (int y = 50000; y < 2000000; y += 20000) {
-					shader.pointLight.add({x, y, 4000}, {1.0, 1.0, 1.0}, 0.1F);
-				}
-			}
-		}
-	};
-
-	const PointLightScene scene;
-	ss.render(scene);
-	Texture::save(outImage, "/tmp/pointlight.tga");
-}
-
 BOOST_AUTO_TEST_SUITE_END();
-- 
cgit v1.2.3


From 48a5de8943bda62ba5caefe3b64c66a0d9024dff Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 13 Jan 2024 10:05:58 +0000
Subject: Add old street lamp model

---
 res/lights.xml             | 10 ++++++++++
 test/test-assetFactory.cpp |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/res/lights.xml b/res/lights.xml
index 6c051c3..8b25599 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -9,6 +9,16 @@
     </bodyMesh>
     <spotLight position="0,1400,4100" direction="0,0.1,-1" colour=".9,.9,.9" kq="0.3" arc="1.8"/>
   </asset>
+  <asset p.typeid="Illuminator" id="old-lamp" name="old-lamp">
+    <bodyMesh id="body">
+      <use type="cylinder" scale="0.13,0.13,.5" colour="#222222"/>
+      <use type="cylinder" scale="0.06,0.06,1.5" position="0,0,.5" colour="#222222"/>
+      <use type="cuboid" scale="0.3,0.02,0.02" position="0,0,1.8" colour="#222222"/>
+      <use type="cuboid" scale="0.2,0.2,0.4" position="0,0,2" colour="#dddddd"/>
+      <use type="cuboid" scale="0.1,0.1,0.1" position="0,0,2.4" colour="#222222"/>
+    </bodyMesh>
+    <pointLight position="0,0,2200" colour=".9,.9,.6" kq="0.3"/>
+  </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
     <bodyMesh id="body">
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 9e278c4..8341fbf 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -133,14 +133,19 @@ BOOST_AUTO_TEST_CASE(lights, *boost::unit_test::timeout(5))
 	BOOST_REQUIRE(mf);
 	auto rlight = mf->assets.at("r-light");
 	BOOST_REQUIRE(rlight);
+	auto oldlamp = mf->assets.at("old-lamp");
+	BOOST_REQUIRE(oldlamp);
 	auto rlight_f = std::dynamic_pointer_cast<Illuminator>(rlight);
 	BOOST_REQUIRE(rlight_f);
+	auto oldlamp_f = std::dynamic_pointer_cast<Illuminator>(oldlamp);
+	BOOST_REQUIRE(oldlamp_f);
 
-	auto light1 = std::make_shared<Light>(rlight_f, Location {{0, 0, 0}, {0, 0, 0}});
+	auto light1 = std::make_shared<Light>(oldlamp_f, Location {{0, 0, 0}, {0, 0, 0}});
 	auto light2 = std::make_shared<Light>(rlight_f, Location {{-4000, 0, 0}, {0, 2, 0}});
 	auto light3 = std::make_shared<Light>(rlight_f, Location {{-4000, -4000, 0}, {0, 1, 0}});
-	auto light4 = std::make_shared<Light>(rlight_f, Location {{3000, 4600, 0}, {0, 3, 0}});
+	auto light4 = std::make_shared<Light>(oldlamp_f, Location {{3000, 4600, 0}, {0, 2, 0}});
 	objects.objects.push_back(rlight_f);
+	objects.objects.push_back(oldlamp_f);
 
 	// yes I'm hacking some floor to light up as though its a bush
 	auto floorf = std::dynamic_pointer_cast<Foliage>(mf->assets.at("floor"));
-- 
cgit v1.2.3