Changeset 3229

Timestamp:

12/22/08 11:10:27 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• SampleGenerator.cpp (modified) (5 diffs)
• SampleGenerator.h (modified) (4 diffs)

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

@@ -6 +6 @@
 using namespace CHCDemoEngine;
 
-HaltonSequence PoissonDiscSampleGenerator2D::sHalton(2);
-HaltonSequence RandomSampleGenerator2D::sHalton(2);
-HaltonSequence QuadraticDiscSampleGenerator2D::sHalton(2);
+//HaltonSequence PoissonDiscSampleGenerator2D::sHalton(2);
+//HaltonSequence RandomSampleGenerator2D::sHalton(2);
+//HaltonSequence QuadraticDiscSampleGenerator2D::sHalton(2);
 
 
@@ -17 +17 @@
 
 PoissonDiscSampleGenerator2D::PoissonDiscSampleGenerator2D(int numSamples, float radius):
-SampleGenerator(numSamples, radius)
+SampleGenerator(numSamples, radius), sHalton(HaltonSequence(2))
 {}
 
@@ -106 +106 @@
 
 RandomSampleGenerator2D::RandomSampleGenerator2D(int numSamples, float radius):
-SampleGenerator(numSamples, radius)
+SampleGenerator(numSamples, radius), sHalton(HaltonSequence(2))
 {}
 
@@ -164 +164 @@
 
 QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, float radius):
-SampleGenerator(numSamples, radius)
+PoissonDiscSampleGenerator2D(numSamples, radius)
+//SampleGenerator(numSamples, radius), 
+//sHalton(HaltonSequence(2)), 
+//mPoisson(PoissonDiscSampleGenerator2D(numSamples, radius))
 {}
 
@@ -185 +188 @@
 #else
 
-        static PoissonDiscSampleGenerator2D poisson(mNumSamples, 1.0f);
-        poisson.Generate(samples);
+        //static PoissonDiscSampleGenerator2D poisson(mNumSamples, 1.0f);
+        //poisson.Generate(samples);
+
+        PoissonDiscSampleGenerator2D::Generate(samples);
 
         Sample2 *s = (Sample2 *)samples;

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

@@ -57 +57 @@
 protected:
 
-        static HaltonSequence sHalton;
+        HaltonSequence &sHalton;
 };
 
@@ -75 +75 @@
 protected:
 
-        static HaltonSequence sHalton;
+        HaltonSequence &sHalton;
 };
 
@@ -83 +83 @@
         with the distance
 */
-class QuadraticDiscSampleGenerator2D: public SampleGenerator
+class QuadraticDiscSampleGenerator2D: public PoissonDiscSampleGenerator2D
 {
 public:
@@ -93 +93 @@
 protected:
 
-        static HaltonSequence sHalton;
+        //PoissonDiscSampleGenerator2D &mPoisson;
+        //HaltonSequence &sHalton;
 };