livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-1491 

Fix name at top of the 3 softenLight shaders so we can differentiate which is in use when using nSight debug.

Made class2 softenLightF shader modulate the atmospherics additive to only specular shading to fix lens flare on terrain etc.
meow-7.2.2
Graham Linden 2018-09-14 18:42:41 +01:00
parent 46d194d352
commit a167f8857f
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
View File

@ -1,5 +1,5 @@
/**
* @file softenLightF.glsl
* @file class1/deferred/softenLightF.glsl
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code

11
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
View File

@ -165,8 +165,6 @@ void main()
if (spec.a > 0.0) // specular reflection
{
// the old infinite-sky shiny reflection
//
float sa = dot(refnormpersp, sun_dir.xyz);
vec3 dumbshiny = sunlit*scol_ambocc.r*(texture2D(lightFunc, vec2(sa, spec.a)).r);
@ -182,17 +180,14 @@ void main()
if (envIntensity > 0.0)
{ //add environmentmap
vec3 env_vec = env_mat * refnormpersp;
vec3 refcol = textureCube(environmentMap, env_vec).rgb;
col = mix(col.rgb, refcol,
envIntensity);
col = mix(col.rgb, refcol, envIntensity);
}
if (norm.w < 0.5)
{
col = mix(atmosFragLighting(col, additive, atten), fullbrightFragAtmosTransport(col, atten, additive), diffuse.a);
vec3 add = additive * spec.a;
col = mix(atmosFragLighting(col, add, atten), fullbrightFragAtmosTransport(col, atten, add), diffuse.a);
col = mix(scaleFragSoftClip(col), fullbrightScaleSoftClipFrag(col, atten), diffuse.a);
}

2
indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
View File

@ -1,5 +1,5 @@
/**
* @file softenLightF.glsl
* @file class3/deferred/softenLightF.glsl
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code