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

Timestamp:

12/21/06 00:42:55 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -706 +706 @@
         int smallerCostSum = 0;
         
-        // note can skip computations for view cells already evaluated and delete them from vector ...
+        // note can skip computations for view cells already 
+        // evaluated and delete them from vector ...
     while (1)
         {
@@ -746 +747 @@
 
 
-
 ViewCellsManager *ViewCellsManager::LoadViewCells(const string &filename, 
                                                                                                   ObjectContainer *objects,
@@ -904 +904 @@
         viewCells = mViewCells;
 #endif
-        ViewCellContainer::iterator it = viewCells.begin(),
-          it_end = viewCells.end();             
-        for (; it != it_end; ++it) {
-          //(*it)->UpdatePvsCost();
-          (*it)->SetPvsCost((float)(*it)->GetFilteredPvsSize());
+        ViewCellContainer::iterator it = viewCells.begin(), it_end = viewCells.end();           
+        for (; it != it_end; ++it) 
+        {
+                if (1)
+                        (*it)->UpdatePvsCost();
+                else
+                        (*it)->SetPvsCost((float)(*it)->GetFilteredPvsSize());
         }
 
@@ -921 +923 @@
         // hack: normalize pvs size
         int histoMaxVal;
-        Environment::GetSingleton()->GetIntValue(
-                                                                                         "Preprocessor.histogram.maxValue", histoMaxVal);
+        Environment::GetSingleton()->GetIntValue("Preprocessor.histogram.maxValue", histoMaxVal);
         maxVal = max((float)histoMaxVal, maxPvs);
                 
@@ -938 +939 @@
         if (!stepSize) stepSize = 1;
         
+        Debug << "intervals " << histoIntervals << endl;
         Debug << "stepsize: " << stepSize << endl;
-        
+        cout << "intervals " << histoIntervals << endl;
+        cout << "stepsize: " << stepSize << endl;
+
         const float totalRenderCost = mViewCellsTree->GetRoot()->GetRenderCost();
         const float totalVol = GetViewSpaceBox().GetVolume();
@@ -987 +991 @@
 
         outstream.close();
-
 }
 
@@ -6044 +6047 @@
 
         // mix of sampling strategies
-        mStrategies.push_back(SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION);
+        evalStrats.push_back(SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION);
 
         //evalStrats.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
@@ -6168 +6171 @@
                 disposeRays(evaluationSamples, NULL);
         }
-        
-}
+
+        ////////////
+        //-- histogram
+
+        const int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
+        bool useHisto;
+        int histoStepSize;
+
+        Environment::GetSingleton()->GetBoolValue("ViewCells.Evaluation.histogram", useHisto);
+        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.histoStepSize", histoStepSize);
+
+        if (useHisto)
+        {
+                // evaluate view cells in a histogram           
+                char s[64];
+
+                // hack: just show final view cells
+                int pass = (int)mViewCells.size();
+                //for (int pass = histoStepSize; pass <= numLeaves; pass += histoStepSize)
+                if (1)
+                {
+                        string filename;
+
+                        cout << "computing histogram for " << pass << " view cells" << endl;
+#if 0
+                        //-- evaluate histogram for render cost
+                        sprintf(s, "-%09d-histo.log", pass);
+                        filename = string(statsPrefix) + string(s);
+
+                        EvalViewCellHistogram(filename, pass);
+
 #endif
-
-
-
-}
+                        //////////////////////////////////////////
+            //-- evaluate histogram for pvs size
+
+                        cout << "computing pvs histogram for " << pass << " view cells" << endl;
+
+                        sprintf(s, "-%09d-histo-pvs.log", pass);
+                        filename = string(statsPrefix) + string(s);
+
+                        EvalViewCellHistogramForPvsSize(filename, pass);
+                }
+        }
+}
+
+#endif
+
+
+
+}