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

Timestamp:

05/21/08 01:18:40 (16 years ago)

Author:

mattausch

Message:

fixed several errors

File:

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

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

@@ -296 +296 @@
         Vector3 origin, direction; 
 
-        ViewCellContainer &viewCells = mPreprocessor.mViewCellsManager->GetViewCells();
+        //ViewCellContainer &viewCells = mPreprocessor.mViewCellsManager->GetViewCells();
 
         Vector3 point;
         Vector3 normal, normal2;
         
-        const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
+        //const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
         const int objIdx = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
 
         Intersectable *object = mPreprocessor.mObjects[objIdx];
-        ViewCell *viewCell = viewCells[vcIdx];
+        ViewCell *viewCell = mViewCell;//viewCells[vcIdx];
 
         object->GetRandomSurfacePoint(point, normal);
@@ -843 +843 @@
         Vector3 origin, direction; 
 
-        ViewCellContainer &viewCells = 
-                mPreprocessor.mViewCellsManager->GetViewCells();
-
         Vector3 point;
         Vector3 normal;
                 
-        //Vector normalObj;
-        // float r[1];
-        // sHalton.GetNext(1, r);
-        // const int objIdx = (int)(r[0] * (float)mPreprocessor.mObjects.size() - 1.0f);
-        // Intersectable *object = mPreprocessor.mObjects[objIdx];
-        // object->GetRandomSurfacePoint(point, normal);
-        // cout << "obj: " << objIdx << endl;
-
         float r[2];
+        //for (int i=0; i < 2; i++)
+        // r[i] = RandomValue(0, 1);
+
         sHalton.GetNext(2, r);
 
@@ -869 +861 @@
 
         // get point on view cell surface
-        mViewCell->GetRandomSurfacePoint(origin, normal);
+        if (0)
+        {
+                //mViewCell->GetRandomEdgePoint(origin, normal);
+                mViewCell->GetRandomSurfacePoint(origin, normal);
+
+                // move a little bit back to avoid piercing through walls
+                // that bound the view cell
+                if (0) origin -= 0.01f * normal;
+        }
+        else
+                origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
 
         //direction = point - origin;
-
-        // move a little bit back to avoid piercing through walls
-        // that bound the view cell
-        origin -= 0.01f * normal;
 
         // $$ jb the pdf is yet not correct for all sampling methods!