mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2359 from Capostrophic/shaders

Browse source 
Shader adjustments
This commit is contained in:
Bret Curtis 2019-05-02 13:33:55 +02:00 committed by GitHub
commit 4f7d7fc000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/shaders/lighting.glsl
View file

@ -63,7 +63,7 @@ vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor, out vec3 shadow
lightResult.xyz += gl_FrontMaterial.emission.xyz;
#if @clamp
lightResult = clamp(lightResult, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
lightResult = clamp(lightResult, vec4(0.0), vec4(1.0));
#else
lightResult = max(lightResult, 0.0);
#endif

8
files/shaders/objects_fragment.glsl
View file

@ -98,7 +98,7 @@ void main()
#if @diffuseMap
gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
#else
gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
gl_FragData[0] = vec4(1.0);
#endif
#if @detailMap
@ -117,7 +117,13 @@ void main()
float shadowing = unshadowedLightRatio();
#if !PER_PIXEL_LIGHTING
#if @clamp
gl_FragData[0] *= clamp(lighting + vec4(shadowDiffuseLighting * shadowing, 0), vec4(0.0), vec4(1.0));
#else
gl_FragData[0] *= lighting + vec4(shadowDiffuseLighting * shadowing, 0);
#endif
#else
gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor, shadowing);
#endif

6
files/shaders/terrain_fragment.glsl
View file

@ -69,7 +69,13 @@ void main()
float shadowing = unshadowedLightRatio();
#if !PER_PIXEL_LIGHTING
#if @clamp
gl_FragData[0] *= clamp(lighting + vec4(shadowDiffuseLighting * shadowing, 0), vec4(0.0), vec4(1.0));
#else
gl_FragData[0] *= lighting + vec4(shadowDiffuseLighting * shadowing, 0);
#endif
#else
gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor, shadowing);
#endif

4
files/shaders/water_fragment.glsl
View file

@ -170,7 +170,7 @@ void main(void)
vec2 screenCoords = screenCoordsPassthrough.xy / screenCoordsPassthrough.z;
screenCoords.y = (1.0-screenCoords.y);
vec2 nCoord = vec2(0.0,0.0);
vec2 nCoord = vec2(0.0);
#define waterTimer osg_SimulationTime
@ -186,7 +186,7 @@ void main(void)
if (rainIntensity > 0.01)
rainRipple = rainCombined(position.xy / 1000.0,waterTimer) * clamp(rainIntensity,0.0,1.0);
else
rainRipple = vec4(0.0,0.0,0.0,0.0);
rainRipple = vec4(0.0);
vec3 rippleAdd = rainRipple.xyz * rainRipple.w * 10.0;