cleanup

Author: azer89

Shaders/ShadowMapping/PCF.glsl

@@ -9,7 +9,8 @@ float ShadowPCF(vec4 sc, uint cascadeIndex)
 	vec3 lightDir = normalize(shadowUBO.lightPosition.xyz - worldPos);
 	float bias = max(shadowUBO.shadowMaxBias * (1.0 - dot(N, lightDir)), shadowUBO.shadowMinBias);
 
-	const int range = 2;
+	// TODO Find out a better blurring technique concerning multiple shadow maps
+	const int range = 1;
 	float shadow = 0.0;
 	int count = 0;
 	for (int x = -range; x <= range; x++)

Shaders/ShadowMapping/Scene.frag

@@ -21,12 +21,10 @@ Fragment shader for
 #include <Bindless//MeshData.glsl>
 
 layout(location = 0) in vec3 worldPos;
-layout(location = 1) in vec2 texCoord;
-layout(location = 2) in vec3 normal;
-layout(location = 3) in vec3 viewPos;
-//layout(location = 3) in vec4 shadowPos;
+layout(location = 1) in vec3 viewPos;
+layout(location = 2) in vec2 texCoord;
+layout(location = 3) in vec3 normal;
 layout(location = 4) in flat uint meshIndex;
-//layout(location = 5) in flat uint cascadeIndex;
 
 layout(location = 0) out vec4 fragColor;
 

Shaders/ShadowMapping/Scene.vert

@@ -12,12 +12,10 @@ Vertex shader for
 #include <Bindless//VertexData.glsl>
 
 layout(location = 0) out vec3 worldPos;
-layout(location = 1) out vec2 texCoord;
-layout(location = 2) out vec3 normal;
-layout(location = 3) out vec3 viewPos;
-//layout(location = 3) out vec4 shadowPos;
+layout(location = 1) out vec3 viewPos;
+layout(location = 2) out vec2 texCoord;
+layout(location = 3) out vec3 normal;
 layout(location = 4) out flat uint meshIndex;
-//layout(location = 5) out flat uint cascadeIndex;
 
 // UBO
 layout(set = 0, binding = 0)
@@ -60,20 +58,9 @@ void main()
 	mat3 normalMatrix = transpose(inverse(mat3(model)));
 
 	worldPos = (model * vertexData.position).xyz;
-
-	// Calculate cascade index
 	viewPos = (camUBO.view * vec4(worldPos, 1.0)).xyz;
-	/*for (uint i = 0; i < SHADOW_MAP_CASCADE_COUNT - 1; ++i)
-	{
-		if (viewPos.z < shadowUBO.splitDepths[i])
-		{
-			cascadeIndex = i + 1;
-		}
-	}*/
-
 	texCoord = vertexData.uv.xy;
 	normal = normalMatrix * vertexData.normal.xyz;
 	meshIndex = gl_BaseInstance;
-	//shadowPos = biasMat * shadowUBO.lightSpaceMatrices[cascadeIndex] * model * vertexData.position;
 	gl_Position =  camUBO.projection * camUBO.view * vec4(worldPos, 1.0);
 }