Changeset 581

Timestamp:

02/02/06 10:03:10 (18 years ago)

Author:

mattausch

Message:

added function for pvs compression

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/Pvs.h (modified) (2 diffs)
• src/ViewCell.cpp (modified) (7 diffs)
• src/ViewCell.h (modified) (3 diffs)
• src/ViewCellsManager.cpp (modified) (4 diffs)
• src/ViewCellsManager.h (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -180 +180 @@
         }
 
+        active 150
+
         exportToFile false
         loadFromFile false
@@ -203 +205 @@
                 renderCostWeight 0.5
                 maxCostRatio 0.1
-                minViewCells 110
+                minViewCells 1
                 avgCostMaxDeviation 0.8
                 maxMergesPerPass 500 

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1206 +1206 @@
                         "bspTree");
 
+        RegisterOption("ViewCells.active",
+                                        optInt,
+                                        "1000");
+
         RegisterOption("ViewCells.Construction.samples",
                                         optInt,

trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

@@ -112 +112 @@
 };
 
+
 template <typename T>
 int Pvs<T>::Diff(const Pvs<T> &b)
@@ -134 +135 @@
 
         mEntries = a.mEntries;
-        // todo: copy all elements instead of inserting
-        //for (it = a.mEntries.begin(); it != a.mEntries.end(); ++ it)
-        //      mEntries.insert(*it);
         
         for (it = b.mEntries.begin(); it != b.mEntries.end(); ++ it)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -22 +22 @@
         bool operator() (T v1, T v2) const
         {
-                return (v1->GetTimeStamp() > v2->GetTimeStamp());
+                return (v1->GetTimeStamp() < v2->GetTimeStamp());
         }
 };
@@ -220 +220 @@
 
 
+
 /************************************************************************/
 /*                class ViewCellInterior implementation                 */
@@ -471 +472 @@
         //-- use priority queue to merge leaf pairs
 
-        while (!mMergeQueue.empty() && (realNumViewCells > mMergeMinViewCells) &&
-                   (mMergeQueue.top().GetRenderCost() < mMergeMaxCostRatio * totalCost))
+        while (!mMergeQueue.empty() && (realNumViewCells > mMergeMinViewCells))
         {
                 //-- reset merge queue if the ratio of current expected cost / real expected cost
                 //   too small or after a given number of merges
-                if(0)
                 if ((mergedPerPass > maxMergesPerPass) ||
                         (avgCostMaxDeviation > mAvgRenderCost / realAvgRenderCost))
@@ -611 +610 @@
         if ((int)viewCells.size() > 1)
         {
+                Debug << "here888" << endl;
                 ViewCellInterior *root = new ViewCellInterior();
+
+                root->SetTimeStamp(mergeStats.merged + 1);
 
                 ViewCellContainer::const_iterator it, it_end = viewCells.end();
@@ -621 +623 @@
         else if ((int)viewCells.size() == 1)
         {
+                Debug << "here555" << endl;
                 mRoot = viewCells[0];
         }
 
+        // TODO delete because makes no sense here
         mergeStats.expectedRenderCost = realExpectedCost;
         mergeStats.deviation = mDeviation;
@@ -640 +644 @@
         //TODO: should return sample contributions?
         return mergeStats.merged;
+}
+
+
+ViewCell *ViewCellsTree::GetRoot()
+{
+        return mRoot;
 }
 
@@ -1217 +1227 @@
 {
         stack<ViewCell *> tstack;
-
-
-}
-
-
-void  ViewCellsTree::CollectBestViewCellSet(ViewCellContainer &viewCells, const int numViewCells)
+        
+        while (!tstack.empty())
+        {
+                ViewCell *viewCell = tstack.top();
+                tstack.pop();
+
+                if (viewCell->IsLeaf())
+                {
+                        
+                }
+                else
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(viewCell);                        
+                        ComputeCommonPvs(interior);
+                }
+        }
+}
+
+
+void ViewCellsTree::CollectBestViewCellSet(ViewCellContainer &viewCells, 
+                                                                                   const int numViewCells)
 {
         TraversalQueue tqueue;
-
+        tqueue.push(mRoot);
+        Debug << "here34 " << numViewCells << endl;
         while (!tqueue.empty())
         {
                 ViewCell *vc = tqueue.top();
-
                 tqueue.pop();
+                Debug << "here7 " << vc->GetTimeStamp() << endl;
+                if (vc->IsLeaf())
+                {
+                        Debug << "here6" << endl;
+                        viewCells.push_back(vc);
+                }
+                else if (viewCells.size() + tqueue.size() < numViewCells)
+                {       Debug << "here4" << endl;
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tqueue.push(*it);
+                        }
+                }
+        }
+}
+        
+
+void ViewCellsTree::ComputeCommonPvs(ViewCellInterior *interior)
+{
+        Intersectable::NewMail();
+
+        ViewCellContainer::const_iterator cit, cit_end = interior->mChildren.end();
+
+        ObjectPvsMap::const_iterator oit;
+
+        // mail all objects in the leaf sets
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+
+                ObjectPvsMap::const_iterator oit_end = vc->GetPvs().mEntries.end();
+
+                for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        if (!(*oit).first->Mailed())
+                                (*oit).first->Mail();
+                        
+                        (*oit).first->IncMail();
+                }
+        }
+
+        interior->GetPvs().mEntries.clear();
+    cit_end = interior->mChildren.end();
+        
+        // only the objects which are present in all leaf pvs 
+        // should remain in the parent pvs
+
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+
+                ObjectPvsMap::const_iterator oit_end = vc->GetPvs().mEntries.end();
+
+                for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        if ((*oit).first->Mailed((int)interior->mChildren.size()))
+                        {       
+                                interior->GetPvs().AddSample((*oit).first, (*oit).second.mSumPdf);
+                                //(*oit)->remove();
+                        }
+                }
+        }
+
+        // delete all the objects from the leaf sets which were moved
+        // to parent pvs
+        ObjectPvsMap::const_iterator oit_end = interior->GetPvs().mEntries.end();
+
+        for (oit = interior->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+        {
+                for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+                {
+                        (*cit)->GetPvs().RemoveSample((*oit).first, Limits::Infinity);
+                }
         }
 }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -293 +293 @@
         void CollectBestViewCellSet(ViewCellContainer &viewCells, const int numViewCells);
 
