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

Timestamp:

01/20/07 00:29:03 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -750 +750 @@
         Vector3 normal, normal2;
         
-        float r[1];
-        sHalton.GetNext(1, r);
-
-        const int objIdx = (int)(r[0] * (float)mPreprocessor.mObjects.size() - 1.0f);
-                                //      = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
-        Intersectable *object = mPreprocessor.mObjects[objIdx];
-
-        //cout << "obj: " << objIdx << endl;
-
-        object->GetRandomSurfacePoint(point, normal);
+        // 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];
+        sHalton.GetNext(2, r);
+
+        direction = UniformRandomVector(r[0], r[1]);
+        const float c = Magnitude(direction);
+
+    if (c <= Limits::Small) 
+                return false;
+
+        direction *= 1.0f / c;
+
+        // get point on view cell surface
         mViewCell->GetRandomSurfacePoint(origin, normal2);
 
-        direction = point - origin;
+        //direction = point - origin;
 
         // move a little bit back to avoid piercing through walls
@@ -769 +778 @@
 
         // $$ jb the pdf is yet not correct for all sampling methods!
-        const float c = Magnitude(direction);
-
-        if ((c <= Limits::Small) /*|| (DotProd(direction, normal) < 0)*/)
-        {
-                return false;
-        }
-
-        // $$ jb the pdf is yet not correct for all sampling methods!
         const float pdf = 1.0f;
 
-        direction *= 1.0f / c;
         ray = SimpleRay(origin, direction, VIEWCELL_BASED_DISTRIBUTION, pdf);