diff options
| author | graham linden <graham@lindenlab.com> | 2013-05-08 09:16:19 -0700 | 
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-05-08 09:16:19 -0700 | 
| commit | 7b1acb186a7025b0464c21c88c0956439c98f3d2 (patch) | |
| tree | b01a9c0c617104e4b69a7f5334377cd62d47fc4b /indra/newview/app_settings/shaders/class1/deferred | |
| parent | 19c755b8512bb2e7ce36924b30c1ed380397a8f4 (diff) | |
| parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl | 14 | 
1 files changed, 13 insertions, 1 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl index f400eb7a5b..c030c23515 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl @@ -64,11 +64,23 @@ vec4 getPosition(vec2 pos_screen)  	return pos;  } +vec3 decode_normal (vec2 enc) +{ +    vec2 fenc = enc*4-2; +    float f = dot(fenc,fenc); +    float g = sqrt(1-f/4); +    vec3 n; +    n.xy = fenc*g; +    n.z = 1-f/2; +    return n; +} +  void main()   {      vec2 tc = vary_fragcoord.xy;  	vec3 norm = texture2DRect(normalMap, tc).xyz; -	norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm +	norm = decode_normal(norm.xy); // unpack norm +  	vec3 pos = getPosition(tc).xyz;  	vec4 ccol = texture2DRect(lightMap, tc).rgba; | 
