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

Timestamp:

11/20/06 18:44:29 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -945 +945 @@
                                                    SimpleRayContainer &rays)
 {
-  return strategy.GenerateSamples(number, rays);
+        return strategy.GenerateSamples(number, rays);
 }
 
@@ -953 +953 @@
                                                    SimpleRayContainer &rays)
 {
-  const int startSize = (int)rays.size();
-  SamplingStrategy *strategy = GenerateSamplingStrategy(sampleType);
-  int castRays = 0;
-  
-  if (!strategy)
-        {
-          return 0;
-        }
-  
+        const int startSize = (int)rays.size();
+        SamplingStrategy *strategy = GenerateSamplingStrategy(sampleType);
+        int castRays = 0;
+
+        if (!strategy)
+        {
+                return 0;
+        }
+
 #if 1
-  if (!strategy->GenerateSamples(number, rays))
-        return false;
-  ++ castRays;
+        castRays = strategy->GenerateSamples(number, rays);
 #else
-  GenerateRayBundle(rays, newRay, 16, 0);
-  castRays += 16;
+        GenerateRayBundle(rays, newRay, 16, 0);
+        castRays += 16;
 #endif
-  
-  delete strategy;
-  return castRays;
+
+        delete strategy;
+        return castRays;
 }
 
@@ -994 +992 @@
         case SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION:
                 return new ViewCellBorderBasedDistribution(*this);
+        case SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION:
+                return new ViewSpaceBorderBasedDistribution(*this);
+        case SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION:
+                return new ReverseViewSpaceBorderBasedDistribution(*this);
         //case OBJECTS_INTERIOR_DISTRIBUTION:
         //      return new ObjectsInteriorDistribution(*this);