Changeset 1773 for GTP/trunk/Lib/Vis

Timestamp:

11/21/06 03:32:16 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCellsManager.cpp (modified) (10 diffs)
• ViewCellsManager.h (modified) (3 diffs)
• VspBspTree.cpp (modified) (1 diff)

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

@@ -119 +119 @@
         Environment::GetSingleton()->GetStringValue("ViewCells.samplingType", buf);
 
+        // mix of sampling strategies
+        if (0)
+        {
+                mStrategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+                mStrategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+                mStrategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+        }
+        else
+        {
+                mStrategies.push_back(SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+                mStrategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
+        }
+
         // sampling type for view cells construction samples
         if (strcmp(buf, "object") == 0)
@@ -391 +404 @@
         cout << "view cell construction: casting " << mInitialSamples << " initial samples ... " << endl;
 
-        // mix of sampling strategies
-        vector<int> strategies;
-        
-        if (0)
-        {
-                strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-        }
-        else
-        {
-                strategies.push_back(SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-                //strategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-        }
-
         // cast initial samples
-        CastPassSamples(mInitialSamples, strategies, initialSamples);
+        CastPassSamples(mInitialSamples, mStrategies, initialSamples);
 
         cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -479 +477 @@
                 // cast new samples
                 numSamples += CastPassSamples(mSamplesPerPass, 
-                                                                          strategies,
+                                                                          mStrategies,
                                                                           constructionSamples);
 
@@ -521 +519 @@
         cout << "casting " << mPostProcessSamples << " post processing samples ... ";
         
-        CastPassSamples(mPostProcessSamples, strategies, postProcessSamples);
+        CastPassSamples(mPostProcessSamples, mStrategies, postProcessSamples);
 
         cout << "finished" << endl;
@@ -566 +564 @@
                 if (0)
                 {
-                        strategies.clear();
-                        strategies.push_back(SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION);
+                        mStrategies.clear();
+                        mStrategies.push_back(SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION);
                 }
 
@@ -575 +573 @@
                 VssRayContainer visSamples;
                 int numSamples = CastPassSamples(mVisualizationSamples,
-                                                                                 strategies, 
+                                                                                 mStrategies, 
                                                                                  visSamples);
 
@@ -994 +992 @@
         }
 
-        // mix of sampling strategies
-        vector<int> strategies;
-        
-        if (0)
-        {
-                strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-        }
-        else
-        {
-                strategies.push_back(SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-        }
-
         cout << "finished" << endl;
     cout << "Evaluating view cell partition ... " << endl;
@@ -1025 +1008 @@
                 Debug << "casting " << samplesPerPass << " samples ... ";
 
-                CastPassSamples(samplesPerPass, strategies, evaluationSamples);
+                CastPassSamples(samplesPerPass, mStrategies, evaluationSamples);
                 
                 castSamples += samplesPerPass;
@@ -5994 +5977 @@
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 
-    // mix of sampling strategies
-        vector<int> strategies;
-        
-        if (0)
-        {
-                strategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-        }
-        else
-        {
-                strategies.push_back(SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-                strategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-        }
-
-        cout << "reseting pvs ... ";
+    cout << "reseting pvs ... ";
                 
         // reset pvs and start over from zero
@@ -6030 +5998 @@
                 Debug << "casting " << samplesPerPass << " samples ... ";
 
-                CastPassSamples(samplesPerPass, strategies, evaluationSamples);
+                CastPassSamples(samplesPerPass, mStrategies, evaluationSamples);
                 
                 castSamples += samplesPerPass;

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

@@ -43 +43 @@
 
   struct PvsFilterStatistics {
-        PvsFilterStatistics(): mAvgFilterRadius(0.0f), mLocalFilterCount(0), mGlobalFilterCount(0) {}
+        PvsFilterStatistics(): 
+  mAvgFilterRadius(0.0f), mLocalFilterCount(0), mGlobalFilterCount(0) {}
         float mAvgFilterRadius;
         int mLocalFilterCount;
@@ -613 +614 @@
         /** Sets exporter color.
         */
-        virtual void ExportColor(Exporter *exporter, ViewCell *vc, const bool colorCode) const;
+        virtual void ExportColor(Exporter *exporter, 
+                                                         ViewCell *vc, 
+                                                         const bool colorCode) const;
         
         /** Creates meshes from the view cells.
@@ -669 +672 @@
         ViewCellsTree *mViewCellsTree;
         
+        std::vector<int> mStrategies;
+
         /** if the values in the view cell leaves and the interiors are up to date
                 this is meant for lazy storing of the pvs, where only a scalar indicating

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

@@ -2128 +2128 @@
         //-- pvs rendering heuristics
 
-        const int lowerPvsLimit = mViewCellsManager->GetMinPvsSize();
-        const int upperPvsLimit = mViewCellsManager->GetMaxPvsSize();
+        const float lowerPvsLimit = (float)mViewCellsManager->GetMinPvsSize();
+        const float upperPvsLimit = (float)mViewCellsManager->GetMaxPvsSize();
 
         // only render cost heuristics or combined with standard deviation