Changeset 662 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

02/22/06 00:48:37 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (2 diffs)
• src/Environment.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -223 +223 @@
         }
 
-        Evaluation {
-                samplesPerPass 300000
-                samples 8000000
-        }
-
         Visualization {
                 # how much samples we use for visualization
@@ -238 +233 @@
                 exportGeometry true
                 exportMergedViewCells false
-                useCuttingPlane true
-                cuttingPlaneAxis 1
-        }
-        
+                useClipPlane true
+                clipPlaneAxis 1
+        }
+        
+        Evaluation {
+                samplesPerPass 200000
+                samples 2000000
+        }
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d

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

@@ -1204 +1204 @@
                         optString,
                         "view_cells_type",
-                        "bspTree");
+                        "vspBspTree");
+
+        RegisterOption("ViewCells.samplingType",
+                        optString,
+                        "view_cells_sampling_type",
+                        "box");
 
         RegisterOption("ViewCells.stats",
@@ -1215 +1220 @@
                                         "view_cells_stats_prefix=",
                                         "viewCells");
-
-
-        RegisterOption("ViewCells.active",
-                                        optInt,
-                                        "1000");
         
         RegisterOption("ViewCells.active",
@@ -1230 +1230 @@
                                         "5000000");
 
+
+        RegisterOption("ViewCells.Construction.samplesPerPass",
+                                        optInt,
+                                        "view_cells_construction_samples_per_pass=",
+                                        "500000");
+
+        RegisterOption("ViewCells.PostProcess.samples",
+                                        optInt,
+                                        "view_cells_postprocess_samples=",
+                                        "200000");
+
+        RegisterOption("ViewCells.Visualization.samples",
+                                        optInt,
+                                        "view_cells_visualization_samples=",
+                                        "20000");
+
+        RegisterOption("ViewCells.loadFromFile",
+                                        optBool,
+                                        "view_cells_load_from_file",
+                                        "false");
+
+        RegisterOption("ViewCells.PostProcess.refine",
+                                        optBool,
+                                        "view_cells_refine",
+                                        "false");
+
+
+        RegisterOption("ViewCells.PostProcess.compress",
+                                        optBool,
+                                        "view_cells_compress",
+                                        "false");
+
         RegisterOption("ViewCells.Evaluation.samples",
                                         optInt,
@@ -1237 +1269 @@
         RegisterOption("ViewCells.Evaluation.samplesPerPass",
                                         optInt,
-                                        "view_cells_evaluation_samples_per_oass=",
+                                        "view_cells_evaluation_samples_per_pass=",
                                         "300000");
 
-        RegisterOption("ViewCells.Construction.samplesPerPass",
-                                        optInt,
-                                        "view_cells_construction_samples_per_pass=",
-                                        "500000");
-
-        RegisterOption("ViewCells.PostProcess.samples",
-                                        optInt,
-                                        "view_cells_postprocess_samples=",
-                                        "200000");
-
-        RegisterOption("ViewCells.Visualization.samples",
-                                        optInt,
-                                        "view_cells_visualization_samples=",
-                                        "20000");
-
-        RegisterOption("ViewCells.loadFromFile",
-                                        optBool,
-                                        "view_cells_load_from_file",
-                                        "false");
-
-        RegisterOption("ViewCells.PostProcess.refine",
-                                        optBool,
-                                        "view_cells_refine",
-                                        "false");
-
-
-        RegisterOption("ViewCells.PostProcess.compress",
-                                        optBool,
-                                        "view_cells_compress",
-                                        "false");
 
         RegisterOption("ViewCells.exportToFile",