mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:23:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2836 from Capostrophic/shaders

Browse source 
Always pass the vertex color to the fragment shader
This commit is contained in:
Andrei Kortunov 2020-05-12 19:34:56 +04:00 committed by GitHub
commit 0e3ae38e49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
files/shaders/objects_fragment.glsl
View file

@ -59,9 +59,8 @@ varying float linearDepth;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec4 lighting; centroid varying vec4 lighting;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
#else
centroid varying vec4 passColor;
#endif #endif
centroid varying vec4 passColor;
varying vec3 passViewPos; varying vec3 passViewPos;
varying vec3 passNormal; varying vec3 passNormal;

6
files/shaders/objects_vertex.glsl
View file

@ -45,9 +45,8 @@ varying float linearDepth;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec4 lighting; centroid varying vec4 lighting;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
#else
centroid varying vec4 passColor;
#endif #endif
centroid varying vec4 passColor;
varying vec3 passViewPos; varying vec3 passViewPos;
varying vec3 passNormal; varying vec3 passNormal;
@ -108,9 +107,8 @@ void main(void)
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting); lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting);
#else
passColor = gl_Color;
#endif #endif
passColor = gl_Color;
passViewPos = viewPos.xyz; passViewPos = viewPos.xyz;
passNormal = gl_Normal.xyz; passNormal = gl_Normal.xyz;

3
files/shaders/terrain_fragment.glsl
View file

@ -20,9 +20,8 @@ varying float linearDepth;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec4 lighting; centroid varying vec4 lighting;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
#else
centroid varying vec4 passColor;
#endif #endif
centroid varying vec4 passColor;
varying vec3 passViewPos; varying vec3 passViewPos;
varying vec3 passNormal; varying vec3 passNormal;

6
files/shaders/terrain_vertex.glsl
View file

@ -9,9 +9,8 @@ varying float linearDepth;
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
centroid varying vec4 lighting; centroid varying vec4 lighting;
centroid varying vec3 shadowDiffuseLighting; centroid varying vec3 shadowDiffuseLighting;
#else
centroid varying vec4 passColor;
#endif #endif
centroid varying vec4 passColor;
varying vec3 passViewPos; varying vec3 passViewPos;
varying vec3 passNormal; varying vec3 passNormal;
@ -32,9 +31,8 @@ void main(void)
#if !PER_PIXEL_LIGHTING #if !PER_PIXEL_LIGHTING
lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting); lighting = doLighting(viewPos.xyz, viewNormal, gl_Color, shadowDiffuseLighting);
#else
passColor = gl_Color;
#endif #endif
passColor = gl_Color;
passNormal = gl_Normal.xyz; passNormal = gl_Normal.xyz;
passViewPos = viewPos.xyz; passViewPos = viewPos.xyz;