diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
commit | 0915ce7834f8e36c53e0790c2946b952a12a74c6 (patch) | |
tree | 270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/newview/app_settings/shaders/class1/deferred/cofF.glsl | |
parent | 613d0fe42ff94064a7fabeff28845a9406ea9b9c (diff) | |
parent | 6157386b4c96740e406a49eb9e8f42c6d7f252ff (diff) |
reconciled .hgtags
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/cofF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/cofF.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl index 88fe3c3dee..e612efba61 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl @@ -57,7 +57,7 @@ float getDepth(vec2 pos_screen) float calc_cof(float depth) { - float sc = abs(depth-focal_distance)/-depth*blur_constant; + float sc = (depth-focal_distance)/-depth*blur_constant; sc /= magnification; @@ -79,9 +79,10 @@ void main() vec4 diff = texture2DRect(diffuseRect, vary_fragcoord.xy); float sc = calc_cof(depth); - sc = min(abs(sc), max_cof); + sc = min(sc, max_cof); + sc = max(sc, -max_cof); vec4 bloom = texture2D(bloomMap, vary_fragcoord.xy/screen_res); gl_FragColor.rgb = diff.rgb + bloom.rgb; - gl_FragColor.a = sc/max_cof; + gl_FragColor.a = sc/max_cof*0.5+0.5; } |