Changeset 1898 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

Timestamp:

12/15/06 17:29:45 (18 years ago)

Author:

mattausch

Message:

removed bug in sampling strategy

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

@@ -9 +9 @@
 namespace GtpVisibilityPreprocessor {
 
+HaltonSequence SamplingStrategy::sHalton;
 
 SamplingStrategy::SamplingStrategy(Preprocessor &preprocessor): 
@@ -73 +74 @@
   
   float r[5];
-  mHalton.GetNext(5, r);
+  sHalton.GetNext(5, r);
   
   mPreprocessor.mViewCellsManager->GetViewPoint(origin,
@@ -81 +82 @@
   Vector3 point, normal;
   
-  r[0] *= mPreprocessor.mObjects.size()-1;
+  r[0] *= (float)mPreprocessor.mObjects.size() - 1;
   const int i = (int)r[0];
   
@@ -115 +116 @@
 
   float r[4];
-  mHalton.GetNext(4, r);
+  sHalton.GetNext(4, r);
 
   r[0] *= mPreprocessor.mObjects.size()-1;
@@ -191 +192 @@
 
   float r[6];
-  mHalton.GetNext(6, r);
+  sHalton.GetNext(6, r);
   mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0],r[1],r[2]));
   
@@ -415 +416 @@
   for (i=0; i < tries; i++) {
         float r[4];
-        mHalton.GetNext(4, r);
+        sHalton.GetNext(4, r);
         
         origin = center + (radius*UniformRandomVector(r[0], r[1]));
@@ -487 +488 @@
 {
   float r;
-  mHalton.GetNext(1, &r);
+  sHalton.GetNext(1, &r);
 
   // pickup a distribution