mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2909 from akortunov/shaders

Browse source 
Calculate viewNormal only when needed
This commit is contained in:
Bret Curtis 2020-06-15 17:36:50 +02:00 committed by GitHub
commit bf228746c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
files/shaders/objects_fragment.glsl
View file

@ -83,7 +83,9 @@ void main()
mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal); mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0)); vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
#else #endif
#if (!@normalMap && (@parallax || @forcePPL))
vec3 viewNormal = gl_NormalMatrix * normalize(passNormal); vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
#endif #endif
@ -184,7 +186,12 @@ void main()
#endif #endif
if (matSpec != vec3(0.0)) if (matSpec != vec3(0.0))
{
#if (!normalMap && !@parallax && !forcePPL)
vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
#endif
gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing; gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec) * shadowing;
}
#if @radialFog #if @radialFog
float depth; float depth;
// For the less detailed mesh of simple water we need to recalculate depth on per-pixel basis // For the less detailed mesh of simple water we need to recalculate depth on per-pixel basis

4
files/shaders/objects_vertex.glsl
View file

@ -63,7 +63,9 @@ void main(void)
euclideanDepth = length(viewPos.xyz); euclideanDepth = length(viewPos.xyz);
linearDepth = gl_Position.z; linearDepth = gl_Position.z;
#if (@envMap || !PER_PIXEL_LIGHTING || @shadows_enabled)
vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz); vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
#endif
#if @envMap #if @envMap
vec3 viewVec = normalize(viewPos.xyz); vec3 viewVec = normalize(viewPos.xyz);
@ -112,5 +114,7 @@ void main(void)
passViewPos = viewPos.xyz; passViewPos = viewPos.xyz;
passNormal = gl_Normal.xyz; passNormal = gl_Normal.xyz;
#if (@shadows_enabled)
setupShadowCoords(viewPos, viewNormal); setupShadowCoords(viewPos, viewNormal);
#endif
} }

11
files/shaders/terrain_fragment.glsl
View file

@ -43,8 +43,10 @@ void main()
mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal); mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal);
vec3 viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0))); vec3 viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
#else #endif
vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
#if (!@normalMap && (@parallax || @forcePPL))
vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
#endif #endif
#if @parallax #if @parallax
@ -93,7 +95,12 @@ void main()
#endif #endif
if (matSpec != vec3(0.0)) if (matSpec != vec3(0.0))
{
#if (!normalMap && !@parallax && !forcePPL)
vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
#endif
gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec) * shadowing; gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec) * shadowing;
}
#if @radialFog #if @radialFog
float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0); float fogValue = clamp((euclideanDepth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);

4
files/shaders/terrain_vertex.glsl
View file

@ -27,7 +27,9 @@ void main(void)
euclideanDepth = length(viewPos.xyz); euclideanDepth = length(viewPos.xyz);
linearDepth = gl_Position.z; linearDepth = gl_Position.z;
#if (!PER_PIXEL_LIGHTING || @shadows_enabled)
vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz); vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
#endif
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting); lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting);
@ -38,5 +40,7 @@ void main(void)
uv = gl_MultiTexCoord0.xy; uv = gl_MultiTexCoord0.xy;
#if (@shadows_enabled)
setupShadowCoords(viewPos, viewNormal); setupShadowCoords(viewPos, viewNormal);
#endif
} }