From ac3d187dcd6fe2c52e8677ff77e8e2c82009b5f3 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Tue, 28 Mar 2023 06:51:00 +0000 Subject: [PATCH] Fixes model water and waterfall shaders outputting color on shadow pass. This was SVN commit r27594. --- binaries/data/mods/public/shaders/glsl/model_water.fs | 4 ++++ binaries/data/mods/public/shaders/glsl/model_waterfall.fs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/binaries/data/mods/public/shaders/glsl/model_water.fs b/binaries/data/mods/public/shaders/glsl/model_water.fs index 0d5c5ae5b9..14f08ff7c4 100644 --- a/binaries/data/mods/public/shaders/glsl/model_water.fs +++ b/binaries/data/mods/public/shaders/glsl/model_water.fs @@ -71,5 +71,9 @@ void main() t = 18.0 * max(0.0, 0.7 - v.y); float alpha = 0.15 * waterDepth * (1.2 + t + fresnel); +#if !PASS_SHADOWS OUTPUT_FRAGMENT_SINGLE_COLOR(vec4(applyDebugColor(color, 1.0, alpha, 0.0), alpha)); +#else + OUTPUT_FRAGMENT_SINGLE_COLOR(vec4(0.0, 0.0, 0.0, 1.0)); +#endif } diff --git a/binaries/data/mods/public/shaders/glsl/model_waterfall.fs b/binaries/data/mods/public/shaders/glsl/model_waterfall.fs index a61445636a..eabf40389e 100644 --- a/binaries/data/mods/public/shaders/glsl/model_waterfall.fs +++ b/binaries/data/mods/public/shaders/glsl/model_waterfall.fs @@ -26,5 +26,9 @@ void main() color *= getLOS(GET_DRAW_TEXTURE_2D(losTex), v_los); #endif +#if !PASS_SHADOWS OUTPUT_FRAGMENT_SINGLE_COLOR(vec4(applyDebugColor(color, 1.0, texdiffuse.a, 0.0), texdiffuse.a)); +#else + OUTPUT_FRAGMENT_SINGLE_COLOR(vec4(0.0, 0.0, 0.0, 1.0)); +#endif }