Changeset 3221

Timestamp:

12/10/08 17:35:24 (15 years ago)

Author:

mattausch

Message:

added some statistics stuff, but ssao slower than before (probably because made ssao width and intensity variable and not hardcoded anymore) from >180 frames to < 130 frames!!!

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/SampleGenerator.cpp (modified) (1 diff)
• src/StatsWriter.cpp (added)
• src/StatsWriter.h (added)
• src/chcdemo.cpp (modified) (5 diffs)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/ssao.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -260 +260 @@
                         </File>
                         <File
+                                RelativePath=".\src\StatsWriter.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\StatsWriter.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\WalkThroughRecorder.cpp"
                                 >

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

@@ -29 +29 @@
         // the solution is a possion sampling with respect to the adjusted min distance
         // better solutions have been proposed, i.e., using hierarchical sampling
-        const float maxTries = 1000;
+        const int maxTries = 1000;
         const float f_reduction = 0.9f;
 

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

@@ -1009 +1009 @@
 void MainLoop() 
 {       
-#if TODO
-        GPUProgramParameters *vtxParams = 
-                buddha->GetShape(0)->GetMaterial()->GetTechnique(1)->GetVertexProgramParameters();
-
         Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
         Vector3 buddhaPos = motionPath->GetCurrentPosition();
@@ -1019 +1015 @@
         buddha->GetTransform()->SetMatrix(trafo);
 
+#if TODO
         /*for (int i = 0; i < 10; ++ i)
         {
@@ -1030 +1027 @@
                 }
         }*/
+#endif
+
+
+        /////////////////////////
+        //-- update animations
 
         Matrix4x4 rotMatrix = RotationZMatrix(M_PI * 1e-3f);
         dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
-
-        /////////////////////////
-        //-- update animations
-        
         motionPath->Move(0.01f);
 
-#endif
+
 
 
@@ -1225 +1223 @@
 
         // if no lense flare => just set sun to invisible
-        int sunVisiblePixels = useLenseFlare  &&  useDeferred ? TestSunVisible() : 0;
+        const int sunVisiblePixels = useLenseFlare  &&  useDeferred ? TestSunVisible() : 0;
 
 
@@ -1236 +1234 @@
         RenderSky();
 
+
+        //////////////////////////////
 
         if (useDeferred)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-//#define NUM_SAMPLES 8
-#define NUM_SAMPLES 16
+#define NUM_SAMPLES 8
+//#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-//#define NUM_SAMPLES 96
+//#define NUM_SAMPLES 48
 
 #define DISTANCE_SCALE 1e-2f
@@ -58 +58 @@
 #define DYNAMIC_OBJECTS_THRESHOLD 1e-8f
 
+#define USE_GTX
 
 #endif // __SHADERENV_H

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

@@ -325 +325 @@
                 validSamples = max(validSamples, (1.0f - tooFarAway) * pixelValid);
 
-#ifdef USE_GTX
+#ifdef QWQ//USE_GTX
                 // we can bail out early and use a minimal #samples)
                 // if some conditions are met as long as the hardware supports it