Changeset 1370 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

09/14/06 18:55:38 (18 years ago)

Author:

mattausch

Message:

debugged global sorting, worked on object-viewspace subdivision

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (4 diffs)

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

@@ -527 +527 @@
 {
         const bool localTerminationCriteriaMet = (0
-                //|| ((int)data.mRays->size() <= mTermMinRays)
-                //|| (data.mPvs <= mTermMinPvs)
-                //|| (data.mProbability <= mTermMinProbability)
-                //|| (data.GetAvgRayContribution() > mTermMaxRayContribution)
-                //|| (data.mDepth >= mTermMaxDepth)
+                || ((int)data.mRays->size() <= mTermMinRays)
+                || (data.mPvs <= mTermMinPvs)
+                || (data.mProbability <= mTermMinProbability)
+                || (data.GetAvgRayContribution() > mTermMaxRayContribution)
+                || (data.mDepth >= mTermMaxDepth)
                 );
 
@@ -1335 +1335 @@
         int bestAxis = -1;
 
-        // if we use some kind of specialised fixed axis
+        // do we use some kind of specialised "fixed" axis?
     const bool useSpecialAxis = 
                 mOnlyDrivingAxis || mCirculatingAxis;
@@ -1369 +1369 @@
                         else
                         {
-                                //-- split plane position is spatial median
+                                //-- split plane position is spatial median                             
                                 nPosition[axis] = (box.Min()[axis] + box.Max()[axis]) * 0.5f;
                                 nCostRatio[axis] = EvalLocalSplitCost(tData,
@@ -1390 +1390 @@
         }
 
+        ////////////////////////////////
         //-- assign values of best split
+
         plane.mAxis = bestAxis;
-        plane.mPosition = nPosition[bestAxis]; // split plane position
+        // best split plane position
+        plane.mPosition = nPosition[bestAxis];
 
         pFront = nProbFront[bestAxis];