Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

11/28/06 19:46:36 (18 years ago)

Author:

bittner

Message:

global lines support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp (modified) (4 diffs)

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

@@ -73 +73 @@
   case SamplingStrategy::RSS_BASED_DISTRIBUTION:
   case SamplingStrategy::RSS_SILHOUETTE_BASED_DISTRIBUTION:
-        if (mRssTree) {
-          result = GenerateImportanceRays(mRssTree, number, rays);
-        }
-        break;
-        
+                if (mRssTree) {
+                        result = GenerateImportanceRays(mRssTree, number, rays);
+                }
+                break;
+                
   default:
-        result = Preprocessor::GenerateRays(number, sampleType, rays);
+                result = Preprocessor::GenerateRays(number, sampleType, rays);
   }
 
@@ -465 +465 @@
 
   if (mUseRssTree)
-        mDistributions.push_back(new RssBasedDistribution(*this));
-
-  //  mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
-  //  mDistributions.push_back(new DirectionBasedDistribution(*this));
-  mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
-  //  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
-  mDistributions.push_back(new ObjectBasedDistribution(*this));
-  mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
+                mDistributions.push_back(new RssBasedDistribution(*this));
+
+
+        if (1) {
+                //  mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
+                //  mDistributions.push_back(new DirectionBasedDistribution(*this));
+                mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
+                //  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
+                mDistributions.push_back(new ObjectBasedDistribution(*this));
+                mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
+        } else {
+                mDistributions.push_back(new GlobalLinesDistribution(*this));
+        }
   
   if (mLoadInitialSamples) {
@@ -495 +500 @@
                 if (mDistributions[i]->mType != SamplingStrategy::RSS_BASED_DISTRIBUTION)
                   GenerateRays(mInitialSamples/count,
-                                           mDistributions[i]->mType, rays);
+                                                                         mDistributions[i]->mType,
+                                                                         rays);
 
         } else {
@@ -582 +588 @@
   
   rssPass++;
-  
+
+        //      mDistributions.resize(1);
+
   mRssTree = new RssTree;
   mRssTree->SetPass(mPass);