Changeset 2006

Timestamp:

01/21/07 22:39:50 (17 years ago)

Author:

bittner

Message:

merge

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (1 diff)
• Makefile (modified) (2 diffs)
• Mutation.cpp (modified) (2 diffs)
• default.env (modified) (1 diff)
• run_test2 (modified) (1 diff)

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

@@ -1609 +1609 @@
         RegisterOption("ViewCells.useKdPvs",
                 optBool, 
-                "view_cells_use_kd_pvs=", 
+                "view_cells_use_kd_pvs", 
                 "false");
 

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

@@ -1435 +1435 @@
 
 
-}
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: so 20. I 14:03:52 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ne 21. I 01:18:19 2007
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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

@@ -21 +21 @@
 
 #define USE_SIL_TERMINATION_MUTATION 1
-#define MUTATE_ORIGIN 1
+#define MUTATE_ORIGIN 0
 
 #define EVALUATE_MUTATION_STATS 1
 
-#define Q_SEARCH_STEPS 2
+#define Q_SEARCH_STEPS 3
 
 void
@@ -158 +158 @@
 
   float pContributingRays = contributingRays/(float)vssRays.size();
-  //  float importance = 1.0f/(pContributingRays + 1e-5);
-  float importance = 1.0f;
+  float importance = 1.0f/(pContributingRays + 1e-5);
+  // float importance = 1.0f;
   // set this values for last contributingRays
   int index = mBufferStart - 1;

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

@@ -180 +180 @@
         }
 
-#       splitMethod spatialMedian
-        splitMethod SAH
+        splitMethod spatialMedian
+#       splitMethod SAH
         splitBorder 0.01
 }

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -2 +2 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter+"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"