Changeset 2901 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SampleGenerator.cpp

Timestamp:

09/04/08 10:14:18 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SampleGenerator.cpp (modified) (4 diffs)

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

@@ -1 +1 @@
 #include "common.h"
 #include "SampleGenerator.h"
-#include "Halton.h"
+
 
 using namespace std;
 
-//SampleGenerator::SampleGenerator() {}
+HaltonSequence SphericalSampleGenerator::sHalton;
+HaltonSequence PoissonDiscSampleGenerator::sHalton;
+HaltonSequence GaussianSampleGenerator::sHalton;
+
 
 SampleGenerator::SampleGenerator(int numSamples, float radius):
@@ -98 +101 @@
 void GaussianSampleGenerator::Generate(float *samples) const
 {
-        static HaltonSequence halton;
         float r[2];
 
@@ -110 +112 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                halton.GetNext(2, r);
+                sHalton.GetNext(2, r);
 
                 float exp_x = -(r[0] * r[0]) / (2.0f * sigma * sigma);
@@ -130 +132 @@
 void SphericalSampleGenerator::Generate(float *samples) const
 {
-        static HaltonSequence halton;
         float r[2];
+        Sample3 *s = (Sample3 *)samples;
 
-        Sample3 *s = (Sample3 *)samples;
+        // idea: use poisson distribution to generate samples
+        PoissonDiscSampleGenerator poisson(mNumSamples, 1.0f);
+        Sample2 *pSamples = new Sample2[mNumSamples];
+
+        poisson.Generate((float *)pSamples);
 
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                halton.GetNext(2, r);
+                //sHalton.GetNext(2, r);
+                r[0] = pSamples[i].x; r[1] = pSamples[i].y;
 
                 // create stratified samples over sphere
                 const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
                 const float phi = 2.0f * M_PI * r[1];
+ 
+                s[i].x = mRadius * sin(theta) * cos(phi);
+                s[i].y = mRadius * sin(theta) * sin(phi);
+                s[i].z = mRadius * cos(theta);
+        }
 
-                s[i].x = sin(theta) * cos(phi);
-                s[i].y = sin(theta) * sin(phi);
-                s[i].z = cos(theta);
-        }
+        delete [] pSamples;
 }