Commit f65a68a4 authored by hybrid's avatar hybrid

Missing shader from Cg update, which was not committed in the last run.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4061 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 92d1b406
...@@ -22,7 +22,7 @@ struct VS_OUTPUT ...@@ -22,7 +22,7 @@ struct VS_OUTPUT
}; };
VS_OUTPUT vertexMain( in float4 vPosition : POSITION, VS_OUTPUT vertexMain(in float4 vPosition : POSITION,
in float3 vNormal : NORMAL, in float3 vNormal : NORMAL,
float2 texCoord : TEXCOORD0 ) float2 texCoord : TEXCOORD0 )
{ {
...@@ -32,7 +32,7 @@ VS_OUTPUT vertexMain( in float4 vPosition : POSITION, ...@@ -32,7 +32,7 @@ VS_OUTPUT vertexMain( in float4 vPosition : POSITION,
Output.Position = mul(vPosition, mWorldViewProj); Output.Position = mul(vPosition, mWorldViewProj);
// transform normal // transform normal
float3 normal = mul(vNormal, mInvWorld); float3 normal = mul(float4(vNormal,0.0), mInvWorld);
// renormalize normal // renormalize normal
normal = normalize(normal); normal = normalize(normal);
...@@ -58,7 +58,6 @@ VS_OUTPUT vertexMain( in float4 vPosition : POSITION, ...@@ -58,7 +58,6 @@ VS_OUTPUT vertexMain( in float4 vPosition : POSITION,
} }
// Pixel shader output structure // Pixel shader output structure
struct PS_OUTPUT struct PS_OUTPUT
{ {
...@@ -66,15 +65,15 @@ struct PS_OUTPUT ...@@ -66,15 +65,15 @@ struct PS_OUTPUT
}; };
sampler2D tex0; sampler2D myTexture;
PS_OUTPUT pixelMain( float2 TexCoord : TEXCOORD0, PS_OUTPUT pixelMain(float2 TexCoord : TEXCOORD0,
float4 Position : POSITION, float4 Position : POSITION,
float4 Diffuse : COLOR0 ) float4 Diffuse : COLOR0 )
{ {
PS_OUTPUT Output; PS_OUTPUT Output;
float4 col = tex2D( tex0, TexCoord ); // sample color map float4 col = tex2D( myTexture, TexCoord ); // sample color map
// multiply with diffuse and do other senseless operations // multiply with diffuse and do other senseless operations
Output.RGBColor = Diffuse * col; Output.RGBColor = Diffuse * col;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment