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

Timestamp:

09/04/08 15:00:42 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ +1 @@
+#include "SampleGenerator.h"
 #include "common.h"
-#include "SampleGenerator.h"
 
 
 using namespace std;
+using namespace CHCDemoEngine;
 
 HaltonSequence SphericalSampleGenerator::sHalton;
 HaltonSequence PoissonDiscSampleGenerator::sHalton;
-HaltonSequence GaussianSampleGenerator::sHalton;
 HaltonSequence PseudoRandomGenerator::sHalton;
 
@@ -32 +32 @@
         const float f_reduction = 0.9f;
 
-        static HaltonSequence halton;
+        //static HaltonSequence halton;
         float r[2];
 
         // generates poisson distribution on disc
-        float minDist = 2.0f / sqrt((float)mNumSamples);
+        float minDist = 2.0f * mRadius / sqrt((float)mNumSamples);
 
         //cout << "minDist before= " << minDist << endl;
@@ -51 +51 @@
                         ++ totalTries;
 
-                        halton.GetNext(2, r);
+                        r[0] = RandomValue(0, mRadius);
+                        r[1] = RandomValue(0, mRadius);
+                        //halton.GetNext(2, r);
 
                         const float rx = r[0] * 2.0f - 1.0f;
@@ -57 +59 @@
 
                         // check if in disk, else exit early
-                        if (rx * rx + ry * ry > 1)
+                        if (rx * rx + ry * ry > mRadius * mRadius)
                                 continue;
 
@@ -86 +88 @@
                         }
                 }
-                
-                //cout << "sample: " << samples[i].x << " " << i << " " << samples[i].y << " r: " << sqrt(samples[i].x * samples[i].x  + samples[i].y * samples[i].y) << " tries: " << totalTries << endl;
-        }
-
-        //cout << "minDist after= " << minDist << endl;
-}
-
-
-
-GaussianSampleGenerator::GaussianSampleGenerator(int numSamples, float radius):
-SampleGenerator(numSamples, radius)
-{}
-
-
-void GaussianSampleGenerator::Generate(float *samples) const
-{
-        float r[2];
-
-        const float sigma = mRadius;
-
-        Sample2 *s = (Sample2 *)samples;
-
-        const float p0 = 1.0f / (sigma * sqrt(2.0f * M_PI));
-        const float p1 = 1.0f / (sigma * sqrt(2.0f * M_PI));
-
-        for (int i = 0; i < mNumSamples; ++ i)
-        {
-                sHalton.GetNext(2, r);
-
-                float exp_x = -(r[0] * r[0]) / (2.0f * sigma * sigma);
-                float exp_y = -(r[1] * r[1]) / (2.0f * sigma * sigma);
-
-                s[i].x = p0 * pow(M_E, exp_x);
-                s[i].y = p1 * pow(M_E, exp_y);
         }
 
@@ -133 +101 @@
 void PseudoRandomGenerator::Generate(float *samples) const
 {
-        sHalton.GetNext(2 * mNumSamples, samples);
+        Sample2 *s = (Sample2 *)samples;
+
+        int numSamples = 0;
+
+        while (numSamples < mNumSamples)
+        {
+                const float rx = RandomValue(-mRadius, +mRadius);
+                const float ry = RandomValue(-mRadius, +mRadius);
+
+                // check if in disk, else exit early
+                if (rx * rx + ry * ry > mRadius * mRadius)
+                        continue;
+
+                s[numSamples].x = rx;
+                s[numSamples].y = ry;
+
+                ++ numSamples;
+        }
 }
 
@@ -146 +131 @@
         float r[2];
         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)
         {
-                sHalton.GetNext(2, r);
+                r[0] = RandomValue(0, 1);
+                r[1] = RandomValue(0, 1);
+                //sHalton.GetNext(2, r);
                 //r[0] = pSamples[i].x; r[1] = pSamples[i].y;