From 5796ca417bae3895b1cca52eb921156e5dbc8575 Mon Sep 17 00:00:00 2001 From: WestLangley Date: Tue, 29 Aug 2017 03:28:48 -0400 Subject: [PATCH] ShadowMaterial: support fog --- src/renderers/shaders/ShaderLib.js | 1 + src/renderers/shaders/ShaderLib/shadow_frag.glsl | 3 +++ src/renderers/shaders/ShaderLib/shadow_vert.glsl | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js index 7ca4892814..8658746a0b 100644 --- a/src/renderers/shaders/ShaderLib.js +++ b/src/renderers/shaders/ShaderLib.js @@ -211,6 +211,7 @@ var ShaderLib = { uniforms: UniformsUtils.merge( [ UniformsLib.lights, + UniformsLib.fog, { color: { value: new Color( 0x00000 ) }, opacity: { value: 1.0 } diff --git a/src/renderers/shaders/ShaderLib/shadow_frag.glsl b/src/renderers/shaders/ShaderLib/shadow_frag.glsl index d72aeae0fc..1b8dfb63fb 100644 --- a/src/renderers/shaders/ShaderLib/shadow_frag.glsl +++ b/src/renderers/shaders/ShaderLib/shadow_frag.glsl @@ -3,6 +3,7 @@ uniform float opacity; #include #include +#include #include #include #include @@ -12,4 +13,6 @@ void main() { gl_FragColor = vec4( color, opacity * ( 1.0 - getShadowMask() ) ); + #include + } diff --git a/src/renderers/shaders/ShaderLib/shadow_vert.glsl b/src/renderers/shaders/ShaderLib/shadow_vert.glsl index e56bd60efa..82fe4dd06d 100644 --- a/src/renderers/shaders/ShaderLib/shadow_vert.glsl +++ b/src/renderers/shaders/ShaderLib/shadow_vert.glsl @@ -1,3 +1,4 @@ +#include #include void main() { @@ -6,5 +7,6 @@ void main() { #include #include #include + #include } -- GitLab