[Performous-commit] Lasse Karkkainen : Correct order for vertex color vs. lighting.

[Lasse Kärkkäi. <tr...@us...>]

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Feb 28 01:43:32 2011 +0100

Correct order for vertex color vs. lighting.

---

 data/shaders/core.frag |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/shaders/core.frag b/data/shaders/core.frag
index 7a3f7a1..78a3c87 100644
--- a/data/shaders/core.frag
+++ b/data/shaders/core.frag
@@ -28,6 +28,10 @@ uniform sampler2D tex;
 void main() {
 	vec4 frag = TEXFUNC;
 
+#ifdef ENABLE_VERTEX_COLOR
+	frag *= color;
+#endif
+
 #ifdef ENABLE_LIGHTING
 	vec3 lightDir = normalize(vec3(-50.0, 5.0, -15.0));
 	const vec3 ambient = vec3(0.1, 0.1, 0.1);
@@ -35,9 +39,7 @@ void main() {
 	float NdotL = max(dot(normalize(normal), lightDir), 0.0);
 	frag = vec4(ambient + frag.rgb * NdotL, frag.a);
 #endif
-#ifdef ENABLE_VERTEX_COLOR
-	frag *= color;
-#endif
+
 	gl_FragColor = colorMatrix * frag;
 }