Changeset 2283 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

03/23/07 01:40:24 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• VspBspTree.cpp (modified) (4 diffs)
• VssPreprocessor.cpp (modified) (1 diff)

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

@@ -1778 +1778 @@
                 {
                         const int randIdx = 
-                                (int)RandomValue(0, (Real)((int)data.mPolygons->size() - 1));
+                                (int)RandomValue(0, (Real)((float)data.mPolygons->size() - 0.5f));
                         Polygon3 *nextPoly = (*data.mPolygons)[randIdx];
 
@@ -1814 +1814 @@
                 // swap candidate to the end to avoid testing same plane
                 std::swap((*data.mPolygons)[maxIdx], (*data.mPolygons)[candidateIdx]);
-                //Polygon3 *poly = (*data.mPolygons)[(int)RandomValue(0, (int)polys.size() - 1)];
-
+        
                 // evaluate current candidate
                 BspNodeGeometry fGeom, bGeom;
@@ -1895 +1894 @@
 Plane3 VspBspTree::ChooseCandidatePlane(const RayInfoContainer &rays) const
 {
-        const int candidateIdx = (int)RandomValue(0, (Real)((int)rays.size() - 1));
+        const int candidateIdx = (int)RandomValue(0, (Real)((float)rays.size() - 0.5f));
 
         const Vector3 minPt = rays[candidateIdx].ExtrapOrigin();
@@ -2103 +2102 @@
         {
                 const int testIdx = useRand ? 
-                        (int)RandomValue(0, (Real)((int)data.mRays->size() - 1)) : i;
+                        (int)RandomValue(0, (Real)((float)data.mRays->size() - 0.5f)) : i;
                 RayInfo rayInf = (*data.mRays)[testIdx];
 

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

@@ -283 +283 @@
                 Intersectable *sourceObj = mObjects[5];
 
-                const int index = (int)RandomValue(0, (Real)((int)leaves.size() - 1));
+                const int index = (int)RandomValue(0, (Real)((float)leaves.size() - 0.5f));
                 VssTreeLeaf *leaf = leaves[index];