Merge branch 'lighting' into 'master'

Clamp vertex lighting properly (#6697)

Closes #6697

See merge request OpenMW/openmw!1811

CHANGELOG.md

@@ -112,6 +112,7 @@
     Bug #6670: Dialogue order is incorrect
     Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Bug #6682: HitOnMe doesn't fire as intended
+    Bug #6697: Shaders vertex lighting incorrectly clamped
     Bug #6711: Log time differs from real time
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions

files/shaders/groundcover_fragment.glsl

@@ -73,9 +73,10 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseLight + ambientLight;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @radialFog

files/shaders/objects_fragment.glsl

@@ -194,9 +194,10 @@ void main()
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     vec3 emission = getEmissionColor().xyz * emissiveMult;
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @envMap && !@preLightEnv

files/shaders/terrain_fragment.glsl

@@ -87,9 +87,10 @@ void main()
     vec3 diffuseLight, ambientLight;
     doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
     lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
-    clampLightingResult(lighting);
 #endif
 
+    clampLightingResult(lighting);
+
     gl_FragData[0].xyz *= lighting;
 
 #if @specularMap