mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-04 14:19:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'vertex_lighting_fix' into 'master'

Browse source 
Correct vertex lighting

Closes #5973

See merge request OpenMW/openmw!770
This commit is contained in:
AnyOldName3 2021-04-23 18:20:16 +00:00
commit 90fecdeda2
8 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
files/shaders/groundcover_fragment.glsl
View file

@ -73,12 +73,7 @@ void main()
vec3 diffuseLight, ambientLight;
doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
lighting = diffuseLight + ambientLight;
#endif
#if @clamp
lighting = clamp(lighting, vec3(0.0), vec3(1.0));
#else
lighting = max(lighting, 0.0);
clampLightingResult(lighting);
#endif
gl_FragData[0].xyz *= lighting;

1
files/shaders/groundcover_vertex.glsl
View file

@ -165,6 +165,7 @@ void main(void)
vec3 diffuseLight, ambientLight;
doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
passLighting = diffuseLight + ambientLight;
clampLightingResult(passLighting);
#endif
#if (@shadows_enabled)

9
files/shaders/lighting_util.glsl
View file

@ -129,3 +129,12 @@ vec4 lcalcSpecular(int lightIndex)
return @getLight[lightIndex].specular;
#endif
}
void clampLightingResult(inout vec3 lighting)
{
#if @clamp
lighting = clamp(lighting, vec3(0.0), vec3(1.0));
#else
lighting = max(lighting, 0.0);
#endif
}

6
files/shaders/nv_default_fragment.glsl
View file

@ -78,11 +78,7 @@ void main()
#endif
vec3 lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
#if @clamp
lighting = clamp(lighting, vec3(0.0), vec3(1.0));
#else
lighting = max(lighting, 0.0);
#endif
clampLightingResult(lighting);
gl_FragData[0].xyz *= lighting;

7
files/shaders/objects_fragment.glsl
View file

@ -176,12 +176,7 @@ void main()
doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
vec3 emission = getEmissionColor().xyz * emissiveMult;
lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
#endif
#if @clamp
lighting = clamp(lighting, vec3(0.0), vec3(1.0));
#else
lighting = max(lighting, 0.0);
clampLightingResult(lighting);
#endif
gl_FragData[0].xyz *= lighting;

1
files/shaders/objects_vertex.glsl
View file

@ -125,6 +125,7 @@ void main(void)
doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
vec3 emission = getEmissionColor().xyz * emissiveMult;
passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + emission;
clampLightingResult(passLighting);
shadowDiffuseLighting *= getDiffuseColor().xyz;
#endif

7
files/shaders/terrain_fragment.glsl
View file

@ -87,12 +87,7 @@ void main()
vec3 diffuseLight, ambientLight;
doLighting(passViewPos, normalize(viewNormal), shadowing, diffuseLight, ambientLight);
lighting = diffuseColor.xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
#endif
#if @clamp
lighting = clamp(lighting, vec3(0.0), vec3(1.0));
#else
lighting = max(lighting, 0.0);
clampLightingResult(lighting);
#endif
gl_FragData[0].xyz *= lighting;

1
files/shaders/terrain_vertex.glsl
View file

@ -47,6 +47,7 @@ void main(void)
vec3 diffuseLight, ambientLight;
doLighting(viewPos.xyz, viewNormal, diffuseLight, ambientLight, shadowDiffuseLighting);
passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz;
clampLightingResult(passLighting);
shadowDiffuseLighting *= getDiffuseColor().xyz;
#endif