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

Timestamp:

09/03/08 22:40:35 (16 years ago)

Author:

mattausch

Message:

changed to real 3d samples which are then projected to texture space

File:

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

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

@@ -17 +17 @@
 
 
-void PoissonDiscSampleGenerator::Generate(Sample2 *samples) const
+void PoissonDiscSampleGenerator::Generate(float *samples) const
 {
         // this is a hacky poisson sampling generator which does random dart-throwing
@@ -35 +35 @@
 
         //cout << "minDist before= " << minDist << endl;
+        Sample2 *s = (Sample2 *)samples;
 
         for (int i = 0; i < mNumSamples; ++ i)
@@ -61 +62 @@
                         {
                                 const float dist = 
-                                        sqrt((samples[j].x - rx) * (samples[j].x - rx) +
-                                             (samples[j].y - ry) * (samples[j].y - ry));
+                                        sqrt((s[j].x - rx) * (s[j].x - rx) +
+                                             (s[j].y - ry) * (s[j].y - ry));
                         
                                 if (dist < minDist)
@@ -70 +71 @@
                         if (sampleValid)
                         {
-                                samples[i].x = rx;
-                                samples[i].y = ry;
+                                s[i].x = rx;
+                                s[i].y = ry;
                                 break;
                         }
@@ -95 +96 @@
 
 
-void GaussianSampleGenerator::Generate(Sample2 *samples) const
+void GaussianSampleGenerator::Generate(float *samples) const
 {
         static HaltonSequence halton;
@@ -101 +102 @@
 
         const float sigma = mRadius;
+
+        Sample2 *s = (Sample2 *)samples;
 
         const float p0 = 1.0f / (sigma * sqrt(2.0f * M_PI));
@@ -112 +115 @@
                 float exp_y = -(r[1] * r[1]) / (2.0f * sigma * sigma);
 
-                samples[i].x = p0 * pow(M_E, exp_x);
-                samples[i].y = p1 * pow(M_E, exp_y);
+                s[i].x = p0 * pow(M_E, exp_x);
+                s[i].y = p1 * pow(M_E, exp_y);
         }
 
@@ -125 +128 @@
 
 
-
-
-void SphericalSampleGenerator::Generate(Sample2 *samples) const
+void SphericalSampleGenerator::Generate(float *samples) const
 {
         static HaltonSequence halton;
         float r[2];
+
+        Sample3 *s = (Sample3 *)samples;
 
         for (int i = 0; i < mNumSamples; ++ i)
@@ -137 +140 @@
 
                 // create stratified samples over sphere
-                const float rx = r[0];
-                const float ry = r[1];
+                const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
+                const float phi = 2.0f * M_PI * r[1];
 
-                const float theta = 2.0f * acos(sqrt(1.0f - rx));
-                const float phi = 2.0f * M_PI * ry;
-
-                float x = sin(theta) * cos(phi);
-                float y = sin(theta) * sin(phi);
-                float z = cos(theta);
-
-                // project to disc
-                samples[i].x = x / z;
-                samples[i].y = y / z;
+                s[i].x = sin(theta) * cos(phi);
+                s[i].y = sin(theta) * sin(phi);
+                s[i].z = cos(theta);
         }
 }