[Quake2world-dev] r179 - quake2world-data/trunk/target/default/shaders

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-02-15 01:05:36 +0000 (Sun, 15 Feb 2009)
New Revision: 179

Modified:
   quake2world-data/trunk/target/default/shaders/default_fs.glsl
   quake2world-data/trunk/target/default/shaders/default_vs.glsl
   quake2world-data/trunk/target/default/shaders/light_fs.glsl
   quake2world-data/trunk/target/default/shaders/light_vs.glsl
   quake2world-data/trunk/target/default/shaders/pro_vs.glsl
Log:
Shader changes that go along with r178.

Modified: quake2world-data/trunk/target/default/shaders/default_fs.glsl
===================================================================
--- quake2world-data/trunk/target/default/shaders/default_fs.glsl	2009-02-15 01:04:06 UTC (rev 178)
+++ quake2world-data/trunk/target/default/shaders/default_fs.glsl	2009-02-15 01:05:36 UTC (rev 179)
@@ -63,4 +63,19 @@
 	if(FOG > 0)
 		FogFragment();
 #endif
+
+// developer tools
+#if r_lightmap
+	if(LIGHTMAP > 0){
+		gl_FragColor.rgb = lightmap;
+		gl_FragColor.a = 1.0;
+	}
+#endif
+
+#if r_deluxemap
+	if(BUMPMAP > 0){
+		gl_FragColor.rgb = deluxemap;
+		gl_FragColor.a = 1.0;
+	}
+#endif
 }

Modified: quake2world-data/trunk/target/default/shaders/default_vs.glsl
===================================================================
--- quake2world-data/trunk/target/default/shaders/default_vs.glsl	2009-02-15 01:04:06 UTC (rev 178)
+++ quake2world-data/trunk/target/default/shaders/default_vs.glsl	2009-02-15 01:05:36 UTC (rev 179)
@@ -22,8 +22,6 @@
 
 	if(LIGHTMAP > 0)
 		gl_TexCoord[1] = gl_MultiTexCoord1;
-	else
-		gl_FrontColor = gl_Color;
 
 	LightVertex();
 

Modified: quake2world-data/trunk/target/default/shaders/light_fs.glsl
===================================================================
--- quake2world-data/trunk/target/default/shaders/light_fs.glsl	2009-02-15 01:04:06 UTC (rev 178)
+++ quake2world-data/trunk/target/default/shaders/light_fs.glsl	2009-02-15 01:05:36 UTC (rev 179)
@@ -159,6 +159,6 @@
 	// now modulate the diffuse sample with the modified lightmap
 	gl_FragColor.rgb = diffuse.rgb * (lightmap + light);
 
-	// lastly pass the alpha value through, unaffected
-	gl_FragColor.a = diffuse.a;
+	// lastly modulate the alpha channel by the color
+	gl_FragColor.a = diffuse.a * gl_Color.a;
 }

Modified: quake2world-data/trunk/target/default/shaders/light_vs.glsl
===================================================================
--- quake2world-data/trunk/target/default/shaders/light_vs.glsl	2009-02-15 01:04:06 UTC (rev 178)
+++ quake2world-data/trunk/target/default/shaders/light_vs.glsl	2009-02-15 01:05:36 UTC (rev 179)
@@ -12,4 +12,7 @@
 	// pass the interpolated normal and position along
 	normal = normalize(gl_NormalMatrix * gl_Normal);
 	point = vec3(gl_ModelViewMatrix * gl_Vertex);
+
+	// pass the color through as well
+	gl_FrontColor = gl_Color;
 }

Modified: quake2world-data/trunk/target/default/shaders/pro_vs.glsl
===================================================================
--- quake2world-data/trunk/target/default/shaders/pro_vs.glsl	2009-02-15 01:04:06 UTC (rev 178)
+++ quake2world-data/trunk/target/default/shaders/pro_vs.glsl	2009-02-15 01:05:36 UTC (rev 179)
@@ -17,8 +17,6 @@
 	// pass any active texunits through
 	if(DIFFUSE > 0)
 		gl_TexCoord[0] = gl_MultiTexCoord0;
-	else
-		gl_FrontColor = gl_Color;
 
 	LightVertex();