diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-18 01:34:39 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-18 01:34:39 -0500 |
commit | 37f984a942ae175d21b3749f1ee7966fa5b337e8 (patch) | |
tree | 19cbd969534e55f3cbaa5e2592c58f9e34121d8d /indra/newview/app_settings/shaders/class2/deferred | |
parent | 0e3aa71a69a7f68194ba41b0ea261462eb354d3c (diff) | |
parent | 70d50028aecbce90a48b77ea3f1ff2bdae266742 (diff) |
Automated merge with https://bitbucket.org/Geenz/viewer-development-materials
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 8e638c64eb..5fb22c7f4d 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -315,11 +315,13 @@ void main() col *= diffuse.rgb; + vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); + if (spec.a > 0.0) // specular reflection { // the old infinite-sky shiny reflection // - vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); + float sa = dot(refnormpersp, sun_dir.xyz); vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*(texture2D(lightFunc, vec2(sa, spec.a)).r); @@ -327,8 +329,10 @@ void main() vec3 spec_contrib = dumbshiny * spec.rgb; bloom = dot(spec_contrib, spec_contrib) / 6; col += spec_contrib; + } - //add environmentmap + if (envIntensity > 0.0) + { //add environmentmap vec3 env_vec = env_mat * refnormpersp; col = mix(col.rgb, textureCube(environmentMap, env_vec).rgb, max(envIntensity-diffuse.a*2.0, 0.0)); |