Changeset 2853 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

08/19/08 16:36:13 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (6 diffs)

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

@@ -31 +31 @@
 #include "Halton.h"
 #include "Transform3.h"
+#include "SampleGenerator.h"
 
 
@@ -188 +189 @@
 bool useFullScreen = false;
 
-float expFactor = 0.1f;
+// exp factor for ssao
+float expFactor = 0.05f;
 
 // ssao number of samples
@@ -376 +378 @@
         glutInitWindowSize(winWidth, winHeight);
         glutInit(&argc, argv);
-        //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
+        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
+        //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
 
         //glutInitDisplayString("samples=2");
@@ -2041 +2043 @@
         bool validIntersect = sceneQuery->CalcIntersection(playerPos);
 
-        if (validIntersect ) 
+        if (validIntersect) 
                 // && ((playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
         {
@@ -2271 +2273 @@
 void GenerateSamples()
 {
-        static HaltonSequence halton;
+        /*static HaltonSequence halton;
 
         float r[2];
@@ -2328 +2330 @@
                         }
                 }
-                //cout << "sample: " << samples[i] << " " << i / 2 << " " << samples[i + 1] << " r: " << sqrt(samples[i] * samples[i]  + samples[i + 1] * samples[i + 1]) << " tries: " << totalTries << endl;
-        }
-
-        //cout << "minDist after= " << minDist << endl;
+        }
+*/
+
+        static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
+        poisson.Generate((Sample2 *)samples);
 }