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

Timestamp:

07/28/06 09:37:05 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -254 +254 @@
 
         // update pvs size scalar
-        mPvsSize = mPvs.GetSize();
-        mPvsSizeValid = true;
+        //mPvsSize = mPvs.GetSize();
+        mPvsSizeValid = false; // recompute pvs size
 
         return result;
@@ -886 +886 @@
                 const int upper = mViewCellsManager->GetMaxPvsSize();
 
-                const float penalty = EvalPvsPenalty((*vit)->GetPvs().CountPvs(), lower, upper);
+                const float penalty = EvalPvsPenalty((*vit)->GetPvs().CountObjectsInPvs(), lower, upper);
                 
                 mDeviation += fabs(mAvgRenderCost - penalty);
@@ -978 +978 @@
         vc->Mail();
 
-        const int pvs1 = left->GetPvs().CountPvs();
-        const int pvs2 = right->GetPvs().CountPvs();
+        const int pvs1 = left->GetPvs().CountObjectsInPvs();
+        const int pvs2 = right->GetPvs().CountObjectsInPvs();
 
 
@@ -985 +985 @@
         mMergedViewCells.push_back(vc);
 
-        pvsDiff = vc->GetPvs().CountPvs() - pvs1 - pvs2;
+        pvsDiff = vc->GetPvs().CountObjectsInPvs() - pvs1 - pvs2;
 
 
@@ -991 +991 @@
         if (mViewCellsStorage == PVS_IN_LEAVES)
         {
-                left->mPvsSize = left->GetPvs().GetSize(); 
-                left->mPvsSizeValid = true;
-                
+                // set scalars
+                mViewCellsManager->UpdateScalarPvsSize(left, 
+                        left->GetPvs().CountObjectsInPvs(), 
+                        left->GetPvs().GetSize());
+                        
                 // remove pvs, we don't store interior pvss
                 if (!left->IsLeaf())
@@ -1000 +1002 @@
                 }
 
-                right->mPvsSize = right->GetPvs().CountPvs(); 
+                // set scalars
+                mViewCellsManager->UpdateScalarPvsSize(right, 
+                        right->GetPvs().CountObjectsInPvs(), 
+                        right->GetPvs().GetSize());
+
                 right->mPvsSizeValid = true;
                 
@@ -1285 +1291 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(vc->GetPvs().CountPvs(), lower, upper);
+                const float penalty = EvalPvsPenalty(vc->GetPvs().CountObjectsInPvs(), lower, upper);
                 return fabs(mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
         }
@@ -1298 +1304 @@
         if (mUseAreaForPvs)
         {
-                return vc->GetPvs().CountPvs() * vc->GetArea();
-        }
-
-        return vc->GetPvs().CountPvs() * vc->GetVolume();
+                return vc->GetPvs().CountObjectsInPvs() * vc->GetArea();
+        }
+
+        return vc->GetPvs().CountObjectsInPvs() * vc->GetVolume();
 }
 
@@ -1469 +1475 @@
         const int rootEntries = GetPvsEntries(mRoot);
 
