Changeset 1099 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

Timestamp:

07/07/06 16:14:33 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp (modified) (14 diffs)

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

@@ -30 +30 @@
 int VspTree::sFrontAndBackId = 0;
 
-
+VspTree *VspTree::VspSplitCandidate::sVspTree = NULL;
+OspTree *OspTree::OspSplitCandidate::sOspTree = NULL;
 
 // pvs penalty can be different from pvs size
@@ -442 +443 @@
                                                                   AxisAlignedBox3 *forcedBoundingBox) 
 {
+        // store pointer to this tree
+        VspSplitCandidate::sVspTree = this;
+
         mVspStats.nodes = 1;
         
@@ -574 +578 @@
         
                 //-- push the new split candidates on the queue
-                VspSplitCandidate *frontCandidate = new VspSplitCandidate();
-                VspSplitCandidate *backCandidate = new VspSplitCandidate();
-
-                EvalSplitCandidate(tFrontData, *frontCandidate);
-                EvalSplitCandidate(tBackData, *backCandidate);
-
-                tQueue.push(frontCandidate);
-                tQueue.push(backCandidate);
+                VspSplitCandidate *frontCandidate = new VspSplitCandidate(tFrontData);
+                VspSplitCandidate *backCandidate = new VspSplitCandidate(tBackData);
+
+                EvalSplitCandidate(*frontCandidate);
+                EvalSplitCandidate(*backCandidate);
+
+                tQueue.Push(frontCandidate);
+                tQueue.Push(backCandidate);
 
                 // delete old leaf node
@@ -634 +638 @@
 
 
-void VspTree::EvalSplitCandidate(VspTraversalData &tData,
-                                                                 VspSplitCandidate &splitCandidate)
+void VspTree::EvalSplitCandidate(VspSplitCandidate &splitCandidate)
 {
         float frontProb;
         float backProb;
         
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(tData.mNode);
+        VspLeaf *leaf = dynamic_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
         
         // compute locally best split plane
         const bool success = 
-                SelectSplitPlane(tData, splitCandidate.mSplitPlane,     frontProb, backProb);
+                SelectSplitPlane(splitCandidate.mParentData, splitCandidate.mSplitPlane, frontProb, backProb);
 
         // compute global decrease in render cost
-        splitCandidate.mPriority = EvalRenderCostDecrease(splitCandidate.mSplitPlane, tData);
-        splitCandidate.mParentData = tData;
-        splitCandidate.mMaxCostMisses = success ? tData.mMaxCostMisses : tData.mMaxCostMisses + 1;
+        const float priority = EvalRenderCostDecrease(splitCandidate.mSplitPlane, splitCandidate.mParentData);
+        splitCandidate.SetPriority(priority);
+        splitCandidate.mMaxCostMisses = success ? splitCandidate.mParentData.mMaxCostMisses : splitCandidate.mParentData.mMaxCostMisses + 1;
 
         //Debug << "p: " << tData.mNode << " depth: " << tData.mDepth << endl;
@@ -2539 +2542 @@
 
 OspTree::OspTree():
-mRoot(NULL)
-#if TODO
-mOutOfBoundsCell(NULL),
-mStoreRays(false),
-mUseRandomAxis(false),
+mRoot(NULL),
 mTimeStamp(1)
-#endif
 {
 #if TODO
@@ -2751 +2749 @@
                         
                 //-- push the new split candidates on the queue
-                OspSplitCandidate *frontCandidate = new OspSplitCandidate();
-                OspSplitCandidate *backCandidate = new OspSplitCandidate();
-
-                EvalSplitCandidate(tFrontData, *frontCandidate);
-                EvalSplitCandidate(tBackData, *backCandidate);
-
-                tQueue.push(frontCandidate);
-                tQueue.push(backCandidate);
+                OspSplitCandidate *frontCandidate = new OspSplitCandidate(tFrontData);
+                OspSplitCandidate *backCandidate = new OspSplitCandidate(tBackData);
+
+                EvalSplitCandidate(*frontCandidate);
+                EvalSplitCandidate(*backCandidate);
+
+                tQueue.Push(frontCandidate);
+                tQueue.Push(backCandidate);
 
                 // delete old leaf node
@@ -2779 +2777 @@
 
 
-void OspTree::EvalSplitCandidate(OspTraversalData &tData,
-                                                                 OspSplitCandidate &splitCandidate)
+void OspTree::EvalSplitCandidate(OspSplitCandidate &splitCandidate)
 {
         float frontProb;
         float backProb;
         
-        KdLeaf *leaf = dynamic_cast<KdLeaf *>(tData.mNode);
+        KdLeaf *leaf = dynamic_cast<KdLeaf *>(splitCandidate.mParentData.mNode);
 
         // compute locally best split plane
         const bool success = 
-                SelectSplitPlane(tData, splitCandidate.mSplitPlane,     frontProb, backProb);
+                SelectSplitPlane(splitCandidate.mParentData, splitCandidate.mSplitPlane, frontProb, backProb);
 
         //TODO
         // compute global decrease in render cost
-        splitCandidate.mPriority = EvalRenderCostDecrease(splitCandidate.mSplitPlane, tData);
-        splitCandidate.mParentData = tData;
-        splitCandidate.mMaxCostMisses = success ? tData.mMaxCostMisses : tData.mMaxCostMisses + 1;
+        splitCandidate.SetPriority(EvalRenderCostDecrease(splitCandidate.mSplitPlane, splitCandidate.mParentData));
+        splitCandidate.mMaxCostMisses = success ? splitCandidate.mParentData.mMaxCostMisses : splitCandidate.mParentData.mMaxCostMisses + 1;
 }
 
@@ -3263 +3259 @@
                                                                   AxisAlignedBox3 *forcedBoundingBox) 
 {
+        // store pointer to this tree
+        OspSplitCandidate::sOspTree = this;
+
         mOspStats.nodes = 1;
         
@@ -3331 +3330 @@
 SplitCandidate *HierarchyManager::NextSplitCandidate()
 {
-        SplitCandidate *splitCandidate = mTQueue.top();
+        SplitCandidate *splitCandidate = static_cast<SplitCandidate *>(mTQueue.Top());
         //Debug << "priority: " << splitCandidate->GetPriority() << endl;
-        mTQueue.pop();
+        mTQueue.Pop();
 
         return splitCandidate;
@@ -3398 +3397 @@
 
         // compute first split candidate
-        VspTree::VspSplitCandidate *splitCandidate = new VspTree::VspSplitCandidate();
-    mVspTree.EvalSplitCandidate(vData, *splitCandidate);
-
-        mTQueue.push(splitCandidate);
+        VspTree::VspSplitCandidate *splitCandidate = new VspTree::VspSplitCandidate(vData);
+    mVspTree.EvalSplitCandidate(*splitCandidate);
+
+        mTQueue.Push(splitCandidate);
 
 
@@ -3427 +3426 @@
 
         // compute first split candidate
-        OspTree::OspSplitCandidate *oSplitCandidate = new OspTree::OspSplitCandidate();
-    mOspTree.EvalSplitCandidate(oData, *oSplitCandidate);
-
-        mTQueue.push(splitCandidate);
+        OspTree::OspSplitCandidate *oSplitCandidate = new OspTree::OspSplitCandidate(oData);
+    mOspTree.EvalSplitCandidate(*oSplitCandidate);
+
+        mTQueue.Push(splitCandidate);
 }
 
@@ -3488 +3487 @@
 
                 //-- subdivide leaf node
-                //-- either a object space or view space split
+                //-- we have either a object space or view space split
                 if (splitCandidate->Type() == SplitCandidate::VIEW_SPACE)
                 {
@@ -3515 +3514 @@
 bool HierarchyManager::FinishedConstruction()
 {
-        return mTQueue.empty();
-}
-
-
-void HierarchyManager::RepairQueue()
+        return mTQueue.Empty();
+}
+
+
+void HierarchyManager::RepairQueue(const vector<SplitCandidate *> &dirtyList)
 {
         // TODO
@@ -3535 +3534 @@
         // (explicit data structure, binary tree)
         // *) inserting and removal is efficient
-        // *) search is not efficient => store pointer to queue element with each
+        // *) search is not efficient => store queue position with each
         // split candidate
 
-        vector<SplitCandidate *> candidates;
-
-        while (!mTQueue.empty())
-        {
-                SplitCandidate *candidate = mTQueue.top();
-                mTQueue.pop();
-
-                candidates.push_back(candidate);
-        }
-
-        // Reinsert
-
-}
-
-}
+        vector<SplitCandidate *>::const_iterator sit, sit_end = dirtyList.end();
+
+        for (sit = dirtyList.begin(); sit != sit_end; ++ sit)
+        {
+                SplitCandidate* sc = *sit;
+
+                mTQueue.Erase(sc);
+
+                // reevaluate
+                sc->EvalPriority();
+
+                // reinsert
+                mTQueue.Push(sc);
+        }
+}
+
+}