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

Timestamp:

07/18/06 19:03:14 (18 years ago)

Author:

mattausch

Message:

added kd pvs support, changed way of counting pvs

File:

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

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

@@ -823 +823 @@
 
         Debug << "updating active vc: " << (int)viewCells.size() << endl;
-        // find all already merged view cells and remove them from view cells
+        
+        // find all already merged view cells and remove them from the
+        // container view cells
                 
         // sort out all view cells which are not active anymore, i.e., they
@@ -883 +885 @@
                 const int upper = mViewCellsManager->GetMaxPvsSize();
 
-                const float penalty = EvalPvsPenalty((*vit)->GetPvs().GetSize(), lower, upper);
+                const float penalty = EvalPvsPenalty((*vit)->GetPvs().CountPvs(), lower, upper);
                 
                 mDeviation += fabs(mAvgRenderCost - penalty);
@@ -943 +945 @@
 
 // TODO: should be done in view cells manager
-ViewCellInterior *ViewCellsTree::MergeViewCells(ViewCell *l, 
-                                                                                                ViewCell *r, 
+ViewCellInterior *ViewCellsTree::MergeViewCells(ViewCell *left, 
+                                                                                                ViewCell *right, 
                                                                                                 int &pvsDiff) //const
 {
-        ViewCellInterior *vc = mViewCellsManager->MergeViewCells(l, r);
+        // create merged view cell
+        ViewCellInterior *vc = 
+                mViewCellsManager->MergeViewCells(left, right);
 
         // if merge was unsuccessful
@@ -953 +957 @@
 
         // set to the new parent view cell
-        l->SetParent(vc);
-        r->SetParent(vc);
-
-        // set new size of view cell
+        left->SetParent(vc);
+        right->SetParent(vc);
+
+        
         if (mUseAreaForPvs)
         {
-                vc->SetArea(l->GetArea() + l->GetArea());
+                // set new area of view cell
+                // not not correct, but costly to compute real area!!
+                vc->SetArea(left->GetArea() + right->GetArea());
         }
         else
-        {
-                vc->SetVolume(r->GetVolume() + l->GetVolume());
+        {       // set new volume of view cell
+                vc->SetVolume(left->GetVolume() + right->GetVolume());
         }
 
@@ -971 +977 @@
         vc->Mail();
 
-        const int pvs1 = l->GetPvs().GetSize();
-        const int pvs2 = r->GetPvs().GetSize();
-
-
-        // new view cells are stored in this vector
+        const int pvs1 = left->GetPvs().CountPvs();
+        const int pvs2 = right->GetPvs().CountPvs();
+
+
+        // the new view cells are stored in this container
         mMergedViewCells.push_back(vc);
 
-        pvsDiff = vc->GetPvs().GetSize() - pvs1 - pvs2;
-
-
-
-        //Ždon't store intermediate pvs
+        pvsDiff = vc->GetPvs().CountPvs() - pvs1 - pvs2;
+
+
+        // don't store pvs in interior cells, just a scalar
         if (mViewCellsStorage == PVS_IN_LEAVES)
         {
-                l->mPvsSize = l->GetPvs().GetSize(); 
-                l->mPvsSizeValid = true;
+                left->mPvsSize = left->GetPvs().GetSize(); 
+                left->mPvsSizeValid = true;
                 
-                if (!l->IsLeaf())
-                        l->GetPvs().Clear();
+                // remove pvs, we don't store interior pvss
+                if (!left->IsLeaf())
+                {
+                        left->GetPvs().Clear();
+                }
+
+                right->mPvsSize = right->GetPvs().CountPvs(); 
+                right->mPvsSizeValid = true;
                 
-                r->mPvsSize = r->GetPvs().GetSize(); 
-                r->mPvsSizeValid = true;
-                
-                if (!r->IsLeaf())
-                        r->GetPvs().Clear();
-        
-}
-
+                // remove pvs, we don't store interior pvss
+                if (!right->IsLeaf())
+                {
+                        right->GetPvs().Clear();
+                }
+        }
 
         return vc;
@@ -1258 +1267 @@
                 const float penalty = 
                         EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
+
                 return (mAvgRenderCost - penalty) * (mAvgRenderCost - penalty) / 
                         (float)mNumActiveViewCells;
@@ -1274 +1284 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
+                const float penalty = EvalPvsPenalty(vc->GetPvs().CountPvs(), lower, upper);
                 return fabs(mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
         }
@@ -1283 +1293 @@
 
 
-
 float ViewCellsTree::GetRenderCost(ViewCell *vc) const
 {
         if (mUseAreaForPvs)
-                return vc->GetPvs().GetSize() * vc->GetArea();
-
-        return vc->GetPvs().GetSize() * vc->GetVolume();
+        {
+                return vc->GetPvs().CountPvs() * vc->GetArea();
+        }
+
+        return vc->GetPvs().CountPvs() * vc->GetVolume();
 }
 
@@ -1328 +1339 @@
                 newPvs = (int)ComputeMergedPvsCost(mc.mLeftViewCell->GetPvs(), mc.mRightViewCell->GetPvs());
 
-        const float newPenalty = EvalPvsPenalty(newPvs,
+        const float newPenalty = EvalPvsPenalty(newPvs, 
                                                                                         mViewCellsManager->GetMinPvsSize(),
                                                                                         mViewCellsManager->GetMaxPvsSize());
@@ -1477 +1488 @@
                         for (it = interior->mChildren.begin(); it != it_end; ++ it)
                         {
-                                int pvsSize = GetPvsSize(*it);
+                                const int pvsSize = GetPvsSize(*it);
                                 childCost += (float) pvsSize * (*it)->GetVolume();
                                 childPvs += pvsSize;
@@ -1603 +1614 @@
 
 
-
         // delete all the objects from the leaf sets which were moved to parent pvs
         ObjectPvsMap::const_iterator oit_end = interior->GetPvs().mEntries.end();
@@ -1615 +1625 @@
                 }
         }
-
-        /*int dummy = interior->GetPvs().GetSize();
-
-        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
-        {
-                dummy += (*cit)->GetPvs().GetSize();
-        }*/
-
 }
 
@@ -1729 +1731 @@
                         {
                                 if (countKdPvs)
-                                        pvsSize = vc->GetPvs().GetSize();
+                                        pvsSize = vc->GetPvs().CountPvs();
                                 else
                                         pvsSize = CountKdPvs(dynamic_cast<ViewCellLeaf *>(vc));
@@ -1817 +1819 @@
         case PVS_IN_INTERIORS:
         default:
-                Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().GetSize() << endl;
-                pvsSize = vc->GetPvs().GetSize();               
+                Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().CountPvs() << endl;
+                pvsSize = vc->GetPvs().CountPvs();              
         }
 
@@ -1840 +1842 @@
         if ((mViewCellsStorage == PVS_IN_INTERIORS) || vc->IsLeaf())
         {
-                pvsSize = vc->GetPvs().GetSize();
+                pvsSize = vc->GetPvs().CountPvs();
         }