Changeset 1919 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

12/21/06 23:52:10 (18 years ago)

Author:

mattausch

Message:

added mechanism for histogram on certain MB in hierarchymanager
no more bug in undersampling estimation
added sampling strategy to spatial box based (also for eval)
added testing scripts

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (6 diffs)

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

@@ -2058 +2058 @@
                                                                                 int &viewSpaceSplits,
                                                                                 int &objectSpaceSplits,
-                                                                                const bool useFilter)
+                                                                                const bool useFilter,
+                                                                                const bool useHisto,
+                                                                                const int histoMem,
+                                                                                const int pass,
+                                                                                bool &histoUsed)
 {
         ViewCellContainer viewCells;
@@ -2121 +2125 @@
                 {
                         ComputePvs(vc->GetPvs(), rc, pvsEntries);
+                        vc->SetPvsCost(rc);
                 }
 
@@ -2132 +2137 @@
         viewSpaceSplits = (int)viewCells.size();
         objectSpaceSplits = (int)bvhNodes.size();
+
+        ////////////////////////
+    //-- evaluate histogram for pvs size
+
+        if (useHisto && (memory <= (float)histoMem))
+        {
+                char str[100];
+                char statsPrefix[100];
+                int histoStepSize;
+
+                Environment::GetSingleton()->GetStringValue("ViewCells.Evaluation.statsPrefix", statsPrefix);
+        
+                cout << "computing pvs histogram for " << histoMem << " memory" << endl;
+                Debug << "computing pvs histogram for " << histoMem << " memory" << endl;
+                
+                sprintf(str, "-%05d-%05d-histo-pvs.log", pass, histoMem);
+                const string filename = string(statsPrefix) + string(str);
+
+                mVspTree->mViewCellsManager->EvalViewCellHistogramForPvsSize(filename, viewCells);
+
+                histoUsed = true;
+        }
+
         //cout << "viewCells: " << (int)viewCells.size() << " nodes: " << (int)bvhNodes.size() << " rc: " << renderCost << " entries: " << pvsEntries << endl;
 
@@ -2325 +2353 @@
 void HierarchyManager::EvaluateSubdivision2(ofstream &splitsStats,
                                                                                         const int splitsStepSize,
-                                                                                        const bool useFilter)
+                                                                                        const bool useFilter,
+                                                                                        const bool useHisto,
+                                                                                        const int histoMem,
+                                                                                        const int pass)
 {
         vector<HierarchySubdivisionStats> subStatsContainer;
@@ -2331 +2362 @@
         int splits = (1 + (mHierarchyStats.Leaves() - 1) / splitsStepSize) * splitsStepSize;
         cout << "splits: " << splits << endl;
+
+        bool histoUsed = false;
 
         while (1)
@@ -2342 +2375 @@
                                                                                                 subStats.mViewSpaceSplits,
                                                                                                 subStats.mObjectSpaceSplits,
-                                                                                                useFilter);
+                                                                                                useFilter,
+                                                                                                useHisto && !histoUsed,
+                                                                                                histoMem,
+                                                                                                pass,
+                                                                                                histoUsed);