Changeset 2608 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/17/08 17:25:10 (16 years ago)

Author:

bittner

Message:

HR updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (4 diffs)
• QtInterface/QtPreprocessorThread.h (modified) (2 diffs)
• SG08/run_test_pompeii (modified) (2 diffs)
• SG08/run_test_powerplant (modified) (2 diffs)
• default.env (modified) (1 diff)
• havran/configh.h (modified) (1 diff)
• havran/ktball.cpp (modified) (1 diff)
• havran/ktball.h (modified) (1 diff)
• havran/ktbconf.h (modified) (1 diff)
• havran/ktbf2trv.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• preprocessor.pro (modified) (1 diff)

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 15:26:52 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 17:18:38 2008
 # Project:  preprocessor.pro
 # Template: app
@@ -71 +71 @@
                 C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf \
                 C:\Qt\4.1.2\mkspecs\features\default_post.prf \
-                C:\Qt\4.1.2\mkspecs\features\qt.prf \
-                C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf \
-                C:\Qt\4.1.2\mkspecs\features\moc.prf \
                 C:\Qt\4.1.2\mkspecs\features\win32\thread.prf \
                 C:\Qt\4.1.2\mkspecs\features\warn_off.prf \
@@ -92 +89 @@
 C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf:
 C:\Qt\4.1.2\mkspecs\features\default_post.prf:
-C:\Qt\4.1.2\mkspecs\features\qt.prf:
-C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf:
-C:\Qt\4.1.2\mkspecs\features\moc.prf:
 C:\Qt\4.1.2\mkspecs\features\win32\thread.prf:
 C:\Qt\4.1.2\mkspecs\features\warn_off.prf:
@@ -116 +110 @@
 distclean: release-distclean debug-distclean FORCE
         -$(DEL_FILE) Makefile
-
-release-mocclean: $(MAKEFILE).Release
-        $(MAKE) -f $(MAKEFILE).Release mocclean
-debug-mocclean: $(MAKEFILE).Debug
-        $(MAKE) -f $(MAKEFILE).Debug mocclean
-mocclean: release-mocclean debug-mocclean
-
-release-mocables: $(MAKEFILE).Release
-        $(MAKE) -f $(MAKEFILE).Release mocables
-debug-mocables: $(MAKEFILE).Debug
-        $(MAKE) -f $(MAKEFILE).Debug mocables
-mocables: release-mocables debug-mocables
 FORCE:
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtPreprocessorThread.h

@@ -2 +2 @@
 #define __QT_PREPROCESSOR_THREAD_H
 
-//#ifdef USE_QT
+#ifdef USE_QT
 
 #include <QThread>
@@ -35 +35 @@
 }
 
-//#endif
 #endif
+#endif

GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pompeii

@@ -1 @@
-#!/bin/sh
+#!sh
 
 
@@ -16 +16 @@
 VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz
 
-PREFIX=../work/plots/osp-pompeii-SG08a
+PREFIX=../work/plots/osp-pompeii-SG08dummy
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_powerplant

@@ -1 @@
-#!/bin/sh
+#!sh
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=500000000"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=500000000 -view_cells_use_kd_pvs+ -af_use_kd_pvs+"
 
 
@@ -8 +8 @@
 VIEWCELLS=../data/PowerPlant/powerplant-seq-viewcells.xml.gz
 
-PREFIX=../work/plots/osp-powerplant-1e5
-
+PREFIX=../work/plots/osp-powerplant-SG08
 
 

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

@@ -526 +526 @@
   #maxDepthAllowed 22
   #maxListLength    6
-}
-
+  # For Power plant
+  #maxDepthAllowed 8
+  #maxListLength    10
+}
+

GTP/trunk/Lib/Vis/Preprocessing/src/havran/configh.h

@@ -13 +13 @@
 #ifndef __CONFIGH_H__
 #define __CONFIGH_H__
+
+#if defined(_MSC_VER)
+// use perftimer only on msvc
+// define __SSE__ macro as it is not defined under MSVC
+#define __SSE__
+// If we support the use of SSE instructions for ray shooting
+#define _USE_HAVRAN_SSE
+#endif
 
 #ifndef USE_GOLEM_NAMESPACE

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktball.cpp

@@ -424 +424 @@
 
 void
-CKTB::FindNearestI(RayPacket2x2 &raypack, Vector3 &boxmin, Vector3 &boxmax)
+CKTB::FindNearestI(RayPacket2x2 &raypack,
+                                   const Vector3 &boxmin,
+                                   const Vector3 &boxmax)
 {
   if (!makeMinBoxes)

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktball.h

@@ -16 +16 @@
 // GOLEM headers
 #include "configh.h"
+#include "ktbconf.h"
 //#include "ktbi.h"
 #include "ktbai.h"

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbconf.h

@@ -23 +23 @@
 #endif
 
-// If we support the use of SSE instructions for ray shooting
-// #define _USE_HAVRAN_SSE
 
 namespace GtpVisibilityPreprocessor {

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbf2trv.cpp

@@ -413 +413 @@
 // This code allows to specify the box where the ray should be traversed!
 void
-CKTBTraversal::FindNearestI(RayPacket2x2 &rp, Vector3 &boxmin, Vector3 &boxmax)
+CKTBTraversal::FindNearestI(RayPacket2x2 &rp,
+                                                        const Vector3 &boxmin,
+                                                        const Vector3 &boxmax)
 {
   static AxisAlignedBox3 localbox;

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

@@ -173 +173 @@
         }
 
+        
         Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
         string filename(buff);

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -5 +5 @@
 TEMPLATE = app
 
-#CONFIG -= qt
+CONFIG -= qt
 
 TARGET = preprocessor