Changeset 2013

Timestamp:

01/22/07 16:15:14 (17 years ago)

Author:

bittner

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (2 diffs)
• RayCaster.cpp (modified) (3 diffs)
• RayCaster.h (modified) (2 diffs)
• run_test2 (modified) (2 diffs)

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: po 22. I 08:54:12 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: po 22. I 16:06:29 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/RayCaster.cpp

@@ -236 +236 @@
 
 #if DEBUG_RAYCAST
-        static int id=0;
-        Debug<<"PRA "<<id++<<endl<<flush;
+  static int id=0;
+  Debug<<"PRA "<<id++<<endl<<flush;
 #endif
         
@@ -292 +292 @@
           if (!pruneInvalidRays || hitA.mObject) {
                 VssRay *vssRay = mVssRayPool.Alloc();
-
+                cerr<<vssRay<<endl;
                 *vssRay = VssRay(
                                                  !castDoubleRay ? simpleRay.mOrigin : clipB,
@@ -320 +320 @@
                 {
                   VssRay *vssRay = mVssRayPool.Alloc();
+                  cerr<<vssRay<<endl;
+                                
                   *vssRay = VssRay(
                                                    clipA,

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

@@ -69 +69 @@
   struct VssRayPool {
         VssRayPool():mRays(), mIndex(0) {}
+
         void Reserve(const int number) {
           mRays.reserve(number);
@@ -76 +77 @@
         }
         VssRay *Alloc() {
-          return &mRays[mIndex++];
+          VssRay *result = &mRays[mIndex];
+          mIndex++;
+          return result;
         }
         vector<VssRay> mRays;

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"
@@ -51 +51 @@
  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
  -view_cells_use_kd_pvs- -af_use_kd_pvs- \
+ -preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4i.xml \
+ -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \
+ -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4i.hlog
+
+$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+ -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
  -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \
  -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \
  -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog
+