ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/fsh.cg
(Generate patch)

Comparing libgender/fsh.cg (file contents):
Revision 1.15 by root, Wed Oct 6 09:41:48 2004 UTC vs.
Revision 1.17 by root, Wed Oct 6 14:37:34 2004 UTC

… …
3 float4 TexCoord : TEXCOORD0; 3 float4 TexCoord : TEXCOORD0;
4 float3 LightVec : TEXCOORD1; 4 float3 LightVec : TEXCOORD1;
5 float3 EyeVec : TEXCOORD2; 5 float3 EyeVec : TEXCOORD2;
6 float3 WorldNormal : TEXCOORD3; 6 float3 WorldNormal : TEXCOORD3;
7 float3 WorldView : TEXCOORD4; 7 float3 WorldView : TEXCOORD4;
8 float3 test1 : TEXCOORD5;
9 float3 test2 : TEXCOORD6;
8}; 10};
9 11
10struct pixelOut { 12struct pixelOut {
11 float4 col : COLOR; 13 float4 col : COLOR;
12}; 14};
… …
14pixelOut main(vertexOut IN, uniform sampler2D Texture) 16pixelOut main(vertexOut IN, uniform sampler2D Texture)
15{ 17{
16 pixelOut OUT; 18 pixelOut OUT;
17 19
18 half SpecExpon = 200; 20 half SpecExpon = 200;
19 float4 AmbiColor = { 0.5, 0.5, 0.5, 1.0 }; 21 float4 AmbiColor = { 0.1, 0.1, 0.1, 1.0 };
20 float4 LightColor = { 1, 1, 1, 1 }; 22 float4 LightColor = { 1, 1, 1, 1 };
21 float4 diffuse_color = tex2D (Texture, IN.TexCoord.xy); 23 float4 diffuse_color = tex2D (Texture, IN.TexCoord.xy);
22 24
23 half3 Ln = normalize (IN.LightVec); 25 half3 Ln = normalize (IN.LightVec);
24 half3 Nn = normalize (IN.WorldNormal); 26 half3 Nn = normalize (IN.WorldNormal);
… …
27 half3 Hn = normalize (Ln + Vn); 29 half3 Hn = normalize (Ln + Vn);
28 half ldn = dot (Ln, Nn); 30 half ldn = dot (Ln, Nn);
29 half hdn = dot (Hn, Nn); 31 half hdn = dot (Hn, Nn);
30 32
31 half4 litV = lit (ldn, hdn, SpecExpon); 33 half4 litV = lit (ldn, hdn, SpecExpon);
32 //half4 diffContrib = glstate.material.diffuse * (litV.y * LightColor + glstate.lightmodel.ambient); 34 half4 diffContrib = diffuse_color * (litV.y * LightColor + glstate.lightmodel.ambient);
33 //half4 specContrib = litV.y * litV.z * LightColor; 35 half4 specContrib = litV.y * litV.z * LightColor;
34 //half4 result = diffContrib + specContrib; 36 half4 result = diffContrib + specContrib;
35 half4 result = diffuse_color * litV.y + LightColor * litV.z; 37 //half4 result = diffuse_color * litV.y + LightColor * litV.z;
36 // half4 result = AmbiColor + glstate.material.diffuse * litV.y + LightColor * litV.z;
37 38
38 OUT.col = result; 39 OUT.col = result;
39 return OUT; 40 return OUT;
40} 41}
41 42

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines