Changeset 801 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

04/24/06 08:21:10 (18 years ago)

Author:

mattausch

Message:

debug version for testing subdivision

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (6 diffs)

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

@@ -262 +262 @@
 float ViewCell::GetRenderCost() const
 {
-        return (float)mPvs.GetSize() * GetVolume();
+        //return (float)mPvs.GetSize() * GetVolume();
+        return (float)mPvsSize * GetVolume();
 }
 
@@ -575 +576 @@
 
         //const float maxAvgCost = 350;
-        while (!mMergeQueue.empty())//NumActiveViewCells > mMergeMinViewCells))
+        while (!mMergeQueue.empty())//nmNumActiveViewCells > mMergeMinViewCells))
         {
                 //-- reset merge queue if the ratio of current expected cost / real expected cost
@@ -661 +662 @@
                         realAvgRenderCost = (float)totalPvs / (float)realNumActiveViewCells;
         
-                        // set merge cost to this node
-                        mergedVc->SetMergeCost(totalRenderCost);
+                        // set merge cost to this node for priority traversal
+                        //mergedVc->SetMergeCost(totalRenderCost);
+// HACK
+mergedVc->SetMergeCost(1.0f / (float)realNumActiveViewCells);
 
                         //if (mViewCellsManager->EqualToSpatialNode(mergedVc))
@@ -736 +739 @@
                 mMergeQueue.pop();
         }
-
+//hack!!
+//mRoot->GetPvs().Clear();
         // TODO delete because makes no sense here
         mergeStats.expectedRenderCost = realExpectedCost;
@@ -1608 +1612 @@
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const
 {
+        // pvs is stored in each cell
+        if (mViewCellsStorage == PVS_IN_INTERIORS)
+        {
+                pvs = vc->GetPvs();
+                return;
+        }
+
         Intersectable::NewMail();
 
-        if (mViewCellsStorage == PVS_IN_INTERIORS)
-                pvs = vc->GetPvs();
 
         int pvsSize = 0;
@@ -1631 +1640 @@
                 tstack.pop();
 
+                // add new pvs
                 pvs.AddPvs(vc->GetPvs());