[ViewVC] Diff of: cvs/libgender/fsh.cg

Comparing libgender/fsh.cg (file contents):
Revision 1.13 by root, Wed Oct 6 00:33:42 2004 UTC vs.
Revision 1.17 by root, Wed Oct 6 14:37:34 2004 UTC

    float4 TexCoord    : TEXCOORD0;
    float3 LightVec    : TEXCOORD1;
    float3 EyeVec      : TEXCOORD2;
    float3 WorldNormal : TEXCOORD3;
    float3 WorldView   : TEXCOORD4;
+   float3 test1       : TEXCOORD5;
+   float3 test2       : TEXCOORD6;
 };
 struct pixelOut {
    float4 col : COLOR;
 };
-pixelOut main(vertexOut IN)
+pixelOut main(vertexOut IN, uniform sampler2D Texture)
 {
    pixelOut OUT;
    half SpecExpon = 200;
+   float4 AmbiColor = { 0.1, 0.1, 0.1, 1.0 };
    float4 LightColor = { 1, 1, 1, 1 };
+   float4 diffuse_color = tex2D (Texture, IN.TexCoord.xy);
    half3 Ln = normalize (IN.LightVec);
    half3 Nn = normalize (IN.WorldNormal);
    half3 Vn = normalize (IN.WorldView);
    half3 Hn = normalize (Ln + Vn);
    half ldn = dot (Ln, Nn);
    half hdn = dot (Hn, Nn);
    half4 litV = lit (ldn, hdn, SpecExpon);
-   //half4 diffContrib = glstate.material.diffuse * (litV.y * LightColor + glstate.lightmodel.ambient);
+   half4 diffContrib = diffuse_color * (litV.y * LightColor + glstate.lightmodel.ambient);
-   //half4 specContrib = litV.y * litV.z * LightColor;
+   half4 specContrib = litV.y * litV.z * LightColor;
-   //half4 result = diffContrib + specContrib;
+   half4 result = diffContrib + specContrib;
-   half4 result = glstate.material.diffuse * litV.y + LightColor * litV.z;
+   //half4 result = diffuse_color * litV.y + LightColor * litV.z;
    OUT.col = result;
    return OUT;
 }

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