diff Data/Shaders/TexturedQuad.fx @ 51:efd2b1ca5b77

Clean up gui
author koryspansel <koryspansel@bendbroadband.com>
date Tue, 27 Sep 2011 09:42:01 -0700
parents 7e3a0ae9c016
children
line wrap: on
line diff
--- a/Data/Shaders/TexturedQuad.fx	Fri Sep 23 17:58:17 2011 -0700
+++ b/Data/Shaders/TexturedQuad.fx	Tue Sep 27 09:42:01 2011 -0700
@@ -32,6 +32,27 @@
 };
 
 /*
+ * VertexInput1
+ */
+struct VertexInput1
+{
+	/*
+	 * Position
+	 */
+	float3 Position : POSITION0;
+
+	/*
+	 * TextureCoordinate
+	 */
+	float2 TextureCoordinate : TEXCOORD0;
+	
+	/*
+	 * Color
+	 */
+	float4 Color : COLOR0;
+};
+
+/*
  * VertexOutput
  */
 struct VertexOutput
@@ -48,6 +69,27 @@
 };
 
 /*
+ * VertexOutput1
+ */
+struct VertexOutput1
+{
+	/*
+	 * Position
+	 */
+	float4 Position : POSITION0;
+
+	/*
+	 * TextureCoordinate
+	 */
+	float2 TextureCoordinate : TEXCOORD0;
+	
+	/*
+	 * Color
+	 */
+	float4 Color : COLOR0;
+};
+
+/*
  * PixelInput
  */
 struct PixelInput
@@ -88,6 +130,20 @@
 }
 
 /*
+ * TexturedQuadVS
+ */
+VertexOutput1 TexturedQuadVS1(VertexInput1 kInput)
+{
+	VertexOutput1 kOutput;
+
+	kOutput.Position			= mul(float4(kInput.Position, 1.0f), kProjection);
+	kOutput.TextureCoordinate	= kInput.TextureCoordinate;
+	kOutput.Color				= kInput.Color;
+
+	return kOutput;
+}
+
+/*
  * TexturedQuadPS
  */
 PixelOutput TexturedQuadPS(PixelInput kInput)
@@ -102,6 +158,19 @@
 	return kOutput;
 }
 
+/*
+ * TexturedQuadPS
+ */
+PixelOutput TexturedQuadPS1(PixelInput kInput)
+{
+	PixelOutput kOutput;
+
+	float4 kTexture = tex2D(TextureSampler, kInput.TextureCoordinate);
+	kOutput.Color = float4(kTexture.rgb * kInput.Color.rgb, kTexture.a);
+
+	return kOutput;
+}
+
 technique Default
 {
 	pass Opaque
@@ -109,15 +178,31 @@
 		vertexShader		= compile vs_2_0 TexturedQuadVS();
 		pixelShader			= compile ps_2_0 TexturedQuadPS();
 
-		/*
-		ZEnable				= true;
-		ZWriteEnable		= true;
-		ZFunc				= LessEqual;
-		*/
+		//ZEnable				= true;
+		//ZWriteEnable		= true;
+		//ZFunc				= LessEqual;
 
 		AlphaBlendEnable	= true;
 		AlphaFunc			= LessEqual;
 		SrcBlend			= SrcAlpha;
 		DestBlend			= InvSrcAlpha;
 	}
-}
\ No newline at end of file
+}
+
+technique Color
+{
+	pass Opaque
+	{
+		vertexShader		= compile vs_2_0 TexturedQuadVS1();
+		pixelShader			= compile ps_2_0 TexturedQuadPS1();
+
+		ZEnable				= true;
+		ZWriteEnable		= true;
+		//ZFunc				= LessEqual;
+
+		AlphaBlendEnable	= true;
+		AlphaFunc			= LessEqual;
+		SrcBlend			= SrcAlpha;
+		DestBlend			= InvSrcAlpha;
+	}
+}