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

Timestamp:

10/22/06 17:35:23 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -28 +28 @@
 #define USE_VOLUMES_FOR_HEURISTICS 1
 
+#define CONSIDER_MEMORY 1
 
 int BvhNode::sMailId = 10000; //2147483647;
@@ -502 +503 @@
         const bool maxCostRatioViolated = mTermMaxCostRatio < ratio;
 
+        const int previousMisses = splitCandidate.mParentData.mMaxCostMisses;
+
         splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
-                splitCandidate.mParentData.mMaxCostMisses + 1 :
-                splitCandidate.mParentData.mMaxCostMisses);
+                previousMisses + 1 : previousMisses);
 
         const float oldProp = EvalViewCellsVolume(leaf->mObjects);
@@ -516 +518 @@
         const float renderCostDecr = oldRenderCost - newRenderCost;
         
+        splitCandidate.SetRenderCostDecrease(renderCostDecr);
+
+        // increase in pvs entries
+        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
+        splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
+
 #ifdef _DEBUG
         Debug << "old render cost: " << oldRenderCost << endl;
@@ -539 +547 @@
         else
         {
+                const float factor = mRenderCostDecreaseWeight;
+                
                 // take render cost of node into account 
                 // otherwise danger of being stuck in a local minimum!!
-                priority = mRenderCostDecreaseWeight * renderCostDecr + 
-                                   (1.0f - mRenderCostDecreaseWeight) * oldRenderCost;
+                #if CONSIDER_MEMORY
+                        const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
+                #else
+                        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                #endif
         }
 
@@ -548 +561 @@
         const float priority = (float)-splitCandidate.mParentData.mDepth;
 #endif
-
-        splitCandidate.SetRenderCostDecrease(renderCostDecr);
-
-        // increase in pvs entries
-        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
-        splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
 
         // compute global decrease in render cost
@@ -583 +590 @@
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
+        // $$ 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;