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

Timestamp:

10/27/06 03:05:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -61 +61 @@
 mViewCellsFinished(false),
 mMaxPvsSize(9999999),
-mMinPvsSize(0), // one means only empty view cells are invalid
+mMinPvsSize(0),
 mMaxPvsRatio(1.0),
 mViewCellPvsIsUpdated(false),
@@ -907 +907 @@
 
         while (castSamples < numSamples)
-        {
+        {               
+                ///////////////
+                //-- we have to use uniform sampling strategy for construction rays
+
                 VssRayContainer evaluationSamples;
-
                 const int samplingType = mEvaluationSamplingType;
-                /*      dirSamples ? 
-                                                Preprocessor::DIRECTION_BASED_DISTRIBUTION :
-                                                Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
-                */
+
                 long startTime = GetTime();
-
-                //-- construction rays => we use uniform samples for this
 
                 cout << "casting " << samplesPerPass << " samples ... ";
@@ -943 +940 @@
                 startTime = GetTime();
                 cout << "compute new statistics ... " << endl;
-        
+
+                ///////////
+                //-- output stats
+
+                sprintf(str, "-%09d-eval.log", castSamples);
+                string fileName = string(statsPrefix) + string(str);
+
                 ///////////////
                 //-- propagate pvs or pvs size information
@@ -949 +952 @@
                 ObjectPvs pvs;
                 UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
-
-                ///////////
-                //-- output stats
-                sprintf(str, "-%09d-eval.log", castSamples);
-                string fileName = string(statsPrefix) + string(str);
 
                 ExportStats(fileName);
@@ -5535 +5533 @@
                         }
 
+                        ////////////////
                         //-- for directional sampling it is important to count only contributions 
                         //-- made in one direction!
@@ -5618 +5617 @@
 }
 
-
+#if 1
 #if TEST_EVALUATION
 void VspOspViewCellsManager::EvalViewCellPartition()
@@ -5699 +5698 @@
 }
 
+#else
+
+void VspOspViewCellsManager::EvalViewCellPartition()
+{
+        int samplesPerPass;
+        int numSamples;
+        int castSamples = 0;
+        char str[64]; 
+
+        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
+        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", numSamples);
+
+        char statsPrefix[100];
+        Environment::GetSingleton()->GetStringValue("ViewCells.Evaluation.statsPrefix", statsPrefix);
+
+        Debug << "view cell evaluation samples per pass: " << samplesPerPass << endl;
+        Debug << "view cell evaluation samples: " << numSamples << endl;
+        Debug << "view cell stats prefix: " << statsPrefix << endl;
+
+        // should directional sampling be used?
+        bool dirSamples = 
+                (mEvaluationSamplingType == SamplingStrategy::DIRECTION_BASED_DISTRIBUTION);
+
+        cout << "reseting pvs ... ";
+                
+        const bool startFromZero = true;
+
+        // reset pvs and start over from zero
+        if (startFromZero)
+        {
+                mViewCellsTree->ResetPvs();
+        }
+        else // start from current sampless
+        {
+                // statistics before casting more samples
+                cout << "compute new statistics ... ";
+                sprintf(str, "-%09d-eval.log", castSamples);
+                string fName = string(statsPrefix) + string(str);
+
+                mViewCellsTree->ExportStats(fName);
+                cout << "finished" << endl;
+        }
+
+        cout << "finished" << endl;
+    cout << "Evaluating view cell partition ... " << endl;
+
+        while (castSamples < numSamples)
+        {               
+                ///////////////
+                //-- we have to use uniform sampling strategy for construction rays
+
+                VssRayContainer evaluationSamples;
+                const int samplingType = mEvaluationSamplingType;
+
+                long startTime = GetTime();
+
+                cout << "casting " << samplesPerPass << " samples ... ";
+                Debug << "casting " << samplesPerPass << " samples ... ";
+
+                CastPassSamples(samplesPerPass, samplingType, evaluationSamples);
+                
+                castSamples += samplesPerPass;
+
+                Real timeDiff = TimeDiff(startTime, GetTime());
+                Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+
+                cout << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
+                Debug << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
+
+                startTime = GetTime();
+
+                ComputeSampleContributions(evaluationSamples, true, false);
+
+                timeDiff = TimeDiff(startTime, GetTime());
+                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+
+                startTime = GetTime();
+                cout << "compute new statistics ... " << endl;
+
+                ///////////
+                //-- output stats
+
+                sprintf(str, "-%09d-eval.log", castSamples);
+                string filename = string(statsPrefix) + string(str);
+
+                mHierarchyManager->EvaluateSubdivision(evaluationSamples, mPreprocessor->mObjects, filename);
+
+                timeDiff = TimeDiff(startTime, GetTime());
+                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
+        
+                disposeRays(evaluationSamples, NULL);
+        }
+}
 #endif
-}
+#endif
+}