Changeset 3046 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

10/20/08 01:26:12 (16 years ago)

Author:

mattausch

Message:

added shader for forward shadin tree animation program

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Files:

• mrt.cg (modified) (1 diff)
• treeanimation.cg (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/mrt.cg

@@ -90 +90 @@
 
 
-pixel frag(fragin IN,  uniform float4x4 viewMatrix)
+pixel frag(fragin IN, uniform float4x4 viewMatrix)
 {
         pixel pix;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/treeanimation.cg

@@ -24 +24 @@
         //float4 color1: COLOR1;  
         float4 eyePos: TEXCOORD1; // eye position
-        float3 normal: TEXCOORD2;
+        float4 normal: TEXCOORD2;
 };
 
@@ -40 +40 @@
 {
         vtxout OUT;
-
-/*
-// Transform vertex position into homogenous clip-space.
-OUT.HPosition = mul(ModelViewProj, IN.Position);
-// Transform normal from model-space to view-space.
-float3 normalVec = normalize(mul(ModelViewIT,
-IN.Normal).xyz);
-// Store normalized light vector.
-float3 lightVec = normalize(LightVec.xyz);
-// Calculate half angle vector.
-float3 eyeVec = float3(0.0, 0.0, 1.0);
-float3 halfVec = normalize(lightVec + eyeVec);
-// Calculate diffuse component.
-float diffuse = dot(normalVec, lightVec);
-// Calculate specular component.
-float specular = dot(normalVec, halfVec);
-// Use the lit function to compute lighting vector from
-// diffuse and specular values.
-float4 lighting = lit(diffuse, specular, 32);
-// Blue diffuse material
-float3 diffuseMaterial = float3(0.0, 0.0, 1.0);
-// White specular material
-float3 specularMaterial = float3(1.0, 1.0, 1.0);
-// Combine diffuse and specular contributions and
-// output final vertex color.
-OUT.Color.rgb = lighting.y * diffuseMaterial +
-lighting.z * specularMaterial;
-OUT.Color.a = 1.0;
-return OUT;
-}
-*/
         OUT.texCoord = IN.texCoord;
                 
@@ -81 +50 @@
         OUT.position += float4(factor * windDir, 0);
 
-        OUT.normal = mul(glstate.matrix.invtrans.modelview[0], IN.normal);
+        OUT.normal = normalize(mul(glstate.matrix.invtrans.modelview[0], IN.normal));
+        //const float3 l = normalize(mul(glstate.matrix.modelview[0], float4(lightDir, 0))).xyz;
+        const float3 l = normalize(lightDir);
 
-        Out.color = IN.color * max(0, dot(OUT.normal, lightDir));
-        //OUT.color1 = IN.color1;
+        const float dif = max(.0f, dot(OUT.normal.xyz, l));
 
+        //OUT.color.xyz = IN.color.xyz * max(0, dot(OUT.normal.xyz, normalize(lightDir)));
+        OUT.color = glstate.material.ambient + glstate.material.front.diffuse * dif;
+        OUT.color.w = IN.color.w;
         return OUT;
 }
 
-/** vertex shader which conducts an simple tree animation
-        that bends the tree depending quadratically on the height
+/** vertex shader which provides an simple tree animation
+        that bends the tree depending quadratically on the height using vertex displacement.
         This version of the shader is used for deferred shading and thus only 
         displaces the vertices and outputs the color, put does not do any shading.
@@ -104 +77 @@
 
         OUT.color = IN.color;
-        //OUT.color1 = IN.color1;
-
         OUT.texCoord = IN.texCoord;