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

Timestamp:

10/23/06 01:36:17 (18 years ago)

Author:

mattausch

Message:

changed priority computation:
taking ratio render cost decrease / pvs size increase rather
then render cost decrease alone
this should rather emphasise object space splits, as they
seem to cost less memory.

File:

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

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

@@ -25 +25 @@
 #define PROBABILIY_IS_BV_VOLUME 1
 #define USE_FIXEDPOINT_T 0
-
 #define USE_VOLUMES_FOR_HEURISTICS 1
-
-#define CONSIDER_MEMORY 1
 
 int BvhNode::sMailId = 10000; //2147483647;
@@ -429 +426 @@
                         
                 // create new interior node and two leaf node
-                currentNode = SubdivideNode(
-                        *sc, 
-                        tFrontData, 
-                        tBackData);
+                currentNode = SubdivideNode(*sc, tFrontData, tBackData);
         
                 // decrease the weighted average cost of the subdivisoin
@@ -457 +451 @@
                 tBackData.mNode->SetSubdivisionCandidate(backCandidate);
 
+                //cout << "f: " << frontCandidate->GetPriority() << " b: " << backCandidate->GetPriority() << endl;
                 tQueue.Push(frontCandidate);
                 tQueue.Push(backCandidate);
@@ -466 +461 @@
         if (currentNode->IsLeaf())
         {
-                //////////////////////////////////////
+                /////////////////////
                 //-- store additional info
                 EvaluateLeafStats(tData);
@@ -530 +525 @@
 #endif
 
-#if 1
         float priority;
-        
+
         if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
                 HierarchyManager::NO_VIEWSPACE_SUBDIV)
@@ -551 +545 @@
                 // take render cost of node into account 
                 // otherwise danger of being stuck in a local minimum!!
-                #if CONSIDER_MEMORY
-                        const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-                #else
-                        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                #endif
-        }
-
-#else
-        const float priority = (float)-splitCandidate.mParentData.mDepth;
-#endif
+                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();
+                        priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
+                }
+                else
+                {
+                        priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                }
+        }
+
+        // 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
-        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 newRenderCost = EvalRenderCost(splitCandidate.mFrontObjects) +
+                                                                EvalRenderCost(splitCandidate.mBackObjects);
 
         const float renderCostDecr = oldRenderCost - newRenderCost;
@@ -586 +580 @@
 #endif
 
-#if 1
         // take render cost of node into account 
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
+        
+        float priority;
+
         // $$ matt temp
-#if CONSIDER_MEMORY
-        const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-#else
-        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-#endif
-#else
-        const float priority = (float)-splitCandidate.mParentData.mDepth;
-#endif
+        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 = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
+        }
+        else
+        {
+                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+        }
 
         return priority;
@@ -620 +618 @@
                         || ((int)data.mNode->mObjects.size() <= mTermMinObjects)
                         //|| (data.mProbability <= mTermMinProbability)
-                        //|| (data.mNumRays <= mTermMinRays)
+                        || (data.mNumRays <= mTermMinRays)
                  );
 }
@@ -952 +950 @@
         cout << "\n\nobjects=(" << (int)objectsBack.size() << "," << (int)objectsFront.size() << " of " 
                  << (int)tData.mNode->mObjects.size() << ")\t area=(" 
-                 << areaLeft << "," << areaRight << ")" << endl;
-        cout << "cost= " << minSum << endl;
+                 << areaLeft << "," << areaRight << ")" << endl
+                 << "cost= " << minSum << endl;
 #endif
+
   return ratio;
 }