From 703be164cf4205117fa0e1adc9316fb77645ce25 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Thu, 7 Aug 2014 17:27:34 -0400
Subject: [PATCH] Code cleanup for BUG-6898
---
.../shaders/class1/deferred/multiSpotLightF.glsl | 8 +++++---
.../app_settings/shaders/class1/deferred/spotLightF.glsl | 7 +++----
.../shaders/class2/deferred/multiSpotLightF.glsl | 8 ++++----
.../app_settings/shaders/class2/deferred/spotLightF.glsl | 7 +++----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
index 63ad6fa7c72..62acbbf36be 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
@@ -311,12 +311,14 @@ void main()
vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
- stc /= stc.w;
+
if (stc.z > 0.0)
{
- float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
+ stc /= stc.w;
+
+ //float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
- stc.xy = (stc.xy - vec2(0.5)) + vec2(0.5);
+ //stc.xy = (stc.xy - vec2(0.25)) * fatten + vec2(0.5);
if (stc.x < 1.0 &&
stc.y < 1.0 &&
diff --git a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
index 6d282115ddc..10b47291e34 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
@@ -322,12 +322,11 @@ void main()
if (stc.z > 0.0)
{
- stc.xy /= stc.w;
+ stc /= stc.w;
- float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
+ //float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
- //stc.xy = (stc.xy - vec2(0.5)) * fatten + vec2(0.5);
- stc.xy = (stc.xy - vec2(0.5)) + vec2(0.5);
+ //stc.xy = (stc.xy - vec2(0.25)) * fatten + vec2(0.5);
if (stc.x < 1.0 &&
stc.y < 1.0 &&
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
index d5bc56e27af..dd99c029e68 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
@@ -334,13 +334,14 @@ void main()
vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
- stc /= stc.w;
if (stc.z > 0.0)
{
- float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
+ stc /= stc.w;
- stc.xy = (stc.xy - vec2(0.5)) + vec2(0.5);
+ //float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
+
+ //stc.xy = (stc.xy - vec2(0.25)) * fatten + vec2(0.5);
if (stc.x < 1.0 &&
stc.y < 1.0 &&
@@ -352,7 +353,6 @@ void main()
}
}
}
-
//not sure why, but this line prevents MATBUG-194
col = max(col, vec3(0.0));
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
index 56b01eff8c7..acf474c4899 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
@@ -336,12 +336,11 @@ void main()
if (stc.z > 0.0)
{
- stc.xy /= stc.w;
+ stc /= stc.w;
- float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
+ //float fatten = clamp(spec.a*spec.a+spec.a*0.25, 0.25, 1.0);
- //stc.xy = (stc.xy - vec2(0.5)) * fatten + vec2(0.5);
- stc.xy = (stc.xy - vec2(0.5)) + vec2(0.5);
+ //stc.xy = (stc.xy - vec2(0.25)) * fatten + vec2(0.5);
if (stc.x < 1.0 &&
stc.y < 1.0 &&
--
GitLab