Changeset 1667 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

10/23/06 20:24:14 (18 years ago)

Author:

mattausch

Message:

updated priority meaurement: taking total cost and memory into account

File:

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

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

@@ -411 +411 @@
                                                                 const bool globalCriteriaMet)
 {
-        BvhSubdivisionCandidate *sc = 
-                dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
+        BvhSubdivisionCandidate *sc = dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
         BvhTraversalData &tData = sc->mParentData;
 
@@ -439 +438 @@
                 //-- push the new split candidates on the queue
                 
-                BvhSubdivisionCandidate *frontCandidate = 
-                        new BvhSubdivisionCandidate(tFrontData);
-                BvhSubdivisionCandidate *backCandidate = 
-                        new BvhSubdivisionCandidate(tBackData);
+                BvhSubdivisionCandidate *frontCandidate = new BvhSubdivisionCandidate(tFrontData);
+                BvhSubdivisionCandidate *backCandidate = new BvhSubdivisionCandidate(tBackData);
 
                 EvalSubdivisionCandidate(*frontCandidate);
@@ -485 +482 @@
 
 
-void BvHierarchy::EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitCandidate)
-{
-        // compute best object partition
-        const float ratio =     SelectObjectPartition(
-                                                        splitCandidate.mParentData, 
-                                                        splitCandidate.mFrontObjects, 
-                                                        splitCandidate.mBackObjects);
-        
+void BvHierarchy::EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitCandidate, 
+                                                                                   bool computeSplitPlane)
+{
+        if (computeSplitPlane)
+        {
+                // compute best object partition
+                const float ratio =     SelectObjectPartition(splitCandidate.mParentData, 
+                                                                                                  splitCandidate.mFrontObjects, 
+                                                                                                  splitCandidate.mBackObjects);
+        
+                // cost ratio violated?
+                const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
+
+                const int previousMisses = splitCandidate.mParentData.mMaxCostMisses;
+
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
+                                                                                previousMisses + 1 : previousMisses);
+
+        }
+
         BvhLeaf *leaf = splitCandidate.mParentData.mNode;
-
-        // cost ratio violated?
-        const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
-
-        const int previousMisses = splitCandidate.mParentData.mMaxCostMisses;
-
-        splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
-                previousMisses + 1 : previousMisses);
 
         const float oldProp = EvalViewCellsVolume(leaf->mObjects);
@@ -507 +508 @@
                 
         // compute global decrease in render cost
-        const float newRenderCost = 
-                EvalRenderCost(splitCandidate.mFrontObjects) +
-                EvalRenderCost(splitCandidate.mBackObjects);
+        const float newRenderCost = EvalRenderCost(splitCandidate.mFrontObjects) +
+                                                                EvalRenderCost(splitCandidate.mBackObjects);
 
         const float renderCostDecr = oldRenderCost - newRenderCost;
@@ -527 +527 @@
         float priority;
 
+        // surface area heuristics is used when there is no view space subdivision available. 
+        // In order to have some prioritized traversal, use this formula instead
         if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
                 HierarchyManager::NO_VIEWSPACE_SUBDIV)
@@ -541 +543 @@
         else
         {
+                // take render cost of node into account 
+                // otherwise danger of being stuck in a local minimum!
                 const float factor = mRenderCostDecreaseWeight;
-                
                 priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
-                // take render cost of node into account 
-                // otherwise danger of being stuck in a local minimum!!
-                if (mHierarchyManager->mConsiderMemory)
-                {
-                        //cout << "here7 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
-                        //priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();// / mBvhStats.Leaves();
+                if (1)//0 && mHierarchyManager->mConsiderMemory)
+                {
                         priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);
                 }
@@ -557 +556 @@
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);
-}
-
-
-float BvHierarchy::EvalPriority(const BvhSubdivisionCandidate &splitCandidate) const
-{
-        BvhLeaf *leaf = splitCandidate.mParentData.mNode;
-
-        const float oldRenderCost = EvalRenderCost(leaf->mObjects);
-
-        // compute global decrease in render cost
-        const float newRenderCost = EvalRenderCost(splitCandidate.mFrontObjects) +
-                                                                EvalRenderCost(splitCandidate.mBackObjects);
-
-        const float renderCostDecr = oldRenderCost - newRenderCost;
-
-#ifdef _DEBUG
-        Debug << "old render cost: " << oldRenderCost << endl;
-        Debug << "new render cost: " << newRenderCost << endl;
-        Debug << "render cost decrease: " << renderCostDecr << endl;
-#endif
-
-        // take render cost of node into account 
-        // otherwise danger of being stuck in a local minimum!!
-        const float factor = mRenderCostDecreaseWeight;
-        
-        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-
-        // $$ matt temp
-        if (mHierarchyManager->mConsiderMemory)
-        {
-                //cout << "here5 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
-                //const float priority = factor * renderCostDecr - (1.0f - factor) * (float)splitCandidate.GetPvsEntriesIncr();
-                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);
-        }
-        
-        return priority;
 }