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

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.h (modified) (5 diffs)

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

@@ -13 +13 @@
 #include "AxisAlignedBox3.h"
 #include "IntersectableWrapper.h"
-
+#include "HierarchyManager.h"
 
 
@@ -408 +408 @@
                 int Type() const { return OBJECT_SPACE; }
         
-                void EvalPriority(bool computeSplitplane = true)
+                void EvalCandidate(bool computeSplitplane = true)
                 {
-                        if (computeSplitplane)
-                        {
-                                sBvHierarchy->EvalSubdivisionCandidate(*this);  
-                        }
-                        else
-                        {
-                                mPvsEntriesIncr = sBvHierarchy->EvalPvsEntriesIncr(*this);
-                                mPriority = sBvHierarchy->EvalPriority(*this);
-                        }
+                        sBvHierarchy->EvalSubdivisionCandidate(*this, computeSplitplane);
                 }
 
                 bool Apply(SplitQueue &splitQueue, bool terminationCriteriaMet)
                 {
-                        BvhNode *n = 
-                                sBvHierarchy->Subdivide(splitQueue, this, terminationCriteriaMet);
+                        BvhNode *n = sBvHierarchy->Subdivide(splitQueue, this, terminationCriteriaMet);
+
                         // local or global termination criteria failed
                         return !n->IsLeaf();            
@@ -440 +432 @@
                 }
 
-                BvhSubdivisionCandidate(
-                        const ObjectContainer &frontObjects, 
-                        const ObjectContainer &backObjects, 
-                        const BvhTraversalData &tData): 
+                BvhSubdivisionCandidate(const ObjectContainer &frontObjects, 
+                                                                const ObjectContainer &backObjects, 
+                                                                const BvhTraversalData &tData): 
                 mFrontObjects(frontObjects), mBackObjects(backObjects), mParentData(tData)
                 {}
+
+                float GetPriority() const
+                {
+                        HierarchyManager *hm = sBvHierarchy->mHierarchyManager;
+                        if (hm->ConsiderMemory())
+                        {
+                                const float rc = hm->GetHierarchyStats().mTotalCost - mRenderCostDecrease;
+                                const float mc = hm->GetHierarchyStats().mMemory +
+                                                                 (float)mPvsEntriesIncr * ObjectPvs::GetEntrySizeByte();
+                                //cout << "x";
+                                return - (rc * mc) / float(1024 * 1024);
+                        }
+                        else
+                        {
+                                return mPriority;
+                        }
+                }
+
 
                 /// pointer to parent tree.
@@ -494 +503 @@
         /** Evaluates candidate for splitting.
         */
-        void EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitData);
+        void EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitData, bool computeSplitPlane = true);
 
         /** Returns list of leaves with pvs smaller than
@@ -726 +735 @@
                 @returns priority
         */
-        float EvalPriority(const BvhSubdivisionCandidate &splitCandidate) const;
+        //float EvalPriority(const BvhSubdivisionCandidate &splitCandidate) const;
 
         ////////////////////////////////////////////////