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

Timestamp:

08/28/06 03:42:51 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -672 +672 @@
 
                 // cost ratio of cost decrease / totalCost
-                float costRatio = splitCandidate.GetPriority() / mTotalCost;
+                float costRatio = splitCandidate.mRenderCostDecr / mTotalCost;
 
                 //Debug << "cost ratio: " << costRatio << endl;
-
                 if (costRatio < mTermMinGlobalCostRatio)
                         ++ mGlobalCostMisses;
@@ -1041 +1040 @@
 
 
-/*
-void VspBspTree::EvalSubdivisionCandidate(VspBspTraversalData &tData,
-                                                                        VspBspSubdivisionCandidate &splitData)
+void VspBspTree::EvalSubdivisionCandidate(VspBspSubdivisionCandidate &splitCandidate)
 {
         VspBspTraversalData frontData;
         VspBspTraversalData backData;
-
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
-
+        
+        BspLeaf *leaf = dynamic_cast<BspLeaf *>(splitCandidate.mParentData.mNode);
+        
         // compute locally best split plane
-    bool success = SelectPlane(splitData.mSplitPlane, leaf, tData, 
-                                                           frontData, backData, splitData.mSplitAxis);
-
-        // TODO: reuse
-        delete frontData.mGeometry;
-        delete backData.mGeometry;
-        
-        // compute global decrease in render cost
-        splitData.mPriority = EvalRenderCostDecrease(splitData.mSplitPlane, tData);
-        splitData.mParentData = tData;
-        splitData.mMaxCostMisses = success ? tData.mMaxCostMisses : tData.mMaxCostMisses + 1;
-}
-*/
-
-void VspBspTree::EvalSubdivisionCandidate(VspBspSubdivisionCandidate &splitCandidate)
-{
-        VspBspTraversalData frontData;
-        VspBspTraversalData backData;
-        
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(splitCandidate.mParentData.mNode);
-        
-        // compute locally best split plane
-    bool success = SelectPlane(splitCandidate.mSplitPlane, leaf, splitCandidate.mParentData, 
-                                                           frontData, backData, splitCandidate.mSplitAxis);
+    const bool costRatioViolated = 
+                SelectPlane(splitCandidate.mSplitPlane, 
+                                        leaf, 
+                                        splitCandidate.mParentData, 
+                                        frontData, 
+                                        backData, 
+                                        splitCandidate.mSplitAxis);
+
+        // max cost threshold violated?
+        splitCandidate.mMaxCostMisses = costRatioViolated ? 
+                splitCandidate.mParentData.mMaxCostMisses : 
+                splitCandidate.mParentData.mMaxCostMisses + 1;
 
         float oldRenderCost;
@@ -1101 +1086 @@
         
         splitCandidate.mPriority = priority;
-
-        // max cost threshold violated?
-        splitCandidate.mMaxCostMisses = 
-                success ? splitCandidate.mParentData.mMaxCostMisses : splitCandidate.mParentData.mMaxCostMisses + 1;
 }