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

Timestamp:

01/25/06 17:45:45 (18 years ago)

Author:

mattausch

Message:

fixed loading function: the view cell manager is chosen depending on
the type in the file. the view space box is saved with the file

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -52 +52 @@
         environment->GetIntValue("ViewCells.Construction.samplesPerPass", mSamplesPerPass);
 
+        environment->GetBoolValue("ViewCells.exportToFile", mExportViewCells);
+
         mMinPvsSize = emptyViewCells ? 1 : 0;
 
@@ -236 +238 @@
 }
 
+
 void
 ViewCellsManager::SetValidity(
@@ -275 +278 @@
 }
 
-bool ViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)
+
+bool ViewCellsManager::LoadViewCellsGeometry(const string filename)
 {
         X3dParser parser;
@@ -575 +579 @@
 {
         mViewSpaceBox = box;
+        mTotalAreaValid = false;
 }
 
@@ -2176 +2181 @@
                 FinalizeViewCells(true);
                 EvaluateViewCellsStats();
+
                 return 0;
         }
@@ -2279 +2285 @@
         FinalizeViewCells(true);
 
+        // for output we need unique ids for each view cell
+        CreateUniqueViewCellIds();
+
         // write view cells to disc
         if (mExportViewCells)
@@ -2368 +2377 @@
                         delete exporter;
                 }
+        }
+
+        if (1)
+        {
+                cout << "exporting depth map ... ";
+
+                Exporter *exporter = Exporter::GetExporter("depth_map.x3d");
+                if (exporter)
+                {
+                        if (1)
+                        {
+                                exporter->SetWireframe();
+                                exporter->ExportBox(mViewSpaceBox);
+                                exporter->SetFilled();
+                        }
+
+                        if (mExportGeometry)
+                        {
+                                exporter->ExportGeometry(objects);
+                        }
+
+                        const int maxDepth = mVspBspTree->mBspStats.maxDepth;
+
+                        ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
+
+                        for (vit = mViewCells.begin(); vit != mViewCells.end(); ++ vit)
+                        {
+                                BspViewCell *vc = dynamic_cast<BspViewCell *>(*vit);
+
+                                vector<BspLeaf *>::const_iterator lit, lit_end = vc->mLeaves.end();
+
+                                for (lit = vc->mLeaves.begin(); lit != lit_end; ++ lit)
+                                {
+                                        BspLeaf *leaf = *lit;
+
+                                        Material m; 
+
+                                        float relDepth = (float)leaf->GetDepth() / (float)maxDepth;
+                                        m.mDiffuseColor.r = relDepth;
+                                        m.mDiffuseColor.g = 0.0f;
+                                        m.mDiffuseColor.b = 1.0f - relDepth;
+
+                    exporter->SetForcedMaterial(m);
+                                
+
+                                        BspNodeGeometry geom;
+                                        mVspBspTree->ConstructGeometry(leaf, geom);
+                                        exporter->ExportPolygons(geom.mPolys);
+                                }
+                        }
+
+                        delete exporter;
+                }
+
+
+                cout << "finished" << endl;
         }
 
@@ -2661 +2726 @@
 void VspBspViewCellsManager::CreateMesh(ViewCell *vc)
 {
+        if (vc->GetMesh())
+                delete vc->GetMesh();
+
         BspNodeGeometry geom;
         BspViewCell *bspVc = dynamic_cast<BspViewCell *>(vc);
@@ -2672 +2740 @@
 
 
-bool VspBspViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)
+ViewCellsManager *ViewCellsManager::LoadViewCells(const string filename, 
+                                                                                                  ObjectContainer *objects)
 {
         ViewCellsParser parser;
 
-        DEL_PTR(mVspBspTree);
-        mVspBspTree = new VspBspTree();
-
-        bool success ;//= parser.ParseFile(filename, &this, objects);
-        mVspBspTree->RepairViewCellsLeafLists();
-        mVspBspTree->mBox = GetViewSpaceBox();
-        ResetViewCells();
-
-        mViewCellsFinished = true;
-        mMaxPvsSize = (int)objects->size();
-
-        FinalizeViewCells(true);
-
-        Debug << (int)mViewCells.size() << " view cells loaded" << endl;
-
-        return success;
+        ViewCellsManager *vm = NULL;
+
+        if (parser.ParseFile(filename, &vm, objects))
+        {
+                vm->PrepareLoadedViewCells();
+                vm->ResetViewCells();
+
+                vm->mViewCellsFinished = true;
+                vm->mMaxPvsSize = (int)objects->size();
+
+                vm->FinalizeViewCells(true);
+
+                Debug << (int)vm->mViewCells.size() << " view cells loaded" << endl;
+
+                //vm->ExportViewCells("test.xml");
+        }
+        else
+        {
+                Debug << "failed loading view cells" << endl;
+                DEL_PTR(vm);
+        }
+
+
+        return vm;
 }
 
@@ -2706 +2783 @@
         std::ofstream stream;
 
-        // for output we need unique ids
-        CreateUniqueViewCellIds();
+        // 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=\"vspBspTree\" />" << endl;
 
         //-- load the view cells itself, i.e., the ids and the pvs
@@ -2766 +2851 @@
 
 
-
+void VspBspViewCellsManager::PrepareLoadedViewCells()
+{
+        // TODO: do I still need this here?
+        mVspBspTree->RepairViewCellsLeafLists();
+}
+
+
+//////////////////////////////////77
 ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
 {