From 63487bbe7b046566f3320f3e569c06eae72930d2 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Sun, 24 Oct 2021 21:36:39 +0100 Subject: [PATCH] WS30 ultra shader - port ambient lighting fix commit aca259acaccffbaf1cb264be423dda72c106150e Author: vs Date: Sat Oct 23 22:55:56 2021 +1000 WS30 shaders: varying fix commit 91b194f6766d432206cb013d99e0a96cd34ff33b Author: vs Date: Sat Oct 23 22:17:03 2021 +1000 WS30 ultra shader: port the ambient lighting fix. --- Shaders/ws30-ALS-ultra.frag | 2 +- Shaders/ws30-ALS-ultra.vert | 4 ++-- Shaders/ws30-ALS.vert | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Shaders/ws30-ALS-ultra.frag b/Shaders/ws30-ALS-ultra.frag index 535c7944c..05c7f0561 100644 --- a/Shaders/ws30-ALS-ultra.frag +++ b/Shaders/ws30-ALS-ultra.frag @@ -140,7 +140,7 @@ void main() vec4 mat_diffuse = texture(diffuseArray, index); vec4 mat_specular = texture(specularArray, index); - vec4 color = mat_diffuse * NdotL * gl_LightSource[0].diffuse; + vec4 color = gl_Color + mat_diffuse * NdotL * gl_LightSource[0].diffuse; // Testing code: // Use rlc even when looking up textures to recreate the extra performance hit diff --git a/Shaders/ws30-ALS-ultra.vert b/Shaders/ws30-ALS-ultra.vert index 705e0cc45..a69f03dae 100644 --- a/Shaders/ws30-ALS-ultra.vert +++ b/Shaders/ws30-ALS-ultra.vert @@ -79,7 +79,7 @@ void main() // this code is copied from default.vert - vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex; + ecPosition = gl_ModelViewMatrix * gl_Vertex; gl_Position = ftransform(); gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; orthoTexCoord = orthophotoTexCoord; @@ -226,7 +226,7 @@ else // the faster, full-day version without lightfields gl_FrontColor.rgb = constant_term.rgb; gl_FrontColor.a = 1.0; gl_BackColor.rgb = constant_term.rgb; gl_BackColor.a = 0.0; - setupShadows(gl_ModelViewMatrix * gl_Vertex); + setupShadows(ecPosition); } diff --git a/Shaders/ws30-ALS.vert b/Shaders/ws30-ALS.vert index 705e0cc45..a69f03dae 100644 --- a/Shaders/ws30-ALS.vert +++ b/Shaders/ws30-ALS.vert @@ -79,7 +79,7 @@ void main() // this code is copied from default.vert - vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex; + ecPosition = gl_ModelViewMatrix * gl_Vertex; gl_Position = ftransform(); gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; orthoTexCoord = orthophotoTexCoord; @@ -226,7 +226,7 @@ else // the faster, full-day version without lightfields gl_FrontColor.rgb = constant_term.rgb; gl_FrontColor.a = 1.0; gl_BackColor.rgb = constant_term.rgb; gl_BackColor.a = 0.0; - setupShadows(gl_ModelViewMatrix * gl_Vertex); + setupShadows(ecPosition); }