Changeset 1843

Timestamp:

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

Author:

mattausch

Message:

warning! changed pvs output because of paper hack

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (4 diffs)
• BvHierarchy.h (modified) (1 diff)
• Environment.cpp (modified) (1 diff)
• Exporter.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (2 diffs)
• ViewCell.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (9 diffs)
• ViewCellsManager.h (modified) (1 diff)

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

@@ -45 +45 @@
         return obj1->GetBox().SurfaceArea() < obj2->GetBox().SurfaceArea();
 }
+
+
 
 /***************************************************************/
@@ -2026 +2028 @@
                 
                 //-- export objects
-                ExportObjects(leaf, stream);
+                // tmp matt
+                if (0) ExportObjects(leaf, stream);
                 
                 stream << "\" />" << endl;
@@ -2538 +2541 @@
 
 
+void BvHierarchy::CreateUniqueObjectIds()
+{
+        stack<BvhNode *> nodeStack;
+        nodeStack.push(mRoot);
+
+        int currentId = 0;
+        while (!nodeStack.empty()) 
+        {
+                BvhNode *node = nodeStack.top();
+                nodeStack.pop();
+
+                node->SetId(currentId ++);
+
+                if (!node->IsLeaf()) 
+                {
+                        BvhInterior *interior = (BvhInterior *)node;
+
+                        nodeStack.push(interior->GetFront());
+                        nodeStack.push(interior->GetBack());
+                }
+        }
+}
+
+
 void BvHierarchy::ApplyInitialSubdivision(SubdivisionCandidate *firstCandidate,
                                                                                   vector<SubdivisionCandidate *> &candidateContainer)
@@ -2619 +2646 @@
         const float areaLarge = largeObj->GetBox().SurfaceArea();
 
-        return areaLarge / (areaLarge - areaSmall + Limits::Small);
+        return areaSmall / (areaLarge - areaSmall + Limits::Small);
 }
 

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

@@ -627 +627 @@
         float GetRenderCostIncrementially(BvhNode *node) const;
 
+        void CreateUniqueObjectIds();
 
 protected:

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

@@ -2617 +2617 @@
         RegisterOption("Hierarchy.Construction.maxRepairs",
                                         optInt,
-                                        "hierarchy_construction_maxRepairs=",
+                                        "hierarchy_construction_max_repairs=",
                                         "1000");
 

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

@@ -149 +149 @@
 
                 SetFilled();
+                // hack
+                if (1 || (leaf->mObjects.size() < 50000))
                 ExportGeometry(leaf->mObjects, true, box);
         }

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

@@ -2352 +2352 @@
 }
 
-}
+
+void HierarchyManager::CreateUniqueObjectIds()
+{
+        mBvHierarchy->CreateUniqueObjectIds();
+}
+
+
+
+}

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

@@ -292 +292 @@
         void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
+        void CreateUniqueObjectIds();
+
+
         float mInitialRenderCost;
 
@@ -530 +533 @@
         float EvalFullMem() const;
 
+
+
 protected:
 

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

@@ -2392 +2392 @@
 
                 // hack: just output full pvs
-                if (obj->Type() == Intersectable::BVH_INTERSECTABLE)
+                if (0 && (obj->Type() == Intersectable::BVH_INTERSECTABLE))
                 {
                         ObjectContainer objects; 

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)

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

@@ -467 +467 @@
                                                                   const ViewCellContainer &viewCells) const;
 
-
+        void CompressViewCells();
         /////////////////////////////
         // static members