Changeset 3116

Timestamp:

11/11/08 00:46:01 (16 years ago)

Author:

mattausch

Message:

tree animation works somehow with flow vector

Location:

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

Files:

• ShaderManager.cpp (modified) (2 diffs)
• ShaderProgram.cpp (modified) (2 diffs)
• shaders/treeanimation.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderManager.cpp

@@ -48 +48 @@
                 printf("Cg error, exiting...\n");
 
-                Debug << "\n" << cgGetErrorString(lastError) << endl;
-                Debug << "\n" << cgGetLastListing(sCgContext) << endl;
+                //Debug << "\n" << cgGetErrorString(lastError) << endl;
+                //Debug << "\n" << cgGetLastListing(sCgContext) << endl;
 
                 printf("%s\n\n", cgGetErrorString(lastError));
@@ -123 +123 @@
         treeAnimProgMrt->AddParameter("minMaxPos", 3);
         treeAnimProgMrt->AddParameter("frequency", 4);
+        treeAnimProgMrt->AddParameter("oldTimer", 5);
 
         cout << "cg initialization successful" << endl;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderProgram.cpp

@@ -30 +30 @@
 
 GPUProgramParameters::GPUProgramParameters(ShaderProgram *p): 
-mProgram(p), 
-mTimerParam(-1),
-mViewDirParam(-1),
-mViewMatrixParam(-1),
-mLightDirParam(-1),
-mModelMatrixParam(-1),
-mOldModelMatrixParam(-1)
-{
+mProgram(p)
+{
+        Reset();
 }
 
 
 GPUProgramParameters::GPUProgramParameters(): 
-mProgram(NULL),
-mTimerParam(-1),
-mViewDirParam(-1),
-mViewMatrixParam(-1),
-mLightDirParam(-1),
-mModelMatrixParam(-1),
-mOldModelMatrixParam(-1)
-{
+mProgram(NULL)
+{
+        Reset();
 }
 
@@ -62 +52 @@
 
         mTimerParam = -1;
+        mOldTimerParam = -1;
         mViewDirParam = -1;
         mLightDirParam = -1;

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

@@ -85 +85 @@
                 
         const float pos = (minMaxPos.x - IN.position.z) / (minMaxPos.x - minMaxPos.y);
+
         float factor = pos * pos * windStrength * sin(timer * frequency);
+        const float4 offs = float4(factor * windDir, 0);
 
-        const float4 offs = float4(factor * windDir, 0);
+        float oldFactor = pos * pos * windStrength * sin(oldTimer * frequency);
+        const float4 oldOffs = float4(oldFactor * windDir, 0);
 
         // transform the vertex position into post projection space
@@ -101 +104 @@
         
         // hack: no translational component anyway
-        OUT.oldWorldPos = float4(.0f);
+        OUT.oldWorldPos = oldOffs;
         OUT.worldPos = offs;