Changeset 1664 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.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/VspTree.cpp (modified) (5 diffs)

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

@@ -28 +28 @@
 
 #define USE_FIXEDPOINT_T 0
-#define CONSIDER_MEMORY 1
 
 /////////////
@@ -819 +818 @@
         splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
 
-#if 0
-        const float priority = (float)-splitCandidate.mParentData.mDepth;
-#else
         // take render cost of node into account 
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
 
-#if CONSIDER_MEMORY
-        const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-#else
-        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-#endif
-#endif
+        float priority;
+
+        if (mHierarchyManager->mConsiderMemory)
+        {
+                //cout << "here4 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
+                //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
+                priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() +  + 1.0f);
+        }
+        else
+        {
+                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+        }
         
         splitCandidate.SetPriority(priority);
@@ -845 +847 @@
                                                                                                                 oldRenderCost);
     
-#if 0
-        const float priority = (float)-splitCandidate.mParentData.mDepth;
-#else
         // take render cost of node into account 
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
-#if CONSIDER_MEMORY
-        const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-#else
-        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-#endif
-
-#endif
-        
+
+        float priority;
+
+        if (mHierarchyManager->mConsiderMemory)
+        {
+                //cout << "here2 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl; 
+                //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
+                priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
+        }
+        else
+        {
+                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+        }
+
         return priority;
 }
@@ -917 +922 @@
 
         //-- subdivide rays
-        SplitRays(splitPlane,
-                          *tData.mRays,
-                          *frontData.mRays,
-                          *backData.mRays);
+        SplitRays(splitPlane, *tData.mRays, *frontData.mRays, *backData.mRays);
 
         //-- compute pvs
@@ -946 +948 @@
         // two more leaves per split
         mVspStats.nodes += 2;
-        /// and a new split
+        // and a new split
         ++ mVspStats.splits[splitPlane.mAxis];