From 4e4011cddc4c6edf797bd3ff7950fb02d178a2e2 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 13 Aug 2019 08:14:14 -0700
Subject: [PATCH] SL-11589
Modify altitude blend factor in cloud shaders to fade more aggressively and fix cloud rendering artifacts when at altitude.
---
indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl | 2 +-
.../newview/app_settings/shaders/class2/windlight/cloudsV.glsl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
index 20ab0fb171d..8e90c1481fe 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
@@ -78,7 +78,7 @@ void main()
// Get relative position
vec3 P = position.xyz - camPosLocal.xyz + vec3(0,50,0);
- altitude_blend_factor = (P.y > -4096.0) ? 1.0 : 1.0 - clamp(abs(P.y) / max_y, 0.0, 1.0);
+ altitude_blend_factor = clamp((P.y + 512.0) / max_y, 0.0, 1.0);
// Set altitude
if (P.y > 0.)
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
index 18daa5a2426..2c1475d5478 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
@@ -78,7 +78,7 @@ void main()
vec3 P = position.xyz - camPosLocal.xyz + vec3(0,50,0);
// fade clouds beyond a certain point so the bottom of the sky dome doesn't look silly at high altitude
- altitude_blend_factor = (P.y > -4096.0) ? 1.0 : 1.0 - clamp(abs(P.y) / max_y, 0.0, 1.0);
+ altitude_blend_factor = clamp((P.y + 512.0) / max_y, 0.0, 1.0);
// Set altitude
if (P.y > 0.)
--
GitLab