From a6f92d8190e8771d6a3372eb456dbb97c7ca0c8d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 24 Jan 2019 11:48:04 -0800
Subject: [PATCH] SL-10281
Use clamp on dot product of view and light norm to eliminate 2nd halo.
---
indra/newview/app_settings/shaders/class2/deferred/skyF.glsl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
index 520bfbeadc1..09ad6e70d68 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
@@ -70,14 +70,15 @@ uniform float ice_level;
vec3 rainbow(float d)
{
- d = clamp(d, -1, 0);
+ d = clamp(d, -1.0, 0.0);
float rad = (droplet_radius - 5.0f) / 1024.0f;
return pow(texture2D(rainbow_map, vec2(rad, d)).rgb, vec3(1.8)) * moisture_level;
}
vec3 halo22(float d)
{
- float v = sqrt(max(0, 1 - (d*d)));
+ d = clamp(d, 0.1, 1.0);
+ float v = sqrt(clamp(1 - (d * d), 0, 1));
return texture2D(halo_map, vec2(0, v)).rgb * ice_level;
}
--
GitLab