+        /** Root of view cells tree.
+        */
+        ViewCell *GetRoot();
+
 protected:
 
@@ -350 +354 @@
                                                            const int numNewViewCells);
 
-
-
         /** merge queue must be reset after some time because expected value
                 may not be valid.
@@ -360 +362 @@
         */
         int UpdateMergedViewCells(ViewCellContainer &viewCells);
+
+        void ComputeCommonPvs(ViewCellInterior *interior);
 
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -53 +53 @@
 
         environment->GetIntValue("ViewCells.Construction.samplesPerPass", mSamplesPerPass);
-
         environment->GetBoolValue("ViewCells.exportToFile", mExportViewCells);
-
         environment->GetBoolValue("ViewCells.PostProcess.useRaysForMerge", mUseRaysForMerge);
+        
+        environment->GetIntValue("ViewCells.active", mNumActiveViewCells);
 
         mMinPvsSize = emptyViewCells ? 1 : 0;
@@ -234 +234 @@
 
   return true;
+}
+
+
+bool ViewCellsManager::ViewCellsTreeConstructed() const
+{
+        return mViewCellsTree->GetRoot();
 }
 
@@ -684 +690 @@
 }
 
+
 int ViewCellsManager::GetMinPvsSize() const
 {
@@ -2066 +2073 @@
 void VspBspViewCellsManager::CollectViewCells()
 {
-        mVspBspTree->CollectViewCells(mViewCells, true);
+        // view cells tree constructed
+        if (!ViewCellsTreeConstructed())
+        {
+                mVspBspTree->CollectViewCells(mViewCells, true);
+        }
+        else 
+        {
+                // we can use the view cells tree hierarchy to get the right set
+                mViewCellsTree->CollectBestViewCellSet(mViewCells, mNumActiveViewCells);
+        }
+
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -339 +339 @@
         ViewCellsTree *GetViewCellsTree();
 
-        virtual void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates) = 0;
-
+        virtual void CollectMergeCandidates(const VssRayContainer &rays, 
+                                                                                vector<MergeCandidate> &candidates) = 0;
+
+        
 
 protected:
+
+        /**
+                if the view cells tree was already constructed or not.
+        */
+        bool ViewCellsTreeConstructed() const;
 
         int CastPassSamples(const int samplesPerPass, 
@@ -421 +428 @@
         int mMinPvsSize;
         float mMaxPvsRatio;
+
+        int mNumActiveViewCells;
 
         ViewCellsStatistics mViewCellsStats;