[Performous-commit] Tapio Vierros : Small fragment shader clean-ups.

[Tapio V. <aa...@us...>]

Module: performous
Branch: opengl2
Commit: 9922131f5ad16cdbdad233e6a22deeffb959ba02

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Nov  3 00:54:35 2010 +0200

Small fragment shader clean-ups.

---

 themes/default/shaders/3dobject.frag |    2 +-
 themes/default/shaders/core.frag     |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/themes/default/shaders/3dobject.frag b/themes/default/shaders/3dobject.frag
index cce3a8b..67c317e 100644
--- a/themes/default/shaders/3dobject.frag
+++ b/themes/default/shaders/3dobject.frag
@@ -17,7 +17,7 @@ void main()
 	} else if (texMode == 0) {
 		texel = vec4(1.0, 1.0, 1.0, 1.0);
 	} else {
-		texel = vec4(1.0, 0.0, 0.0, 1.0);
+		texel = vec4(1.0, 0.0, 1.0, 1.0); // Magenta to highlight
 	}
 
 	float NdotL = max(dot(normalize(normal), lightDir), 0.0);
diff --git a/themes/default/shaders/core.frag b/themes/default/shaders/core.frag
index 3d9b59b..fcf50ce 100644
--- a/themes/default/shaders/core.frag
+++ b/themes/default/shaders/core.frag
@@ -5,15 +5,16 @@ uniform sampler2DRect texRect;
 void main()
 {
 	vec4 texel;
-	vec4 color;
+
 	if (texMode == 1) {
 		texel = texture2D(tex, gl_TexCoord[0].st).rgba;
 	} else if (texMode == 2) {
 		texel = texture2DRect(texRect, gl_TexCoord[0].st).rgba;
 	} else if (texMode == 0) {
-		texel = gl_Color;
+		texel = vec4(1.0, 1.0, 1.0, 1.0);
 	} else {
-		texel = vec4(1.0,0.0,0.0,1.0);
+		texel = vec4(1.0, 0.0, 1.0, 1.0); // Magenta to highlight
 	}
-	gl_FragColor = vec4(texel.rgb*gl_Color.rgb, texel.a*gl_Color.a);
+
+	gl_FragColor = texel * gl_Color;
 }