Changeset 1843 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

12/04/06 22:34:15 (18 years ago)

Author:

mattausch

Message:

warning! changed pvs output because of paper hack

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (9 diffs)

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

@@ -562 +562 @@
         disposeRays(postProcessSamples, outRays);
 
-                
-        // write view cells to disc
-        if (mExportViewCells)
-        {
-                char filename[100];
-                Environment::GetSingleton()->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename, mExportPvs, mPreprocessor->mObjects);
-        }
 
         ////////////////
@@ -610 +602 @@
         // recalculate view cells
         EvaluateViewCellsStats();
+
+        if (1) CompressViewCells();
+
+        // write view cells to disc
+        if (mExportViewCells)
+        {
+                char filename[100];
+                Environment::GetSingleton()->GetStringValue("ViewCells.filename", filename);
+                ExportViewCells(filename, mExportPvs, mPreprocessor->mObjects);
+        }
 
         return numSamples;
@@ -1626 +1628 @@
 {
         return viewCell->GetVolume();
+}
+
+
+void ViewCellsManager::CompressViewCells()
+{
+        ////////////
+        //-- compression
+
+        if (ViewCellsTreeConstructed() && mCompressViewCells)
+        {
+                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
+                cout << "number of entries before compress: " << pvsEntries << endl;
+                Debug << "number of entries before compress: " << pvsEntries << endl;
+
+                mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
+
+                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
+                Debug << "number of entries after compress: " << pvsEntries << endl;
+                cout << "number of entries after compress: " << pvsEntries << endl;
+        }
 }
 
@@ -4582 +4606 @@
         
 
-        ////////////
-        //-- compression
-
-        if (ViewCellsTreeConstructed() && mCompressViewCells)
-        {
-                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
-                
-                cout << "number of entries before compress: " << pvsEntries << endl;
-                Debug << "number of entries before compress: " << pvsEntries << endl;
-
-                mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
-
-                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
-                
-                Debug << "number of entries after compress: " << pvsEntries << endl;
-                cout << "number of entries after compress: " << pvsEntries << endl;
-        }
-
+        if (0) CompressViewCells();
+        
         // collapse sibling leaves that share the same view cell
         if (0) mVspBspTree->CollapseTree();
@@ -5500 +5508 @@
         
 
+        mHierarchyManager->CreateUniqueObjectIds();
+
         ///////////
         //-- compression
 
-        if (ViewCellsTreeConstructed() && mCompressViewCells)
-        {
-                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
-                
-                cout << "number of entries before compress: " << pvsEntries << endl;
-                Debug << "number of entries before compress: " << pvsEntries << endl;
-
-                mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
-
-                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
-                
-                Debug << "number of entries after compress: " << pvsEntries << endl;
-                cout << "number of entries after compress: " << pvsEntries << endl;
-        }
+        if (0) CompressViewCells();
 
         /////////////
@@ -5924 +5921 @@
         stream << "<VisibilitySolution>" << endl;
 
-        if (exportPvs) 
+        // §§ tmp matt: for storage cost
+        if (0 && exportPvs) 
         {
         ///////////////
@@ -6227 +6225 @@
                 evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
                 evalStrats.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-
-                Debug << "casting volume strategies" << endl;
-                cout << "casting volume strategies" << endl;
         }
         else
@@ -6238 +6233 @@
                 //evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
                 //evalStrats.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-
-                Debug << "casting surface strategies" << endl;
-                cout << "casting surface strategies" << endl;
         }
         
@@ -6247 +6239 @@
                 Debug << evalStrats[i] << " ";
         Debug << endl;
+
+        cout << "casting eval strategies: ";
+        for (int i = 0; i < (int)evalStrats.size(); ++ i)
+                cout << evalStrats[i] << " ";
+        cout << endl;
 
         while (castSamples < numSamples)