Changeset 1633 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.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/BvHierarchy.cpp (modified) (8 diffs)

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

@@ -509 +509 @@
 
         const float renderCostDecr = oldRenderCost - newRenderCost;
-        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
-
+        
 #ifdef _DEBUG
         Debug << "old render cost: " << oldRenderCost << endl;
@@ -516 +515 @@
         Debug << "render cost decrease: " << renderCostDecr << endl;
 #endif
-
-        splitCandidate.SetRenderCostDecrease(renderCostDecr);
-        splitCandidate.SetPvsEntriesIncr(EvalPvsEntriesIncr(splitCandidate));
 
 #if 1
@@ -529 +525 @@
 #endif
 
+        splitCandidate.SetRenderCostDecrease(renderCostDecr);
+
+        // increase in pvs entries
+        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
+        splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
+
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);
+}
+
+
+float BvHierarchy::EvalPriority(const BvhSubdivisionCandidate &splitCandidate) const
+{
+        BvhLeaf *leaf = splitCandidate.mParentData.mNode;
+
+        const float oldRenderCost = EvalRenderCost(leaf->mObjects);
+
+        // compute global decrease in render cost
+        const float newRenderCost = 
+                EvalRenderCost(splitCandidate.mFrontObjects) +
+                EvalRenderCost(splitCandidate.mBackObjects);
+
+        const float renderCostDecr = oldRenderCost - newRenderCost;
+
+#ifdef _DEBUG
+        Debug << "old render cost: " << oldRenderCost << endl;
+        Debug << "new render cost: " << newRenderCost << endl;
+        Debug << "render cost decrease: " << renderCostDecr << endl;
+#endif
+
+#if 1
+        // 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;
+#else
+        const float priority = (float)-splitCandidate.mParentData.mDepth;
+#endif
+
+        return priority;
 }
 
@@ -569 +603 @@
                 );
 
-        if (1 && terminationCriteriaMet)
+#ifdef _DEBUG
+        if (terminationCriteriaMet)
         {
                 Debug << "bvh global termination criteria met:" << endl;
@@ -575 +610 @@
                 Debug << "leaves: " << mBvhStats.Leaves() << " " << mTermMaxLeaves << endl;
         }
-
+#endif
         return terminationCriteriaMet; 
 }
@@ -1529 +1564 @@
 
 void BvHierarchy::CollectDirtyCandidates(BvhSubdivisionCandidate *sc, 
-                                                                                 vector<SubdivisionCandidate *> &dirtyList)
+                                                                                 vector<SubdivisionCandidate *> &dirtyList, 
+                                                                                 const bool onlyUnmailed)
 {
         BvhTraversalData &tData = sc->mParentData;
@@ -1535 +1571 @@
         
         ViewCellContainer viewCells;
-        CollectViewCells(node->mObjects, viewCells);
+        ViewCell::NewMail();
+        CollectViewCells(node->mObjects, viewCells, true);
+
         if (0) cout << "collected " << (int)viewCells.size() << " dirty candidates" << endl;
-
+        
         // split candidates handling 
         // these view cells  are thrown into dirty list
@@ -1544 +1582 @@
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
-                VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+        VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
                 VspLeaf *leaf = vc->mLeaves[0];
+        
                 SubdivisionCandidate *candidate = leaf->GetSubdivisionCandidate();
                 
-                if (candidate) // is this leaf still a split candidate?
-                {
+                // is this leaf still a split candidate?
+                if (candidate && (!onlyUnmailed || !candidate->Mailed()))
+                {
+                        candidate->Mail();
                         dirtyList.push_back(candidate);
                 }