mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-06 15:11:35 +00:00
Code Issues Releases Wiki Activity

fix red lighting with PVL in mac-os

Browse source
This commit is contained in:
Cody Glassman 2025-05-07 18:04:21 -07:00
parent 1f724cc336
commit 055cc35208
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
files/shaders/compatibility/objects.frag
View file

@ -72,6 +72,7 @@ uniform float distortionStrength;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec3 passLighting; centroid varying vec3 passLighting;
centroid varying vec3 passDiffuseLighting;
centroid varying vec3 passSpecular; centroid varying vec3 passSpecular;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
centroid varying vec3 shadowSpecularLighting; centroid varying vec3 shadowSpecularLighting;
@ -220,7 +221,9 @@ vec2 screenCoords = gl_FragCoord.xy / screenRes;
float shadowing = unshadowedLightRatio(-passViewPos.z); float shadowing = unshadowedLightRatio(-passViewPos.z);
vec3 lighting, specular; vec3 lighting, specular;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
lighting = passLighting + shadowDiffuseLighting * shadowing; lighting = passDiffuseLighting * diffuseColor.xyz + passLighting;
clampLightingResult(lighting);
lighting += shadowDiffuseLighting * diffuseColor.xyz * shadowing;
specular = passSpecular + shadowSpecularLighting * shadowing; specular = passSpecular + shadowSpecularLighting * shadowing;
#else #else
#if @specularMap #if @specularMap

6
files/shaders/compatibility/objects.vert
View file

@ -53,6 +53,7 @@ varying vec2 glossMapUV;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec3 passLighting; centroid varying vec3 passLighting;
centroid varying vec3 passDiffuseLighting;
centroid varying vec3 passSpecular; centroid varying vec3 passSpecular;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
centroid varying vec3 shadowSpecularLighting; centroid varying vec3 shadowSpecularLighting;
@ -150,10 +151,11 @@ void main(void)
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
vec3 diffuseLight, ambientLight, specularLight; vec3 diffuseLight, ambientLight, specularLight;
doLighting(viewPos.xyz, viewNormal, gl_FrontMaterial.shininess, diffuseLight, ambientLight, specularLight, shadowDiffuseLighting, shadowSpecularLighting); doLighting(viewPos.xyz, viewNormal, gl_FrontMaterial.shininess, diffuseLight, ambientLight, specularLight, shadowDiffuseLighting, shadowSpecularLighting);
passLighting = getDiffuseColor().xyz * diffuseLight + getAmbientColor().xyz * ambientLight + getEmissionColor().xyz * emissiveMult; passLighting = getAmbientColor().xyz * ambientLight + getEmissionColor().xyz * emissiveMult;
passDiffuseLighting = diffuseLight;
passSpecular = getSpecularColor().xyz * specularLight * specStrength; passSpecular = getSpecularColor().xyz * specularLight * specStrength;
clampLightingResult(passLighting); clampLightingResult(passLighting);
shadowDiffuseLighting *= getDiffuseColor().xyz; clampLightingResult(passDiffuseLighting);
shadowSpecularLighting *= getSpecularColor().xyz * specStrength; shadowSpecularLighting *= getSpecularColor().xyz * specStrength;
#endif #endif