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

Timestamp:

10/19/08 00:29:45 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/treeanimation.cg (modified) (2 diffs)

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

@@ -8 +8 @@
         float4 position: POSITION;
         float3 normal: NORMAL;
-        float3 color: COLOR;
-        float2 texcoord: TEXCOORD0;
+        float4 color: COLOR;
+        float4 texCoord: TEXCOORD0;
 };
-
 
 // vtx output
 struct vtxout
 {
-        float4 position: POSITION; // eye space
+        float4 position: POSITION;
         float4 texCoord: TEXCOORD0;    
 
         float4 color: COLOR0;  
+        float4 eyePos: TEXCOORD1; // eye position
         float3 normal: TEXCOORD2;
-        float4 eyePos: TEXCOORD3;
 };
-
 
 
@@ -34 +32 @@
                                   uniform float3 windDir,
                                   uniform float windStrength,
-                                  uniform float2 minmaxPos,
+                                  uniform float frequency,
+                                  uniform float2 minMaxPos,
                                   uniform float timer)
 {
         vtxout OUT;
 
-        OUT.color = IN.color;
+        OUT.color = float4(0);//IN.color;
         OUT.texCoord = IN.texCoord;
+                
+        const float pos = (minMaxPos.x - IN.position.z) / (minMaxPos.x - minMaxPos.y);
+
+        float factor = pos * windStrength * sin(timer * frequency);
+
+        // transform the vertex position into post projection space
+        OUT.position = mul(glstate.matrix.mvp, IN.position);
+        // displace the input position
+        OUT.position += float4(factor * windDir, 0);
+
         // transform the vertex position into eye space
         OUT.eyePos = mul(glstate.matrix.modelview[0], IN.position);
-        
-        const float pos = (minmaxPos.x - IN.position.y / (minmaxPos.x - minmaxPos.y);
-
-        float factor = windStrength * sin(timer);
-
-        // displace the input position
-        float4 newPos = IN.position + float4(factor * windDir, 0.0f);
-        // transform the vertex position into post projection space
-        OUT.position = mul(glstate.matrix.mvp, IN.position);
+        OUT.eyePos += float4(factor * windDir, 0);
 
         OUT.normal = IN.normal;