12 files changed, 156 insertions, 49 deletions
diff --git a/gfx/gl/shaders/directionalLight.fs b/gfx/gl/shaders/directionalLight.fs
index 86447ec..cdf0389 100644
--- a/gfx/gl/shaders/directionalLight.fs
+++ b/gfx/gl/shaders/directionalLight.fs
@@ -17,24 +17,35 @@ uniform ivec3 lightPoint;
 uniform mat4 lightViewProjection[MAX_MAPS];
 uniform uint lightViewProjectionCount;
 
-const vec3 e1 = vec3(0, 0, 0), e2 = vec3(1, 1, 1);
+float
+getShadow(vec3 positionInLightSpace, float m, vec2 texelSize)
+{
+	float shadow = 0.0;
+	for (float x = -texelSize.x; x <= texelSize.x; x += texelSize.x) {
+		for (float y = -texelSize.y; y <= texelSize.y; y += texelSize.y) {
+			const float lightSpaceDepth = texture(shadowMap, vec3(positionInLightSpace.xy + vec2(x, y), m)).r;
+			shadow += step(positionInLightSpace.z, lightSpaceDepth + 0.001);
+		}
+	}
+	return shadow / 9.0;
+}
 
 float
-insideShadowCube(vec3 v)
+insideShadowCube(vec3 v, vec2 texelSize)
 {
-	const vec3 s = step(e1, v) - step(e2, v);
+	const vec3 s = step(vec3(texelSize, 0), v) - step(vec3(1 - texelSize, 1), v);
 	return s.x * s.y * s.z;
 }
 
 float
 isShaded(vec4 Position)
 {
+	const vec2 texelSize = 1.0 / textureSize(shadowMap, 0).xy;
 	for (uint m = 0u; m < lightViewProjectionCount; m++) {
-		const vec3 PositionInLightSpace = (lightViewProjection[m] * Position).xyz;
-		const float inside = insideShadowCube(PositionInLightSpace);
+		const vec3 positionInLightSpace = (lightViewProjection[m] * Position).xyz;
+		const float inside = insideShadowCube(positionInLightSpace, texelSize);
 		if (inside > 0) {
-			const float lightSpaceDepth = texture(shadowMap, vec3(PositionInLightSpace.xy, m)).r;
-			return step(PositionInLightSpace.z, lightSpaceDepth + 0.001);
+			return getShadow(positionInLightSpace, m, texelSize);
 		}
 	}
 	return 1;
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);
 }
diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.fs b/gfx/gl/shaders/shadowDynamicPointStencil.fs
new file mode 100644
index 0000000..fe91b07
--- /dev/null
+++ b/gfx/gl/shaders/shadowDynamicPointStencil.fs
@@ -0,0 +1,16 @@
+#version 330 core
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(binding = 0) uniform sampler2DArray stencilDepth;
+flat in vec3 scale;
+in vec3 texCoord;
+
+void
+main()
+{
+	float stDepth = texture(stencilDepth, texCoord).r;
+	if (stDepth >= 1) {
+		discard;
+	}
+	gl_FragDepth = gl_FragCoord.z + ((stDepth - 0.5) * scale.z);
+}
diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.gs b/gfx/gl/shaders/shadowDynamicPointStencil.gs
new file mode 100644
index 0000000..7e81d97
--- /dev/null
+++ b/gfx/gl/shaders/shadowDynamicPointStencil.gs
@@ -0,0 +1,36 @@
+#version 330 core
+#extension GL_ARB_viewport_array : enable
+
+const vec2[] corners = vec2[4](vec2(-1, -1), vec2(-1, 1), vec2(1, -1), vec2(1, 1));
+const float tau = 6.28318531;
+
+uniform mat4 viewProjection[4];
+uniform int viewProjections;
+uniform vec3 sizes[4];
+uniform float size;
+
+in float vmodelYaw[];
+in ivec3 vworldPos[];
+
+flat out vec3 scale;
+out vec3 texCoord;
+
+layout(points) in;
+layout(triangle_strip, max_vertices = 16) out;
+
+void
+main()
+{
+	int viewAngle = int(round(4.0 + (vmodelYaw[0] / tau))) % 8;
+	for (gl_Layer = 0; gl_Layer < viewProjections; ++gl_Layer) {
+		scale = 2.0 * size / sizes[gl_Layer];
+		vec4 pos = viewProjection[gl_Layer] * vec4(vworldPos[0], 1);
+		for (int c = 0; c < corners.length(); ++c) {
+			gl_Position = pos + vec4(scale.xy * corners[c], 0, 0);
+			gl_Position.z = max(gl_Position.z, -1);
+			texCoord = vec3((corners[c] * 0.5) + 0.5, viewAngle);
+			EmitVertex();
+		}
+		EndPrimitive();
+	}
+}
diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.vs b/gfx/gl/shaders/shadowDynamicPointStencil.vs
new file mode 100644
index 0000000..0dd2d79
--- /dev/null
+++ b/gfx/gl/shaders/shadowDynamicPointStencil.vs
@@ -0,0 +1,17 @@
+#version 330 core
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(location = 0) in ivec3 worldPos;
+layout(location = 1) in float modelYaw;
+uniform ivec3 viewPoint;
+uniform vec3 centre;
+
+out float vmodelYaw;
+out ivec3 vworldPos;
+
+void
+main()
+{
+	vmodelYaw = modelYaw;
+	vworldPos = worldPos - viewPoint + ivec3(centre);
+}
diff --git a/gfx/gl/shaders/shadowStencil.fs b/gfx/gl/shaders/shadowStencil.fs
new file mode 100644
index 0000000..1164cc9
--- /dev/null
+++ b/gfx/gl/shaders/shadowStencil.fs
@@ -0,0 +1,18 @@
+#version 330 core
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(binding = 0) uniform sampler2D textureAlbedo;
+
+include(`materialDetail.glsl')
+include(`materialCommon.glsl')
+in vec2 gTexCoords;
+flat in MaterialDetail gMaterial;
+
+void
+main()
+{
+	if (getTextureColour(gMaterial, gTexCoords).a < 0.5) {
+		discard;
+	}
+	gl_FragDepth = gl_FragCoord.z;
+}
diff --git a/gfx/gl/shaders/shadowStencil.gs b/gfx/gl/shaders/shadowStencil.gs
new file mode 100644
index 0000000..2c3f9bd
--- /dev/null
+++ b/gfx/gl/shaders/shadowStencil.gs
@@ -0,0 +1,28 @@
+#version 330 core
+#extension GL_ARB_viewport_array : enable
+
+include(`materialDetail.glsl')
+
+layout(triangles) in;
+layout(triangle_strip, max_vertices = 24) out;
+
+uniform mat4 viewProjection[8];
+in vec3 FragPos[];
+in vec2 TexCoords[];
+flat in MaterialDetail Material[];
+out vec2 gTexCoords;
+flat out MaterialDetail gMaterial;
+
+void
+main()
+{
+	for (gl_Layer = 0; gl_Layer < viewProjection.length(); ++gl_Layer) {
+		for (int v = 0; v < FragPos.length(); ++v) {
+			gl_Position = viewProjection[gl_Layer] * vec4(FragPos[v], 1);
+			gTexCoords = TexCoords[v];
+			gMaterial = Material[v];
+			EmitVertex();
+		}
+		EndPrimitive();
+	}
+}
diff --git a/gfx/gl/shaders/shadowStencil.vs b/gfx/gl/shaders/shadowStencil.vs
new file mode 100644
index 0000000..a15c4fb
--- /dev/null
+++ b/gfx/gl/shaders/shadowStencil.vs
@@ -0,0 +1,20 @@
+#version 330 core
+#extension GL_ARB_shading_language_420pack : enable
+
+layout(binding = 1) uniform usampler2DRect materialData;
+
+include(`meshIn.glsl')
+include(`materialDetail.glsl')
+include(`getMaterialDetail.glsl')
+
+out vec3 FragPos;
+out vec2 TexCoords;
+flat out MaterialDetail Material;
+
+void
+main()
+{
+	TexCoords = texCoord;
+	Material = getMaterialDetail(material);
+	FragPos = position;
+}
diff --git a/gfx/gl/shaders/uiShader.fs b/gfx/gl/shaders/uiShader.fs
deleted file mode 100644
index c5f4e92..0000000
--- a/gfx/gl/shaders/uiShader.fs
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 330 core
-
-in vec2 texCoord0;
-
-uniform sampler2D sampler;
-
-void
-main()
-{
-	gl_FragColor = texture(sampler, texCoord0);
-}
diff --git a/gfx/gl/shaders/uiShader.vs b/gfx/gl/shaders/uiShader.vs
deleted file mode 100644
index e9e4373..0000000
--- a/gfx/gl/shaders/uiShader.vs
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 330 core
-
-in vec4 position;
-
-out vec2 texCoord0;
-uniform mat4 uiProjection;
-
-void
-main()
-{
-	gl_Position = uiProjection * vec4(position.xy, 0.0, 1.0);
-	texCoord0 = position.zw;
-}
diff --git a/gfx/gl/shaders/uiShaderFont.fs b/gfx/gl/shaders/uiShaderFont.fs
deleted file mode 100644
index a1ef6ef..0000000
--- a/gfx/gl/shaders/uiShaderFont.fs
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 330 core
-
-in vec2 texCoord0;
-
-uniform sampler2D sampler;
-uniform vec3 colour;
-
-void
-main()
-{
-	gl_FragColor = vec4(colour, texture(sampler, texCoord0).r);
-}