Changeset 1142 for GTP/trunk

Timestamp:

07/19/06 00:26:49 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• ViewCell.cpp (modified) (2 diffs)
• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (12 diffs)
• ViewCellsManager.h (modified) (1 diff)
• VspOspTree.cpp (modified) (8 diffs)
• VspOspTree.h (modified) (2 diffs)

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

@@ -1288 +1288 @@
                                         "perobject");
 
-        RegisterOption("ViewCells.Evaluation.countKdPvs",
-                                        optBool,
-                                        "view_cells_evaluation_count_kd_pvs=",
-                                        "false");
-
         RegisterOption("ViewCells.active",
                                         optInt,
@@ -2219 +2214 @@
         RegisterOption("VspTree.storeKdPvs",
                                         optBool,
-                                        "vsp_storeKdPvs=",
+                                        "vsp_store_kd_pvs=",
                                         "true");
         

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

@@ -1677 +1677 @@
 
 
-int ViewCellsTree::CountKdPvs(const ViewCellLeaf *vc) const
-{
-        ObjectPvsMap::const_iterator oit, oit_end = vc->GetPvs().mEntries.end();
-
+int ViewCellsTree::GetPvsSize(ViewCell *vc) const
+{
         int pvsSize = 0;
 
         Intersectable::NewMail();
 
-        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
-        {
-                Intersectable *obj = (*oit).first;
-
-/*              KdLeaf *leaf = ;
-
-                        pvsSize += ((int)leaf->mObjects.size() - (int)leaf->mMultipleObjects.size());
-
-                        //-- handle objects of several kd leaves separately
-                        ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
-
-                        for (oit = leaf->mMultipleObjects.begin(); oit != oit_end; ++ oit)
-                        {
-                                Intersectable *object = *oit;
-
-                                // object not previously in left pvs
-                                if (!object->Mailed())
-                                {
-                                        object->Mail();
-                                        ++ pvsSize;
-                                }
-                        }               
-                }*/
-        }
-
-        return pvsSize;
-}
-
-
-int ViewCellsTree::GetPvsSize(ViewCell *vc, const bool countKdPvs) const
-{
-        int pvsSize = 0;
-
-        Intersectable::NewMail();
-
-        //////////////////////////
-        // for interiors, pvs can be stored using different methods
+        ////////////////////////////////////////////////
+        //-- for interiors, pvs can be stored using different methods
+        ///////////////////////////////////////////////
 
         switch (mViewCellsStorage)
@@ -1730 +1694 @@
                         if (vc->IsLeaf())
                         {
-                                if (countKdPvs)
-                                        pvsSize = vc->GetPvs().CountPvs();
-                                else
-                                        pvsSize = CountKdPvs(dynamic_cast<ViewCellLeaf *>(vc));
-                                break;
+                                pvsSize = vc->GetPvs().CountPvs();
                         }
         

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

@@ -439 +439 @@
         void GetPvs(ViewCell *vc, ObjectPvs &pvs) const;
 
-        /** Returns pvs size of view cell.
-        */
-        //int GetPvsSize(ViewCell *vc) const;
-        int GetPvsSize(ViewCell *vc, const bool countKdPvs = false) const;
+        /** Returns pvs size (i.e. the number of entries weighted by their "importance".
+        */
+        int GetPvsSize(ViewCell *vc) const;
 
         /** Returns actual number of object in this pvs and the children.

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

@@ -100 +100 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportBboxesForPvs", mExportBboxesForPvs);
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportPvs", mExportPvs);
-        Environment::GetSingleton()->GetBoolValue("ViewCells.Evaluation.countKdPvs", mCountKdPvs);
+        
 
         char buf[100];
@@ -214 +214 @@
         Debug << "export bounding boxes: " << mExportBboxesForPvs << endl;
         Debug << "export pvs for view cells: " << mExportPvs << endl;
-        Debug << "count kd pvs: " << mCountKdPvs << endl;
+        
         
         Debug << endl;
@@ -788 +788 @@
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        maxPvs = mViewCellsTree->GetPvsSize(viewCells.back(), mCountKdPvs);
+        maxPvs = mViewCellsTree->GetPvsSize(viewCells.back());
         minVal = 0;
 
@@ -832 +832 @@
 
                 while ((i < (int)viewCells.size()) && 
-                           (mViewCellsTree->GetPvsSize(viewCells[i], mCountKdPvs) < currentPvs))
+                           (mViewCellsTree->GetPvsSize(viewCells[i]) < currentPvs))
                 {
                         volDif += viewCells[i]->GetVolume();
@@ -843 +843 @@
                 
                 if (0 && (i < (int)viewCells.size()))
-                        Debug << "new pvs size increase: " << mViewCellsTree->GetPvsSize(viewCells[i], mCountKdPvs) 
+                        Debug << "new pvs size increase: " << mViewCellsTree->GetPvsSize(viewCells[i]) 
                         << " " << currentPvs << endl;
         
@@ -1706 +1706 @@
                 ViewCell *viewcell = *it;
 
-                const int pvsSize = mViewCellsTree->GetPvsSize(viewcell, mCountKdPvs);
+                const int pvsSize = mViewCellsTree->GetPvsSize(viewcell);
 
                 if (pvsSize < stat.minPvs)
@@ -1957 +1957 @@
 float ViewCellsManager::GetRendercost(ViewCell *viewCell) const
 {
-        return mViewCellsTree->GetPvsSize(viewCell, mCountKdPvs);
+        return mViewCellsTree->GetPvsSize(viewCell);
 }
 
@@ -2409 +2409 @@
                         {
                                 importance = 
-                                        (float)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) / 
+                                        (float)mViewCellsTree->GetPvsSize(vc) / 
                                         (float)mCurrentViewCellsStats.maxPvs;
                         }
@@ -4390 +4390 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) << endl;
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
                 //-- export the sample rays
@@ -4904 +4904 @@
         long startTime;
 
-        mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
         //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
-        
+        //mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
+        mHierarchyManager->Construct3(constructionRays, objects, &mViewSpaceBox);
+
         //-- stats
         Debug << mVspTree->GetStatistics() << endl;
@@ -5301 +5302 @@
         }
 
-        if (1) 
+        if (1 && mOspTree->GetRoot()) 
         {       
                 //-- export final object partition
@@ -5383 +5384 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) << endl;
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
                 //-- export the sample rays

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

@@ -655 +655 @@
         /// if pvs should be exported with view cells
         bool mExportPvs;
-// matt§§: need this?
-        bool mCountKdPvs;
 };
 

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

@@ -523 +523 @@
 
 
-void VspTree::CreateViewCell(VspTraversalData &tData)
+void VspTree::CreateViewCell(VspTraversalData &tData, const bool updatePvs)
 {
         //-- create new view cell
@@ -530 +530 @@
         VspViewCell *viewCell = new VspViewCell();
     leaf->SetViewCell(viewCell);
-                
-        //-- update pvs
+        
         int conSamp = 0;
         float sampCon = 0.0f;
-        AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
-
-        // update scalar pvs size value
-        mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
-
-        mVspStats.contributingSamples += conSamp;
-        mVspStats.sampleContributions +=(int) sampCon;
+
+        //-- update pvs
+        if (updatePvs)
+        {
+                AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
+
+                // update scalar pvs size value
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
+
+                mVspStats.contributingSamples += conSamp;
+                mVspStats.sampleContributions += (int)sampCon;
+        }
+
 
         //-- store additional info
@@ -766 +771 @@
 
         // explicitely create front and back view cell
-        CreateViewCell(frontData);
-        CreateViewCell(backData);
+        CreateViewCell(frontData, true);
+        CreateViewCell(backData, true);
 
         
@@ -773 +778 @@
         // add front and back view cell to "Potentially Visbilie View Cells" 
         // of the objects in front and back pvs
-        AddViewCellReferences(frontLeaf->GetViewCell());
-        AddViewCellReferences(backLeaf->GetViewCell());
+
+        //AddViewCellReferences(frontLeaf->GetViewCell());
+        //AddViewCellReferences(backLeaf->GetViewCell());
 
         interior->mTimeStamp = mTimeStamp ++;
@@ -4004 +4010 @@
         mVspTree.mVspStats.nodes = 1;
 
-        // prepare bounding box
+        // compute view space bounding box
         mVspTree.ComputeBoundingBox(rays, forcedViewSpace);
 
@@ -4032 +4038 @@
 
         // create first view cell
-        mVspTree.CreateViewCell(vData);
+        mVspTree.CreateViewCell(vData, true);
                 
         // add first view cell to all the objects view cell pvs
@@ -4179 +4185 @@
         mVspTree.mVspStats.Stop();
         
+        
+        ///////////////////////////////////////////////////////////////
+        //-- object space partition
+        /////////////////////////////////////////////////////////////
+
+
+        cout << "starting osp contruction ... " << endl;
         startTime = GetTime();
-        cout << "starting osp contruction ... " << endl;
-
-        //-- object space partition
+
         SplitCandidate *osc =
                 PrepareOsp(sampleRays, objects, forcedViewSpace, *objectSpaceRays);
@@ -4222 +4233 @@
         mVspTree.mStoreKdPvs = savedStoreMethod;
 }
+
+
+void HierarchyManager::Construct3(const VssRayContainer &sampleRays,
+                                                                  const ObjectContainer &objects,
+                                                                  AxisAlignedBox3 *forcedViewSpace)
+{
+        RayInfoContainer *viewSpaceRays = new RayInfoContainer();
+
+        SplitCandidate *sc = PrepareVsp(sampleRays, forcedViewSpace, *viewSpaceRays);
+        mTQueue.Push(sc);
+
+        cout << "starting vsp contruction ... " << endl;
+
+        long startTime = GetTime();
+        int i = 0;
+
+        while (!FinishedConstruction())
+        {
+                SplitCandidate *splitCandidate = NextSplitCandidate();
+            
+                const bool globalTerminationCriteriaMet = 
+                        GlobalTerminationCriteriaMet(splitCandidate);
+
+                cout << "vsp nodes: " << i ++ << endl;
+
+                // cost ratio of cost decrease / totalCost
+                const float costRatio = splitCandidate->GetPriority() / mTotalCost;
+                //cout << "cost ratio: " << costRatio << endl;
+
+                if (costRatio < mTermMinGlobalCostRatio)
+                        ++ mGlobalCostMisses;
+
+                //-- subdivide leaf node
+
+                // we have either a object space or view space split
+                VspTree::VspSplitCandidate *sc = 
+                        dynamic_cast<VspTree::VspSplitCandidate *>(splitCandidate);
+
+        
+                VspNode *r = mVspTree.Subdivide(mTQueue, *sc, globalTerminationCriteriaMet);
+
+                DEL_PTR(splitCandidate);
+        }
+
+        cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
+        mVspTree.mVspStats.Stop();
+}
+
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

@@ -1012 +1012 @@
                 ViewCell *back) const;
 
-        void CreateViewCell(VspTraversalData &tData);
+        void CreateViewCell(VspTraversalData &tData, const bool updatePvs);
 
         void CollectDirtyCandidates(VspSplitCandidate *sc, 
@@ -1748 +1748 @@
                                         AxisAlignedBox3 *forcedViewSpace);
 
+        /** Constructs only vsp tree.
+        */
+        void Construct3(const VssRayContainer &sampleRays,
+                                        const ObjectContainer &objects,
+                                        AxisAlignedBox3 *forcedViewSpace);
+
 public:
         VspTree &mVspTree;