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

Timestamp:

11/20/06 09:15:28 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -309 +309 @@
 
 int ViewCellsManager::CastPassSamples(const int samplesPerPass, 
-                                                                          const int sampleType, 
-                                                                          VssRayContainer &passSamples) const
+                                                                          const vector<int> &strategies,
+                                                                          VssRayContainer &passSamples
+                                                                          ) const
 {
         SimpleRayContainer simpleRays;
@@ -318 +319 @@
         int castRays = 0;
         
-        vector<int> strategies;
-         
-        strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-        strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-        strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-
         const int numRaysPerPass = samplesPerPass / (int)strategies.size();
 
@@ -397 +392 @@
         cout << "view cell construction: casting " << mInitialSamples << " initial samples ... " << endl;
 
+        // mix of sampling strategies
+        vector<int> strategies;
+        strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+
         // cast initial samples
-        CastPassSamples(mInitialSamples, mSamplingType, initialSamples);
+        CastPassSamples(mInitialSamples, strategies, initialSamples);
 
         cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -460 +461 @@
         startTime = GetTime();
         const int n = mConstructionSamples; //+initialSamples;
-        // should we use directional samples?
-        bool dirSamples = (mSamplingType == SamplingStrategy::DIRECTION_BASED_DISTRIBUTION);
 
         while (numSamples < n)
@@ -470 +469 @@
                 VssRayContainer constructionSamples;
 
-                const int samplingType = mSamplingType;
-                        //dirSamples ? Preprocessor::DIRECTION_BASED_DISTRIBUTION :     Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
-
-                if (0) dirSamples = !dirSamples; // toggle sampling method
-
                 // cast new samples
                 numSamples += CastPassSamples(mSamplesPerPass, 
-                                                                          samplingType,
+                                                                          strategies,
                                                                           constructionSamples);
 
@@ -519 +513 @@
         cout << "casting " << mPostProcessSamples << " post processing samples ... ";
         
-        CastPassSamples(mPostProcessSamples, mSamplingType, postProcessSamples);
+        CastPassSamples(mPostProcessSamples, strategies, postProcessSamples);
 
         cout << "finished" << endl;
@@ -566 +560 @@
                 VssRayContainer visSamples;
                 int numSamples = CastPassSamples(mVisualizationSamples,
-                                                                                 mSamplingType, 
+                                                                                 strategies, 
                                                                                  visSamples);
 
@@ -948 +942 @@
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 
-        // should directional sampling be used?
-        bool dirSamples = 
-                (mEvaluationSamplingType == SamplingStrategy::DIRECTION_BASED_DISTRIBUTION);
-
         cout << "reseting pvs ... ";
                 
@@ -972 +962 @@
         }
 
+        // mix of sampling strategies
+        vector<int> strategies;
+        strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+
         cout << "finished" << endl;
     cout << "Evaluating view cell partition ... " << endl;
@@ -988 +984 @@
                 Debug << "casting " << samplesPerPass << " samples ... ";
 
-                CastPassSamples(samplesPerPass, samplingType, evaluationSamples);
+                CastPassSamples(samplesPerPass, strategies, evaluationSamples);
                 
                 castSamples += samplesPerPass;
@@ -1632 +1628 @@
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
 
-        // volume and area of the view cells are recomputed and a view cell mesh is created
+        // volume and area of the view cells are recomputed 
+        // a view cell mesh is created
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
@@ -4134 +4131 @@
         {       ////////
                 //-- real meshes are contructed at this stage
+
                 cout << "finalizing view cells ... ";
                 FinalizeViewCells(true);
@@ -4334 +4332 @@
         Debug << "post processing using " << (int)postProcessRays.size() << " samples" << endl;
 
-        // should maybe be done here to allow merge working 
-        // with area or volume and to correct the rendering statistics
-        if (0) FinalizeViewCells(false);
-                
         //////////
-        //-- merge the individual view cells
+        //-- merge neighbouring view cells
         MergeViewCells(postProcessRays, objects);
         
@@ -4358 +4352 @@
         ////////////
         //-- compression
-//#if HAS_TO_BE_REDONE
+
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
@@ -4369 +4363 @@
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
-//#endif
 
         // collapse sibling leaves that share the same view cell
@@ -5934 +5927 @@
         int splitsStepSize;
 
-
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesForStats", samplesForStats);
@@ -5946 +5938 @@
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 
-        // should directional sampling be used?
-        bool dirSamples = 
-                (mEvaluationSamplingType == SamplingStrategy::DIRECTION_BASED_DISTRIBUTION);
+    // mix of sampling strategies
+        vector<int> strategies;
+        strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+        strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
 
         cout << "reseting pvs ... ";
@@ -5971 +5965 @@
                 Debug << "casting " << samplesPerPass << " samples ... ";
 
-                CastPassSamples(samplesPerPass, samplingType, evaluationSamples);
+                CastPassSamples(samplesPerPass, strategies, evaluationSamples);
                 
                 castSamples += samplesPerPass;