Fix: Tcmask point lighting normals

Co-Authored-By: vlj <[email protected]>
Warzone2100 · Jan 27, 2024 · 9ec1d56 · 9ec1d56
1 parent 65dca8a
commit 9ec1d56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/data/base/shaders/tcmask_instanced.frag b/data/base/shaders/tcmask_instanced.frag
@@ -376,7 +376,9 @@ void main()
 		0., 1., 0.,
 		0., 0., 1.
 	);
-	light += iterateOverAllPointLights(clipSpaceCoord, fragPos, -N, normalize(halfVec - lightDir), diffuse, specularMapValue, identityMat);
+	// Normals are in view space, we need to get back to world space
+	vec3 worldSpaceNormal = -(inverse(ViewMatrix) * vec4(N, 0.f)).xyz;
+	light += iterateOverAllPointLights(clipSpaceCoord, fragPos, worldSpaceNormal, normalize(halfVec - lightDir), diffuse, specularMapValue, identityMat);
 #endif
 
 	light.rgb *= visibility;

diff --git a/data/base/shaders/vk/tcmask_instanced.frag b/data/base/shaders/vk/tcmask_instanced.frag
@@ -344,7 +344,9 @@ void main()
 								0., 1., 0.,
 								0., 0., 1.
 								);
-		light += iterateOverAllPointLights(clipSpaceCoord, fragPos, -N, normalize(halfVec - lightDir), diffuse, specularMapValue, identityMat);
+		// Normals are in view space, we need to get back to world space
+		vec3 worldSpaceNormal = -(inverse(ViewMatrix) * vec4(N, 0.f)).xyz;
+		light += iterateOverAllPointLights(clipSpaceCoord, fragPos, worldSpaceNormal, normalize(halfVec - lightDir), diffuse, specularMapValue, identityMat);
 	}
 
 	light.rgb *= visibility;