Changeset 660 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

02/21/06 17:42:39 (18 years ago)

Author:

mattausch

Message:

adding function for testing purpose

File:

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

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

@@ -129 +129 @@
         environment->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
         environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
+
+        char subdivisionStatsLog[100];
+        environment->GetStringValue("BspTree.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
 
 
@@ -556 +560 @@
                                                           geom);
 
+        // compute first split candidate
         VspBspSplitCandidate splitCandidate;
-
-
         EvalSplitCandidate(tData, splitCandidate);
 
@@ -820 +823 @@
                 VspBspTraversalData tBackData;
 
-#if OCTREE_HACK
-                //Debug << "new axis:" << (tData.mAxis + 1) % 3 << endl;
-                tFrontData.mAxis = (tData.mAxis + 1) % 3;
-                tBackData.mAxis = (tData.mAxis + 1) % 3;
-#endif
                 //-- continue subdivision
                 // create new interior node and two leaf node
@@ -831 +829 @@
                 newNode = SubdivideNode(splitPlane, tData, tFrontData, tBackData, coincident);
                 
-#if 0 // TODO
+                const int splitAxis = splitCandidate.mSplitAxis;
+                const int maxCostMisses = splitCandidate.mMaxCostMisses;
+
                 if (splitAxis < 3)
                         ++ mBspStats.splits[splitAxis];
@@ -838 +838 @@
 
                 tFrontData.mIsKdNode = tBackData.mIsKdNode = (tData.mIsKdNode && splitAxis < 3);
+                
                 // how often was max cost ratio missed in this branch?
                 tFrontData.mMaxCostMisses = maxCostMisses;
                 tBackData.mMaxCostMisses = maxCostMisses;
-
-#endif
+                
+
                 if (1)
                 {
@@ -936 +937 @@
 
         // compute locally best split plane
-        SelectPlane(splitData.mSplitPlane, leaf, tData, frontData, backData, splitAxis);
+        bool success = SelectPlane(splitData.mSplitPlane, leaf, tData, frontData, backData, splitAxis);
 
         // TODO: reuse
@@ -945 +946 @@
         splitData.mRenderCost = EvalRenderCostDecrease(splitData.mSplitPlane, tData);
         splitData.mParentData = tData;
+        splitData.mMaxCostMisses = success ? tData.mMaxCostMisses : tData.mMaxCostMisses + 1;
 }