Changeset 1633 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

10/17/06 20:32:06 (18 years ago)

Author:

mattausch

Message:

worked on gradient method for vsposp

File:

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

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

@@ -694 +694 @@
         if (!LocalTerminationCriteriaMet(tData) && !globalCriteriaMet)
         {       
+                ///////////
                 //-- continue subdivision
+
                 VspTraversalData tFrontData;
                 VspTraversalData tBackData;
@@ -714 +716 @@
                 if (1) EvalSubdivisionStats(*sc);
                 
+                /////////////
                 //-- evaluate new split candidates for global greedy cost heuristics
 
@@ -728 +731 @@
                 tQueue.Push(frontCandidate);
                 tQueue.Push(backCandidate);
-                
-                // delete old leaf node
-                //DEL_PTR(tData.mNode);
+
+                // note: leaf is not destroyed because it is needed to collect 
+                // dirty candidates in hierarchy manager
         }
 
@@ -825 +828 @@
         
         splitCandidate.SetPriority(priority);
+}
+
+
+float VspTree::EvalPriority(const VspSubdivisionCandidate &splitCandidate) const
+{
+        // compute global decrease in render cost
+        float oldRenderCost;
+        const float renderCostDecr = EvalRenderCostDecrease(splitCandidate.mSplitPlane, 
+                                                                                                                splitCandidate.mParentData,
+                                                                                                                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;
+        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+#endif
+        
+        return priority;
 }
 
@@ -2872 +2896 @@
 void VspTree::CollectDirtyCandidate(const VssRay &ray, 
                                                                         const bool isTermination,
-                                                                        vector<SubdivisionCandidate *> &dirtyList) const
+                                                                        vector<SubdivisionCandidate *> &dirtyList,
+                                                                        const bool onlyUnmailed) const
 {
 
@@ -2882 +2907 @@
         
         if (!obj) return;
-
+        
+        SubdivisionCandidate *candidate = NULL;
+                
         switch (mHierarchyManager->GetObjectSpaceSubdivisionType())
         {
@@ -2892 +2919 @@
                         {
                                 leaf->Mail();
-                                dirtyList.push_back(leaf->mSubdivisionCandidate);
+                                candidate = leaf->mSubdivisionCandidate;
                         }
                         break;
@@ -2903 +2930 @@
                         {
                                 leaf->Mail();
-                                 // a candidate still attached to this node
-                                if (leaf->GetSubdivisionCandidate())
-                                {
-                                        dirtyList.push_back(leaf->GetSubdivisionCandidate());
-                                }
+                                candidate = leaf->GetSubdivisionCandidate();
                         }
                         break;
                 }
         default:
+                cerr << "not implemented yet" << endl;
+                candidate = NULL;
                 break;
         }
+
+        // is this leaf still a split candidate?
+        if (candidate && (!onlyUnmailed || !candidate->Mailed()))
+        {
+                candidate->Mail();
+                dirtyList.push_back(candidate);
+        }
 }
 
 
 void VspTree::CollectDirtyCandidates(VspSubdivisionCandidate *sc, 
-                                                                         vector<SubdivisionCandidate *> &dirtyList)
+                                                                         vector<SubdivisionCandidate *> &dirtyList,
+                                                                         const bool onlyUnmailed)
 {
         VspTraversalData &tData = sc->mParentData;
@@ -2933 +2966 @@
                 VssRay *ray = (*rit).mRay;
                 
-                CollectDirtyCandidate(*ray, true, dirtyList);
-                CollectDirtyCandidate(*ray, false, dirtyList);
+                CollectDirtyCandidate(*ray, true, dirtyList, onlyUnmailed);
+        CollectDirtyCandidate(*ray, false, dirtyList, onlyUnmailed);
         }
 }