diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-02 18:07:08 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-02 18:07:08 +0000 |
| commit | 14629ca3d661c8ec798ad072c4e739571d9c1196 (patch) | |
| tree | 3189d775358aedf7f047c39b4d692cb04c37b49c /indra/newview/app_settings/shaders/class2/deferred | |
| parent | d7b47bf71f84e4d7311a532b4bfa4a3795f19ab9 (diff) | |
| parent | f07a1741e91fe44423d27585e4eeb7b69542e299 (diff) | |
Merged in Geenz/viewer-eep-shader-fixes (pull request #322)
Water plane rendering improvements
Approved-by: Graham Madarasz <graham@lindenlab.com>
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 27532ce458..28248aaf6d 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -146,7 +146,7 @@ void main() col += spec_contrib; } - col = mix(col.rgb, diffuse.rgb, diffuse.a); + col.rgb += diffuse.a * diffuse.rgb; if (envIntensity > 0.0) { //add environmentmap @@ -154,13 +154,13 @@ void main() vec3 refcol = textureCube(environmentMap, env_vec).rgb; col = mix(col.rgb, refcol, envIntensity); } - - -vec3 a = col.rgb; + if (norm.w < 0.5) { - col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a); - col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a); + //col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a); + //col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a); + col = atmosFragLighting(col, additive, atten); + col = scaleSoftClipFrag(col); } #ifdef WATER_FOG |