Changeset 1889 for GTP/trunk

Timestamp:

12/13/06 20:36:32 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)

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

@@ -284 +284 @@
 
 
+float HierarchyManager::AvgRayContribution(const float pvs, const float rays) const
+{
+        return (float)pvs / rays;
+}
+
+
 void HierarchyManager::EvalSubdivisionStats()
 {

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

@@ -264 +264 @@
         Intersectable *GetIntersectable(const VssRay &ray, const bool isTermination) const;
   
-  Intersectable *GetIntersectable(Intersectable *obj,
-                                                                  const Vector3 &point) const;
+        Intersectable *GetIntersectable(Intersectable *obj, const Vector3 &point) const;
   
+        float AvgRayContribution(const float pvs, const float rays) const;
+
         /** Export object space partition bounding boxes.
         */

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

@@ -1635 +1635 @@
 void ViewCellsManager::CompressViewCells()
 {
+        if (!(ViewCellsTreeConstructed() && mCompressViewCells))
+                return;
+
         ////////////
         //-- 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;
-        }
+        
+        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;
 }
 
@@ -5855 +5855 @@
         viewCell->SetArea(area);
 }
-        
-
 
 
@@ -5865 +5863 @@
 
 
+static void PrintCompressionStats(HierarchyManager *hm, const int pvsEntries)
+{
+        float mem = (float)pvsEntries * ObjectPvs::GetEntrySize();
+                
+        float fullmem = mem + 
+                        (hm->GetVspTree()->GetStatistics().Leaves() * 16 + 
+                         hm->mBvHierarchy->GetStatistics().Leaves() * 16) / float(1024 * 1024);
+
+        cout << "entries: " << pvsEntries << ", mem=" << mem << ", fullmem=" << fullmem <<endl;
+        Debug << "entries: " << pvsEntries << ", mem=" << mem << ", fullmem=" << fullmem <<endl;
+}
+
+
 void VspOspViewCellsManager::CompressViewCells()
 {
-        if (!mCompressObjects)
-        {
-                cout << "compressing in the view space" << endl;
-                Debug << "compressing in the view space" << endl;
-                ViewCellsManager::CompressViewCells();
+        if (!(ViewCellsTreeConstructed() && mCompressViewCells))
                 return;
-        }
 
         ////////////
         //-- compression
 
-        if (ViewCellsTreeConstructed() && mCompressViewCells)
-        {
-                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
-                
-                cout << "compressing in the objects" << endl;
-                Debug << "compressing in the objects" << endl;
-                float mem = (float)pvsEntries * ObjectPvs::GetEntrySize();
-
-                cout << "number of entries before compress: " << pvsEntries << ", mem=" << mem << endl;
-                Debug << "number of entries before compress: " << pvsEntries << ", mem=" << mem << endl;
+        int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+
+        cout << "before compression: " << endl;
+        Debug << "before compression: " << endl;
+        
+        PrintCompressionStats(mHierarchyManager, pvsEntries);
+
+        if (mCompressObjects)
+        {
+                cout << "compressing in the objects: " << endl;
+                Debug << "compressing in the objects: " << endl;
 
                 pvsEntries = mHierarchyManager->CompressObjectSpace();
-                mem = (float)pvsEntries * ObjectPvs::GetEntrySize();
-
-                Debug << "number of entries after compress: " << pvsEntries << ", mem=" << mem << endl;
-                cout << "number of entries after compress: " << pvsEntries << ", mem=" << mem << endl;
-        }
+        }
+        else
+        {
+                cout << "compressing in the view space: " << endl;
+                Debug << "compressing in the view space: " << endl;
+
+                mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
+                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+        }
+
+        PrintCompressionStats(mHierarchyManager, pvsEntries);
 }
 
@@ -5912 +5925 @@
         return vm;
 }
+
 
 void