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

Timestamp:

04/13/09 12:01:13 (15 years ago)

Author:

mattausch

Message:

working really nicely

File:

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

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

@@ -41 +41 @@
         // the maximal possible radius: our radius is a fraction of this radius
         // this is used as a measure of the quality of distribution of the point samples
-        const float rmax = 2.0f * mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        //const float rmax = 2.0f * mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        float rmax = 0.5f; //mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
 
         // generates poisson distribution on disc
         // start with some thresholds: all samples lie on the circumference of circle
          
-        float minDist = 2.0f * rmax;
+        //float minDist = 2.0f * rmax;
+        float minDist = rmax;
         float sqrMinDist = minDist * minDist;
 
         int tries = 0;
 
-        cout << "minDist before= " << minDist << endl;
+        //cout << "minDist before= " << minDist / rmax << endl;
+        cout << "minDist before= " << rmax << endl;
+
         Sample2 *s = (Sample2 *)samples;
 
@@ -124 +128 @@
         }
 
-        cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
+        rmax = mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        cout << "minDist after= " << (float)minDist * mNumSamples << " #tries: " << tries << " samples: " << mNumSamples << endl;
+        cout << "minDist after= " << (float)minDist / rmax << " #tries: " << tries << endl;
 }
 
@@ -225 +231 @@
 
 
-QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, float radius):
+QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, 
+                                                                                                                           float radius):
 //PoissonDiscSampleGenerator2D(numSamples, radius)
 RandomSampleGenerator2D(numSamples, radius)
-{}
+{
+}
 
 
@@ -237 +245 @@
         int numSamples = 0;
         float x[2];
-
-        static float total1 = 0;
-        static float total2 = 0;
-        static int totalSamples = 0;
 
         for (int i = 0; i < mNumSamples; ++ i)