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

Timestamp:

12/22/08 16:07:19 (16 years ago)

Author:

mattausch

Message:

fast and cool
not using kernel for high convergence

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SampleGenerator.cpp (modified) (6 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);
-
 
 SampleGenerator::SampleGenerator(int numSamples, float radius):
 mNumSamples(numSamples), mRadius(radius)
-{}
+{
+        mHalton = new HaltonSequence(2);
+}
+
+
+SampleGenerator::~SampleGenerator()
+{
+        DEL_PTR(mHalton);
+}
 
 
 PoissonDiscSampleGenerator2D::PoissonDiscSampleGenerator2D(int numSamples, float radius):
-SampleGenerator(numSamples, radius), sHalton(HaltonSequence(2))
+SampleGenerator(numSamples, radius)
 {}
 
@@ -58 +62 @@
 
                         // note: should use halton, but seems somewhat broken
-                        sHalton.GetNext(r);
+                        mHalton->GetNext(r);
 
                         // scale to -1 .. 1
@@ -106 +110 @@
 
 RandomSampleGenerator2D::RandomSampleGenerator2D(int numSamples, float radius):
-SampleGenerator(numSamples, radius), sHalton(HaltonSequence(2))
+SampleGenerator(numSamples, radius)
 {}
 
@@ -120 +124 @@
         while (numSamples < mNumSamples)
         {
-                sHalton.GetNext(r);
+                mHalton->GetNext(r);
                 
                 const float rx = r[0] * 2.0f - 1.0f;
@@ -165 +169 @@
 QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, float radius):
 PoissonDiscSampleGenerator2D(numSamples, radius)
-//SampleGenerator(numSamples, radius), 
-//sHalton(HaltonSequence(2)), 
-//mPoisson(PoissonDiscSampleGenerator2D(numSamples, radius))
 {}
 
@@ -179 +180 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                sHalton.GetNext(r);
+                mHalton->GetNext(r);
 
                 // create samples over disc: the sample density