+        Debug << "******** Export stats **********" << endl;
         /*Debug << "vsb volume: " << vol << endl;
         Debug << "root volume: " << mRoot->GetVolume() << endl;
@@ -1517 +1524 @@
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
-
+Debug << "\nhere92" << endl;
                         for (it = interior->mChildren.begin(); it != it_end; ++ it)
                         {
+                                Debug << "here15" << endl;
                                 ViewCell *vc = *it;
+
                                 const int pvsSize = GetPvsSize(vc);
                                 const int pvsEntries = GetPvsEntries(vc);
@@ -1532 +1541 @@
                         }
 
-                
+Debug << "\nhere1005" << endl;
                         const float costDecr = (parentCost - childCost) / vol;
 
@@ -1655 +1664 @@
 }
 
+
 // TODO matt: implement this function for different storing methods
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const
@@ -1708 +1718 @@
 int ViewCellsTree::GetPvsSizeForLeafStorage(ViewCell *vc) const
 {
-        int pvsSize = 0;
-
         // pvs is always stored directly in leaves
         if (vc->IsLeaf())
         {
-                pvsSize = vc->GetPvs().CountPvs();
-                //int pvsSize1 = vc->GetPvs().GetSize();
-                //Debug << "entries num: " << pvsSize1 << " size: "" << pvsSize << endl;
-        }
-        else // interior node
-        {
-                // interior nodes: pvs is either stored as a scalar or
-                // has to be reconstructed from the leaves
-
-                // the stored pvs size is the valid pvs size => just return scalar
-                if (vc->mPvsSizeValid)
-                {
-                        pvsSize = vc->mPvsSize;
-                }
-                
-                // if no valid pvs size stored as a scalar => 
-                // compute current pvs size of interior from it's leaf nodes
-                ViewCellContainer leaves;
-                CollectLeaves(vc, leaves);
-
-                ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-                Intersectable::NewMail();
-
-                // sum different intersectables
-                for (it = leaves.begin(); it != it_end; ++ it)
-                {
-                        pvsSize = GetPvsSizeForLeafStorage(*it);
-                }
-        }
-
-        return pvsSize;
+                return vc->GetPvs().CountObjectsInPvs();
+        }
+        
+        // interior node
+        
+        // interior nodes: pvs is either stored as a scalar or
+        // has to be reconstructed from the leaves
+
+        // the stored pvs size is the valid pvs size => just return scalar
+        if (vc->mPvsSizeValid)
+        {
+                Debug << "here5"<<endl;
+                return vc->mPvsSize;
+        }
+        
+        Debug << "here2"<<endl;
+
+        // if no valid pvs size stored as a scalar => 
+        // compute current pvs size of interior from it's leaf nodes
+        ViewCellContainer leaves;
+        CollectLeaves(vc, leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        Intersectable::NewMail();
+        ObjectPvs newPvs;
+
+        // sum different intersectables
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                ObjectPvsMap::iterator oit, oit_end = (*it)->GetPvs().mEntries.end();
+
+                for (oit = (*it)->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *intersect = (*oit).first;
+
+                        if (!intersect->Mailed())
+                        {
+                                intersect->Mail();
+                                newPvs.AddSample(intersect, (*oit).second.mSumPdf);
+                        }
+                }
+        }
+
+        return newPvs.CountObjectsInPvs();
 }
 
@@ -1750 +1771 @@
 int ViewCellsTree::GetEntriesInPvsForLeafStorage(ViewCell *vc) const
 {
-        int pvsSize = 0;
-
         // pvs is always stored directly in leaves
         if (vc->IsLeaf())
         {
-                pvsSize = vc->GetPvs().GetSize();
-        }
-        else // interior node
-        {
-                // interior nodes: pvs is either stored as a scalar or
-                // has to be reconstructed from the leaves
-
-                // the stored pvs size is the valid pvs size => just return scalar
-                if (vc->mPvsSizeValid)
-                {
-                        pvsSize = vc->mEntriesInPvs;
-                }
-                
-                // if no valid pvs size stored as a scalar => 
-                // compute current pvs size of interior from it's leaf nodes
-                ViewCellContainer leaves;
-                CollectLeaves(vc, leaves);
-
-                ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-                Intersectable::NewMail();
-
-                // sum different intersectables
-                for (it = leaves.begin(); it != it_end; ++ it)
-                {
-                        pvsSize = GetEntriesInPvsForLeafStorage(*it);
+                return vc->GetPvs().GetSize();
+        }
+        
+        // interior node
+
+        // interior nodes: pvs is either stored as a scalar or
+        // has to be reconstructed from the leaves
+
+        // the stored pvs size is the valid pvs size => just return scalar
+        if (vc->mPvsSizeValid)
+        {
+                return vc->mEntriesInPvs;
+        }
+        
+        int pvsSize = 0;
+
+        // if no valid pvs size stored as a scalar => 
+        // compute current pvs size of interior from it's leaf nodes
+        ViewCellContainer leaves;
+        CollectLeaves(vc, leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+        Intersectable::NewMail();
+
+        // sum different intersectables
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                ObjectPvsMap::iterator oit, oit_end = (*it)->GetPvs().mEntries.end();
+
+                for (oit = (*it)->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *intersect = (*oit).first;
+
+                        if (!intersect->Mailed())
+                        {
+                                intersect->Mail();
+                                ++ pvsSize;
+                        }
                 }
         }
@@ -1916 +1947 @@
                 // pvs is stored consistently in the tree up to the root
                 // just return pvs size 
-                pvsSize = vc->GetPvs().CountPvs();      
+                pvsSize = vc->GetPvs().CountObjectsInPvs();     
                 break;
         }