Improve Terrain::generateMeshes performanceHEADmain

Creates mesh per surface based on a single buffer of all vertices and a collection of per surfuce indices.
Makes ColourBias a uniform instead of a vertex attribute.

4 files changed, 24 insertions, 10 deletions

diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index 571538a..4b82ae4 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -34,9 +34,9 @@ SceneShader::allPrograms(auto member, auto &&... ps) const
 }
 
 SceneShader::SceneShader() :
-	basicInst {dynamicPointInst_vs, material_fs}, landmass {landmass_vs, landmass_fs},
-	absolute {fixedPoint_vs, material_fs}, spotLightInst {spotLight_vs, spotLight_gs, spotLight_fs},
-	pointLightInst {pointLight_vs, pointLight_gs, pointLight_fs},
+	basicInst {dynamicPointInst_vs, material_fs}, absolute {fixedPoint_vs, material_fs},
+	spotLightInst {spotLight_vs, spotLight_gs, spotLight_fs},
+	pointLightInst {pointLight_vs, pointLight_gs, pointLight_fs}, landmass {landmass_vs, landmass_fs},
 	networkStraight {networkStraight_vs, networkStraight_gs, network_fs},
 	networkCurve {networkCurve_vs, networkCurve_gs, network_fs}
 {
@@ -88,6 +88,13 @@ SceneShader::BasicProgram::use(Location const & location) const
 }
 
 void
+SceneShader::LandmassProgram::use(const glm::vec3 colourBias) const
+{
+	Program::use();
+	glUniform(colourBiasLos, colourBias);
+}
+
+void
 SceneShader::NetworkProgram::use(
 		const std::span<const glm::vec3> profile, const std::span<const float> texturePos) const
 {
diff --git a/gfx/gl/sceneShader.h b/gfx/gl/sceneShader.h
index 51f0e21..47d4397 100644
--- a/gfx/gl/sceneShader.h
+++ b/gfx/gl/sceneShader.h
@@ -50,6 +50,15 @@ class SceneShader {
 		RequiredUniformLocation profileLengthLoc {*this, "profileLength"};
 	};
 
+	class LandmassProgram : public AbsolutePosProgram {
+	public:
+		using AbsolutePosProgram::AbsolutePosProgram;
+		void use(const glm::vec3) const;
+
+	private:
+		RequiredUniformLocation colourBiasLos {*this, "colourBias"};
+	};
+
 	class WaterProgram : public SceneProgram {
 	public:
 		WaterProgram();
@@ -64,7 +73,8 @@ public:
 
 	BasicProgram basic;
 	WaterProgram water;
-	AbsolutePosProgram basicInst, landmass, absolute, spotLightInst, pointLightInst;
+	AbsolutePosProgram basicInst, absolute, spotLightInst, pointLightInst;
+	LandmassProgram landmass;
 	NetworkProgram networkStraight, networkCurve;
 
 	void setViewProjection(const GlobalPosition3D & viewPoint, const glm::mat4 & viewProjection) const;
diff --git a/gfx/gl/shaders/landmass.fs b/gfx/gl/shaders/landmass.fs
index 55e3c24..382260e 100644
--- a/gfx/gl/shaders/landmass.fs
+++ b/gfx/gl/shaders/landmass.fs
@@ -3,10 +3,10 @@
 include(`materialOut.glsl')
 in vec3 FragPos;
 in vec3 Normal;
-flat in vec3 ColourBias;
 
 uniform sampler2D texture0;
 uniform ivec3 viewPoint;
+uniform vec3 colourBias;
 
 const vec3 grass = vec3(.1, .4, .05);
 const vec3 slope = vec3(.6, .6, .4);
@@ -35,8 +35,8 @@ main()
 	vec3 color = texture(texture0, vec2(position.xy % 10000) / 10000.0).rgb;
 
 	int height = position.z;
-	if (ColourBias.r >= 0) {
-		color *= ColourBias;
+	if (colourBias.r >= 0) {
+		color *= colourBias;
 	}
 	else if (height < beachline) { // Sandy beach
 		color *= sand;
diff --git a/gfx/gl/shaders/landmass.vs b/gfx/gl/shaders/landmass.vs
index 9617cb9..44cb879 100644
--- a/gfx/gl/shaders/landmass.vs
+++ b/gfx/gl/shaders/landmass.vs
@@ -3,11 +3,9 @@
 
 layout(location = 0) in ivec3 position;
 layout(location = 1) in vec3 normal;
-layout(location = 2) in vec3 colourBias;
 
 out vec3 FragPos;
 out vec3 Normal;
-flat out vec3 ColourBias;
 
 uniform mat4 viewProjection;
 uniform ivec3 viewPoint;
@@ -17,7 +15,6 @@ main()
 {
 	FragPos = position - viewPoint;
 	Normal = normal;
-	ColourBias = colourBias;
 
 	gl_Position = viewProjection * vec4(FragPos, 1);
 }