diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
commit | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (patch) | |
tree | 70eb3619b9a3df35687836d9daa328eb52ba85ab /indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl | |
parent | 6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff) | |
parent | e416840f85dc4a367894036b9fe483f17d959c54 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl index 1c29dae5f7..2197744a37 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl @@ -14,14 +14,16 @@ varying vec3 vary_mat2; void main() { - vec3 col = texture2D(diffuseMap, gl_TexCoord[0].xy).rgb; + vec3 col = gl_Color.rgb * texture2D(diffuseMap, gl_TexCoord[0].xy).rgb; vec3 norm = texture2D(bumpMap, gl_TexCoord[0].xy).rgb * 2.0 - 1.0; vec3 tnorm = vec3(dot(norm,vary_mat0), - dot(norm,vary_mat1), - dot(norm,vary_mat2)); + dot(norm,vary_mat1), + dot(norm,vary_mat2)); - gl_FragData[0] = vec4(gl_Color.rgb*col, 0.0); - gl_FragData[1] = vec4(col*gl_Color.a, gl_Color.a); - gl_FragData[2] = vec4(normalize(tnorm)*0.5+0.5, 0.0); + gl_FragData[0] = vec4(col, 0.0); + gl_FragData[1] = gl_Color.aaaa; // spec + //gl_FragData[1] = vec4(vec3(gl_Color.a), gl_Color.a+(1.0-gl_Color.a)*gl_Color.a); // spec - from former class3 - maybe better, but not so well tested + vec3 nvn = normalize(tnorm); + gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0); } |