Changeset 590 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

02/04/06 21:36:40 (18 years ago)

Author:

mattausch

Message:

implemented some code for merge history loading

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (20 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -686 +686 @@
 {
         mViewCells.clear();
+        
         CollectViewCells();
-
+        
         mViewCellsStats.Reset();
         EvaluateViewCellsStats();
+
         // has to be recomputed
         mTotalAreaValid = false;
@@ -699 +701 @@
         return mMaxPvsSize;
 }
+
 
 void
@@ -921 +924 @@
         environment->GetIntValue("BspTree.Construction.samples", mInitialSamples);
         mBspTree->SetViewCellsManager(this);
+        mBspTree->mViewCellsTree = mViewCellsTree;
 }
 
@@ -1024 +1028 @@
         if (!ViewCellsTreeConstructed())
         {
+                
                 mBspTree->CollectViewCells(mViewCells);
         }
         else 
         {
+                
                 // we can use the view cells tree hierarchy to get the right set
                 mViewCellsTree->CollectBestViewCellSet(mViewCells, mNumMergedViewCells);
@@ -1069 +1075 @@
         }
 
+        
+        // view cells already finished before post processing step (i.e. because they were loaded)
+        if (mViewCellsFinished)
+        {
+                FinalizeViewCells(true);
+                EvaluateViewCellsStats();
+
+                return 0;
+        }
+
         //-- post processing of bsp view cells
     int vcSize = 0;
@@ -1098 +1114 @@
                                 m.mDiffuseColor = RgbColor(0, 1, 0);
                                 exporter->SetForcedMaterial(m);
+                        
                                 exporter->SetWireframe();
 
@@ -1132 +1149 @@
         FinalizeViewCells(true);
         
-        // for output we need unique ids for each view cell
-        CreateUniqueViewCellIds();
+        // HACK: removes view cells in bsp leaves with active ones
+        if (0)
+                AddCurrentViewCellsToHierarchy();
 
         // write view cells to disc
@@ -1186 +1204 @@
                         else
                                 exporter->SetFilled();
+
                         ExportViewCellsForViz(exporter);
 
@@ -1486 +1505 @@
 
 
-/**********************************************************************/
-/*                   KdViewCellsManager implementation               */
-/**********************************************************************/
+
+bool BspViewCellsManager::ExportViewCells(const string filename)
+{
+        cout << "exporting view cells to xml ... ";
+        std::ofstream stream;
+
+        // for output we need unique ids for each view cell
+        CreateUniqueViewCellIds();
+
+
+        stream.open(filename.c_str());
+        stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"<<endl;
+        stream << "<Visibility_Solution>" << endl;
+
+        //-- the view space bounding box
+        stream << "<ViewSpaceBox" 
+                   << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
+                   << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
+
+        //-- the type of the view cells hierarchy
+        //stream << "<Hierarchy name=\"bspTree\" />" << endl;
+        stream << "<Hierarchy name=\"vspBspTree\" />" << endl; // write vsp bsp here because can use same tree and is bug free
+        //-- load the view cells itself, i.e., the ids and the pvs
+        stream << "<ViewCells>" << endl;
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+                ExportViewCell(*it, stream);
+
+        stream << "</ViewCells>" << endl;
+
+        //-- load the hierarchy
+        stream << "<Hierarchy>" << endl;
+        mBspTree->Export(stream);
+        stream << endl << "</Hierarchy>" << endl;
+
+        stream << "</Visibility_Solution>" << endl;
+        stream.close();
+
+        cout << "finished" << endl;
+
+        return true;
+}
+
+
+void BspViewCellsManager::AddCurrentViewCellsToHierarchy()
+{
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
+                ViewCell *vc = *it;
+                ViewCellContainer leaves;
+                mViewCellsTree->CollectLeaves(vc, leaves);
+                
+                ViewCellContainer::const_iterator lit, lit_end = leaves.end();
+
+                for (lit = leaves.begin(); lit != lit_end; ++ lit)
+                {
+                        BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*lit);
+                        bspVc->mLeaf->SetViewCell(vc);
+                }
+        }
+}
+
+/************************************************************************/
+/*                   KdViewCellsManager implementation                  */
+/************************************************************************/
 
 
@@ -2177 +2259 @@
         environment->GetIntValue("VspBspTree.Construction.samples", mInitialSamples);
         mVspBspTree->SetViewCellsManager(this);
+        mVspBspTree->mViewCellsTree = mViewCellsTree;
 }
 
@@ -2199 +2282 @@
         if (!ViewCellsTreeConstructed())
         {
-                mVspBspTree->CollectViewCells(mViewCells, true);
+                mVspBspTree->CollectViewCells(mViewCells, false);
         }
         else 
@@ -2568 +2651 @@
         FinalizeViewCells(true);
 
-        // for output we need unique ids for each view cell
-        CreateUniqueViewCellIds();
+        // HACK: removes view cells in bsp leaves with active ones
+        if (0)
+                AddCurrentViewCellsToHierarchy();
+
 
         // write view cells to disc
@@ -2966 +3051 @@
 
 void VspBspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
-                                                                                          ViewCell *vc) const
+                                                                                                        ViewCell *vc) const
 {
         if (vc->GetMesh())
         {
                 exporter->ExportMesh(vc->GetMesh());
+        
                 return;
         }
@@ -3023 +3109 @@
                 delete vc->GetMesh();
 
+        
         BspNodeGeometry geom;
+
+        mVspBspTree->ConstructGeometry(vc, geom);
         
-        mVspBspTree->ConstructGeometry(vc, geom);
-
         Mesh *mesh = new Mesh();
         geom.AddToMesh(*mesh);
@@ -3043 +3130 @@
         if (parser.ParseFile(filename, &vm, objects))
         {
-                vm->PrepareLoadedViewCells();
+                //vm->PrepareLoadedViewCells();
                 vm->ResetViewCells();
 
@@ -3052 +3139 @@
 
                 Debug << (int)vm->mViewCells.size() << " view cells loaded" << endl;
-
-                //vm->ExportViewCells("test.xml");
         }
         else
@@ -3078 +3163 @@
 
         // for output we need unique ids for each view cell
-        //CreateUniqueViewCellIds();
+        CreateUniqueViewCellIds();
+
 
         stream.open(filename.c_str());
@@ -3101 +3187 @@
 
         //-- load the hierarchy
-        stream << "<BspTree>" << endl;
+        stream << "<Hierarchy>" << endl;
         mVspBspTree->Export(stream);
-        stream << endl << "</BspTree>" << endl;
+        stream << endl << "</Hierarchy>" << endl;
 
         stream << "</Visibility_Solution>" << endl;
@@ -3151 +3237 @@
 {
         // TODO: do I still need this here?
+        if (0)
         mVspBspTree->RepairViewCellsLeafLists();
 }
@@ -3176 +3263 @@
 
 
+void VspBspViewCellsManager::AddCurrentViewCellsToHierarchy()
+{
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
+        }
+}
 
 //////////////////////////////////