Changeset 1707 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

11/01/06 23:20:53 (18 years ago)

Author:

mattausch

Message:

worked on full render cost evaluation
warning: some change sin render cost evaluation for pvs which could have bugs

File:

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

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

@@ -1077 +1077 @@
 
 /// Returns index of the best view cells of the neighborhood
-int GetBestViewCellIdx(ViewCell *root, const ViewCellContainer &neighborhood)
+static int GetBestViewCellIdx(ViewCell *root, const ViewCellContainer &neighborhood)
 {
         int bestViewCellIdx = 0;
@@ -1237 +1237 @@
 {
 
-        if ((vc->GetPvs().CountObjectsInPvs() > maxPvsSize) ||
-                (vc->GetPvs().CountObjectsInPvs() < minPvsSize))
+        if ((vc->GetPvs().EvalPvsCost() > maxPvsSize) ||
+                (vc->GetPvs().EvalPvsCost() < minPvsSize))
         {
                 return false;
@@ -1510 +1510 @@
         {
                 ViewCell *vc = *it;
-                totalRenderCost += vc->GetPvs().CountObjectsInPvs() * vc->GetVolume();
-                totalPvs += (int)vc->GetPvs().CountObjectsInPvs();
+                totalRenderCost += vc->GetPvs().EvalPvsCost() * vc->GetVolume();
+                totalPvs += (int)vc->GetPvs().EvalPvsCost();
         }
 
@@ -1530 +1530 @@
                 ViewCell *vc = *it;
 
-                float renderCost = vc->GetPvs().CountObjectsInPvs() * vc->GetVolume();
+                float renderCost = vc->GetPvs().EvalPvsCost() * vc->GetVolume();
                 float dev;
 
                 if (1)
-                        dev = fabs(avgRenderCost - (float)vc->GetPvs().CountObjectsInPvs());
+                        dev = fabs(avgRenderCost - (float)vc->GetPvs().EvalPvsCost());
                 else
                         dev = fabs(expectedRenderCost - renderCost);
@@ -1643 +1643 @@
 
         // update pvs size
-        UpdateScalarPvsSize(vc, vc->GetPvs().CountObjectsInPvs(), vc->GetPvs().GetSize());
+        UpdateScalarPvsSize(vc, vc->GetPvs().EvalPvsCost(), vc->GetPvs().GetSize());
 
         return vc;
@@ -2155 +2155 @@
 
 
+void ViewCellsManager::SetViewCellActive(ViewCell *vc) const
+{
+        ViewCellContainer leaves;
+        // sets the pointers to the currently active view cells
+        mViewCellsTree->CollectLeaves(vc, leaves);
+
+        ViewCellContainer::const_iterator lit, lit_end = leaves.end();
+        for (lit = leaves.begin(); lit != lit_end; ++ lit)
+        {
+                dynamic_cast<ViewCellLeaf *>(*lit)->SetActiveViewCell(vc);
+        }
+}
+
+
 void ViewCellsManager::SetViewCellsActive()
 {
-        // collect leaf view cells and set the pointers to the currently
-        // active view cells
+        // collect leaf view cells and set the pointers to 
+        // the currently active view cells
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
 
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
-                ViewCellContainer leaves;
-                mViewCellsTree->CollectLeaves(*it, leaves);
-
-                ViewCellContainer::const_iterator lit, lit_end = leaves.end();
-                for (lit = mViewCells.begin(); lit != lit_end; ++ lit)
-                {
-                        dynamic_cast<ViewCellLeaf *>(*lit)->SetActiveViewCell(*it);
-                }
+                SetViewCellActive(*it);
         }
 }
@@ -2570 +2577 @@
                 // we assume that pvs is explicitly stored in leaves
                 pvs = root->GetPvs();
-                UpdateScalarPvsSize(root, pvs.CountObjectsInPvs(), pvs.GetSize());
+                UpdateScalarPvsSize(root, pvs.EvalPvsCost(), pvs.GetSize());
                 
                 return;
@@ -2637 +2644 @@
         
         // set new pvs size
-        UpdateScalarPvsSize(interior, pvs.CountObjectsInPvs(), pvs.GetSize());
+        UpdateScalarPvsSize(interior, pvs.EvalPvsCost(), pvs.GetSize());
         
 #else 
@@ -5720 +5727 @@
         {
                 ViewCell *vc = *vit;
-                int pvs = vc->GetPvs().CountObjectsInPvs();
+                int pvs = vc->GetPvs().EvalPvsCost();
                 float vol = vc->GetVolume();
                 rc += pvs * vol;