Changeset 2524

Timestamp:

07/03/07 22:05:03 (17 years ago)

Author:

bittner

Message:

demo updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• KdTree.cpp (modified) (4 diffs)
• KdTree.h (modified) (1 diff)
• demo1.env (modified) (3 diffs)
• run_demo1 (modified) (2 diffs)
• run_demo2 (added)

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

@@ -1133 +1133 @@
                                  "spatialMedian");
 
+  
+  RegisterOption("KdTree.pvsArea",
+                                 optFloat,
+                                 "kd_pvs_area=",
+                                 "1e-4");
+
   RegisterOption("KdTree.splitBorder",
                  optFloat,

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

@@ -14 +14 @@
 
 // $$JB HACK
-#define KD_PVS_AREA (1e-5f)
+//#define KD_PVS_AREA (1e-4f)
 
 #define TYPE_INTERIOR -2
@@ -67 +67 @@
   Environment::GetSingleton()->GetFloatValue("KdTree.Termination.ct_div_ci", mCt_div_ci);
   Environment::GetSingleton()->GetFloatValue("KdTree.splitBorder", mSplitBorder);
+  Environment::GetSingleton()->GetFloatValue("KdTree.pvsArea", mKdPvsArea);
 
   Environment::GetSingleton()->GetBoolValue("KdTree.sahUseFaces", mSahUseFaces);
@@ -125 +126 @@
   delete splitCandidates;
 
-  float area = GetBox().SurfaceArea()*KD_PVS_AREA;
+  float area = GetBox().SurfaceArea()*mKdPvsArea;
 
   SetPvsTerminationNodes(area);
@@ -1404 +1405 @@
         }
 
-        float area = GetBox().SurfaceArea()*KD_PVS_AREA;
+        float area = GetBox().SurfaceArea()*mKdPvsArea;
         
         SetPvsTerminationNodes(area);

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

@@ -614 +614 @@
   int mSplitMethod;
   bool mSahUseFaces;
+  float mKdPvsArea;
   /// root of the tree
   KdNode *mRoot;

GTP/trunk/Lib/Vis/Preprocessing/src/demo1.env

@@ -40 +40 @@
         totalSamples 250000000
 #       totalSamples 2000000
-        samplesPerPass 1000000
+        samplesPerPass 500000
         samplesPerEvaluation 5000000
 
@@ -169 +169 @@
 
 KdTree {
+        pvsArea   5e-4
         sahUseFaces false
         Termination {
@@ -202 +203 @@
 
         useKdPvs true
+        
         useKdPvsAfterFiltering true
         # samples used for view cell construction

GTP/trunk/Lib/Vis/Preprocessing/src/run_demo1

@@ -3 +3 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=100000000"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -total_samples=100000000"
 
 
@@ -49 +49 @@
 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
 -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog
+-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog \
+demo1.env