Changeset 1771 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

11/20/06 14:02:29 (18 years ago)

Author:

bittner

Message:

merge, preparing sampling strategy support for mixed distributions, filter changes, histogram output for preprocessor

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (3 diffs)

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

@@ -151 +151 @@
         char buffer[256];
         Environment::GetSingleton()->GetStringValue("Preprocessor.visibilityFile",  buffer);
-    
         mVisibilityFileName = buffer;
+        
+        Environment::GetSingleton()->GetStringValue("Preprocessor.stats",  buffer);
+        mStats.open(buffer);
+        
+        
         Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilityFilter", mApplyVisibilityFilter);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
@@ -935 +939 @@
 }
 
-int Preprocessor::GenerateRays(const int number,
-                                                           const int sampleType,
-                                                           SimpleRayContainer &rays)
-{
-        const int startSize = (int)rays.size();
-        SamplingStrategy *strategy = GenerateSamplingStrategy(sampleType);
-
-        if (!strategy)
-        {
-                return 0;
-        }
-
-        int castRays = 0;
-
-        for (int i = 0; (int)rays.size() - startSize < number; ++ i) 
-        {
-                SimpleRay newRay;
-
-                if (strategy->GenerateSample(newRay))
-                {
+
+int
+Preprocessor::GenerateRays(const int number,
+                                                   const SamplingStrategy &strategy,
+                                                   SimpleRayContainer &rays)
+{
+  return strategy.GenerateSamples(number, rays);
+}
+
+int
+Preprocessor::GenerateRays(const int number,
+                                                   const int sampleType,
+                                                   SimpleRayContainer &rays)
+{
+  const int startSize = (int)rays.size();
+  SamplingStrategy *strategy = GenerateSamplingStrategy(sampleType);
+  int castRays = 0;
+  
+  if (!strategy)
+        {
+          return 0;
+        }
+  
 #if 1
-                        rays.AddRay(newRay);
-                        ++ castRays;
+  if (!strategy->GenerateSamples(number, rays))
+        return false;
+  ++ castRays;
 #else
-                        GenerateRayBundle(rays, newRay, 16, 0);
-                        castRays += 16;
+  GenerateRayBundle(rays, newRay, 16, 0);
+  castRays += 16;
 #endif
-                }       
-        }
-
-        delete strategy;
-    return castRays;
+  
+  delete strategy;
+  return castRays;
 }
 
@@ -1155 +1161 @@
 }
 
-
-}
+void
+Preprocessor::EvalViewCellHistogram()
+{
+  char filename[256];
+  Environment::GetSingleton()->GetStringValue("Preprocessor.histogram.file",
+                                                                                          filename);
+  
+  // mViewCellsManager->EvalViewCellHistogram(filename, 1000000);
+  mViewCellsManager->EvalViewCellHistogramForPvsSize(filename, 1000000);
+}
+
+}