summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-30 09:45:44 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-30 09:45:44 +0100
commit94067a94c170fc2530d6868979318fa5adf8014e (patch)
tree630e77ab8c9a5b9ee823bdc1707a97ad3b650dc1
parent3e55def4e29e56b3c71f16af73059f2caf019e2e (diff)
EXT-7149 objects with white color and varied texture do not appear shiny with deferred rendering
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
index 5895ebda84..59b1720578 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
@@ -11,8 +11,9 @@ varying vec3 vary_normal;
void main()
{
- vec3 col = texture2D(diffuseMap, gl_TexCoord[0].xy).rgb;
- gl_FragData[0] = vec4(gl_Color.rgb*col, 0.0);
- gl_FragData[1] = vec4(col*(gl_Color.a*1.5), gl_Color.a);
+ vec3 col = gl_Color.rgb * texture2D(diffuseMap, gl_TexCoord[0].xy).rgb;
+ gl_FragData[0] = vec4(col, 0.0);
+ gl_FragData[1] = vec4(gl_Color.aaa*1.5, gl_Color.a); // 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
gl_FragData[2] = vec4(normalize(vary_normal)*0.5+0.5, 0.0);
}