diff options
author | Geenz <geenz@geenzo.com> | 2013-07-11 19:46:20 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-07-11 19:46:20 -0400 |
commit | 3a8ad62d9b13335b29bcc5a1419ac8712bc3626b (patch) | |
tree | 720c2a3e14e792d569b4b208d90d4177c92ab006 /indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | |
parent | d68f254c66cc2c971cda14c59f8d16e8c44586d6 (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merge with latest viewer-release.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl index a2c3ec3355..adc361d7a2 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl @@ -43,10 +43,12 @@ vec2 encode_normal(vec3 n) void main() { vec3 col = vertex_color.rgb * diffuseLookup(vary_texcoord0.xy).rgb; + + vec3 spec; + spec.rgb = vec3(vertex_color.a); frag_data[0] = vec4(col, 0.0); - frag_data[1] = vertex_color.aaaa; // spec - frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested + frag_data[1] = vec4(spec, vertex_color.a); // spec vec3 nvn = normalize(vary_normal); frag_data[2] = vec4(encode_normal(nvn.xyz), vertex_color.a, 0.0); } |