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

Timestamp:

04/20/06 13:25:41 (18 years ago)

Author:

mattausch

Message:

after rendering workshop submissioin
x3dparser can use def - use constructs
implemented improved evaluation (samples are only stored in leaves, only propagate pvs size)

File:

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

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

@@ -18 +18 @@
 {
 public:
-        //bool operator() (HierarchyNode *v1, HierarchyNode *v2) const
         bool operator() (T v1, T v2) const
         {
@@ -39 +38 @@
 
 // pvs penalty can be different from pvs size
-inline float EvalPvsPenalty(const int pvs, const int lower, const int upper)
+inline static float EvalPvsPenalty(const int pvs, const int lower, const int upper)
 {
         // clamp to minmax values
-#if HAS_TO_BE_REDONE
         if (pvs < lower)
                 return (float)lower;
         if (pvs > upper)
                 return (float)upper;
-#endif
+
         return (float)pvs;
 }
@@ -70 +68 @@
 
 /// Fast computation of merged pvs size
-int ComputeMergedPvsSize(const ObjectPvs &pvs1, const ObjectPvs &pvs2)
+static int ComputeMergedPvsSize(const ObjectPvs &pvs1, const ObjectPvs &pvs2)
 {
         // add first pvs
@@ -99 +97 @@
 
 // computet render cost of merge
-float ViewCellsTree::ComputeMergedPvsCost(const ObjectPvs &pvs1, const ObjectPvs &pvs2) const
+float ViewCellsTree::ComputeMergedPvsCost(const ObjectPvs &pvs1, 
+                                                                                  const ObjectPvs &pvs2) const
 {
         float renderCost = 0;
@@ -143 +142 @@
 mParent(NULL),
 mMergeCost(0),
-mIsActive(false)
+mIsActive(false),
+mPvsSize(0),
+mPvsSizeValid(false)
 {
 }
@@ -156 +157 @@
 mMergeCost(0),
 mIsActive(false),
-mLastUpdated(sLastUpdated)
+mLastUpdated(sLastUpdated),
+mPvsSize(0),
+mPvsSizeValid(false)
 {
 }
@@ -165 +168 @@
         return mPvs;
 }
+
 
 ObjectPvs &ViewCell::GetPvs()
@@ -205 +209 @@
 {
         mArea = area;
+}
+
+
+void ViewCell::SetColor(const RgbColor &color) 
+{
+        mColor = color;
+}
+
+
+RgbColor ViewCell::GetColor() const 
+{
+        return mColor;
 }
 
@@ -367 +383 @@
 mUseAreaForPvs(false),
 mViewCellsManager(vcm),
-mIsCompressed(false)
+#if 0
+mViewCellsStorage(PVS_IN_INTERIORS)
+#else
+mViewCellsStorage(PVS_IN_LEAVES)
+#endif
 {
         environment->GetBoolValue("ViewCells.Visualization.exportMergedViewCells", mExportMergedViewCells);
@@ -393 +413 @@
 float ViewCellsTree::GetMemUsage() const
 {
+        // TODO
         return 0;
                 /*(sizeof(ViewCellsTree) +
@@ -513 +534 @@
         // we start with the current view cells from the view cell manager. 
         // The active view cells will change with subsequent merges
-        Debug << "here2" << endl; Debug.flush();
+        
         // todo: should rather take initial view cells
     ViewCellContainer &activeViewCells = mViewCellsManager->GetViewCells();
-        //ViewCellContainer activeViewCells;
-        
-        Debug << "here2.6" << endl; Debug.flush();
+        
+        
         ViewCell::NewMail();
 
@@ -704 +724 @@
                 Debug << "setting root of the merge history" << endl;
                 mRoot = activeViewCells[0];
-                Debug << "rootvc volume: " << mRoot->GetVolume() << endl;
+                Debug << "volume of the root view cell: " << mRoot->GetVolume() << " " << mViewCellsManager->GetViewSpaceBox().GetVolume() << endl;
+        }
+        else
+        {
+                Debug << "big error, root is NULL" << endl;
         }
         
@@ -803 +827 @@
                         swap(viewCells[i], viewCells.back());
                 
-                // mail view cell as it has not been merged
+                // mail view cell that it has not been merged
                 viewCells[i]->Mail();
 
@@ -814 +838 @@
         // merged in the mean time
         ViewCellContainer::const_iterator ait, ait_end = mMergedViewCells.end();
+
         for (ait = mMergedViewCells.begin(); ait != ait_end; ++ ait)
         {
@@ -825 +850 @@
         }
 
+        // dispose old merged view cells
         mMergedViewCells.clear();
 
@@ -836 +862 @@
                 const int lower = mViewCellsManager->GetMinPvsSize();
                 const int upper = mViewCellsManager->GetMaxPvsSize();
+
                 const float penalty = EvalPvsPenalty((*vit)->GetPvs().GetSize(), lower, upper);
                 
@@ -905 +932 @@
         if (!vc) return NULL;
 
+        // set to the new parent view cell
         l->SetParent(vc);
         r->SetParent(vc);
@@ -932 +960 @@
         pvsDiff = vc->GetPvs().GetSize() - pvs1 - pvs2;
 
+
+
+        //Ždon't store intermediate pvs
+        if (mViewCellsStorage == PVS_IN_LEAVES)
+        {
+                l->mPvsSize = l->GetPvs().GetSize(); 
+                l->mPvsSizeValid = true;
+                
+                if (!l->IsLeaf())
+                        l->GetPvs().Clear();
+                
+                r->mPvsSize = r->GetPvs().GetSize(); 
+                r->mPvsSizeValid = true;
+                
+                if (!r->IsLeaf())
+                        r->GetPvs().Clear();
+        
+}
+
+
         return vc;
 }
-
 
 
@@ -1189 +1236 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
-                return (mAvgRenderCost - penalty) * (mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
+                const float penalty = 
+                        EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
+                return (mAvgRenderCost - penalty) * (mAvgRenderCost - penalty) / 
+                        (float)mNumActiveViewCells;
         }
 
@@ -1233 +1282 @@
 bool ViewCellsTree::ValidateMergeCandidate(MergeCandidate &mc) const
 {
+        // propagate up so we have only the active view cells
         while (mc.mLeftViewCell->mParent)
         {
@@ -1243 +1293 @@
         }
 
+        // this view cell was already merged
+        //return mc.mLeftViewCell && (mc.mLeftViewCell != mc.mRightViewCell);
         return mc.mLeftViewCell != mc.mRightViewCell;
 }
@@ -1250 +1302 @@
 {
         //-- compute pvs difference
-        const float newPvs = 
-#if 1 // not valid if not using const cost per object!!
-                ComputeMergedPvsSize(mc.mLeftViewCell->GetPvs(), 
-                                                         mc.mRightViewCell->GetPvs());
-#else
-                ComputeMergedPvsCost(mc.mLeftViewCell->GetPvs(), 
-                                                         mc.mRightViewCell->GetPvs());
-#endif
+        int newPvs;
+        if (1) // not valid if not using const cost per object!!
+                newPvs = ComputeMergedPvsSize(mc.mLeftViewCell->GetPvs(), mc.mRightViewCell->GetPvs());
+        else
+                newPvs = (int)ComputeMergedPvsCost(mc.mLeftViewCell->GetPvs(), mc.mRightViewCell->GetPvs());
 
         const float newPenalty = EvalPvsPenalty(newPvs,
@@ -1305 +1354 @@
 }
 
-void ViewCellsTree::CompressViewCellsPvs()
-{
-        if (!mIsCompressed)
-        {
-                mIsCompressed = true;
+
+void ViewCellsTree::SetViewCellsStorage(int stype)
+{
+        if (mViewCellsStorage == stype)
+                return;
+
+        // TODO
+        switch (stype)
+        {
+        case COMPRESSED:
                 CompressViewCellsPvs(mRoot);
-        }
-}
+                break;
+        default:
+                break;
+        }
+
+        mViewCellsStorage = stype;
+}
+
 
 void ViewCellsTree::CompressViewCellsPvs(ViewCell *root)
@@ -1344 +1404 @@
         const float vol = box.GetVolume();
 
+        const int rootPvs = GetPvsSize(mRoot);
+
         Debug << "vsb volume: " << vol << endl;
         Debug << "root volume: " << mRoot->GetVolume() << endl;
-        Debug << "root pvs: " << mRoot->GetPvs().GetSize() << endl;
+        Debug << "root pvs: " << rootPvs << endl;
 
         int totalPvs;
@@ -1352 +1414 @@
 
         float deviation = 0;
-        totalPvs = (int)mRoot->GetPvs().GetSize();
-        totalRenderCost = avgRenderCost = expectedCost = (float)mRoot->GetPvs().GetSize();
+        totalPvs = rootPvs;
+        totalRenderCost = avgRenderCost = expectedCost = (float)rootPvs;
 
         ofstream stats;
         stats.open(mergeStats.c_str());
 
+        //-- first view cell
         stats 
                 << "#Pass\n" << 0 << endl
@@ -1364 +1427 @@
         << "#RenderCostDecrease\n" << 0 << endl // TODO
                 << "#TotalRenderCost\n" << totalRenderCost << endl
-                << "#CurrentPvs\n" << mRoot->GetPvs().GetSize() << endl
+                << "#CurrentPvs\n" << rootPvs << endl
                 << "#ExpectedCost\n" << expectedCost << endl
                 << "#AvgRenderCost\n" << avgRenderCost << endl
@@ -1383 +1446 @@
                         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
                         
-                        const int parentPvs = interior->GetPvs().GetSize();
+                        const int parentPvs = GetPvsSize(interior);
                         const float parentCost = (float)parentPvs * interior->GetVolume();
                         float childCost = 0;
@@ -1394 +1457 @@
                         for (it = interior->mChildren.begin(); it != it_end; ++ it)
                         {
-                                childCost += (float)(*it)->GetPvs().GetSize() * (*it)->GetVolume();
-                                childPvs += (*it)->GetPvs().GetSize();
+                                int pvsSize = GetPvsSize(*it);
+                                childCost += (float) pvsSize * (*it)->GetVolume();
+                                childPvs += pvsSize;
 
                                 tqueue.push(*it);
@@ -1416 +1480 @@
                                 << "#RenderCostDecrease\n" << costDecr << endl // TODO
                                 << "#TotalRenderCost\n" << totalRenderCost << endl
-                                << "#CurrentPvs\n" << vc->GetPvs().GetSize() << endl
+                                << "#CurrentPvs\n" << parentPvs << endl
                                 << "#ExpectedCost\n" << expectedCost << endl
                                 << "#AvgRenderCost\n" << avgRenderCost << endl
@@ -1432 +1496 @@
 
 
-#if 0
-float ViewCellsTree::ComputeVolume(ViewCell *vc)
-{
-        if (vc->IsLeaf())
-        {
-                return vc->GetVolume();
-        }
-        else
-        {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
-
-                ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
-
-                float volume = 0;
-
-                for (it = interior->mChildren.begin(); it != it_end; ++ it)
-                {
-                        volume += ComputeVolume(*it);   
-                }
-
-                interior->SetVolume(volume);
-                return volume;
-        }
-}
-#endif
-
 void ViewCellsTree::SetRoot(ViewCell *root)
 {
@@ -1558 +1596 @@
         }
 
-        int dummy = interior->GetPvs().GetSize();
+        /*int dummy = interior->GetPvs().GetSize();
 
         for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
         {
                 dummy += (*cit)->GetPvs().GetSize();
-        }
-
-}
-
-
+        }*/
+
+}
+
+// TODO
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const
 {
         Intersectable::NewMail();
 
-        if (!mIsCompressed)
+        if (mViewCellsStorage == PVS_IN_INTERIORS)
                 pvs = vc->GetPvs();
 
@@ -1612 +1650 @@
 int ViewCellsTree::GetPvsSize(ViewCell *vc) const
 {
+        int pvsSize = 0;
+
+        if (vc->IsLeaf())
+        {
+                pvsSize = vc->GetPvs().GetSize();
+        }
+        
+
         Intersectable::NewMail();
 
-        if (!mIsCompressed)
-                return vc->GetPvs().GetSize();
-
-
-        ////////////////////////777
+        //////////////////////////
+        switch (mViewCellsStorage)
+        {
+        case PVS_IN_LEAVES: //-- store pvs only in leaves
+                {                       
+                        if (vc->mPvsSizeValid)
+                        {
+                                pvsSize = vc->mPvsSize;
+                                break;
+                        }
+        
+                        //-- if no valid pvs size stored as a scalar=> compute new pvs size
+                        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();
+
+                                // mail all from first pvs
+                                for (oit = (*it)->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                                {
+                                        Intersectable *intersect = (*oit).first;
+
+                                        if (!intersect->Mailed())
+                                        {
+                                                ++ pvsSize;
+                                                intersect->Mail();                                      
+                                        }
+                                }
+                        }
+
+                        break;
+                }
+        case COMPRESSED:
+                {
+                        ////////////////////////
         //-- compressed pvs
 
+                        if (vc->mPvsSizeValid)
+                                return vc->mPvsSize;
+
+                        // if no pvs size stored: compute
         int pvsSize = 0;
         ViewCell *root = vc;
@@ -1653 +1740 @@
                 }
         }
+                        break;
+                }
+        case PVS_IN_INTERIORS:
+        default:Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().GetSize() << endl;
+                pvsSize = vc->GetPvs().GetSize();               
+        }
 
         return pvsSize;  
-
 }
 
@@ -1672 +1764 @@
         int pvsSize = 0;
         // only count leaves for uncompressed method for fairness
-        if (mIsCompressed || vc->IsLeaf())
+        if ((mViewCellsStorage == PVS_IN_INTERIORS) || vc->IsLeaf())
+        {
                 pvsSize = vc->GetPvs().GetSize();
+        }
 
         if (!vc->IsLeaf())
@@ -1691 +1785 @@
 
 
-bool ViewCellsTree::IsCompressed() const
-{
-        return mIsCompressed;
+int ViewCellsTree::ViewCellsStorage() const
+{
+        return mViewCellsStorage;
 }
 
@@ -1845 +1939 @@
         if (!vc->GetValid())
                 ++ vcStat.invalid;
-
-        /*ViewCellsContainer leaves;
-        CollectLeaves(vc, leaves);
-
-        vcStat.leaves = (int)leaves.size();*/
 }
 
@@ -1969 +2058 @@
 void ViewCellsTree::SetActiveSetToLeaves()
 {
+        // todo
 }
 
@@ -2026 +2116 @@
 bool MergeCandidate::IsValid() const
 {
+        // if one has a parent, it was already merged
         return !(mLeftViewCell->mParent || mRightViewCell->mParent);
 }