Changeset 2608


Ignore:
Timestamp:
01/17/08 17:25:10 (17 years ago)
Author:
bittner
Message:

HR updates

Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

    r2606 r2608  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 15:26:52 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 17:18:38 2008 
    44# Project:  preprocessor.pro 
    55# Template: app 
     
    7171                C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf \ 
    7272                C:\Qt\4.1.2\mkspecs\features\default_post.prf \ 
    73                 C:\Qt\4.1.2\mkspecs\features\qt.prf \ 
    74                 C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf \ 
    75                 C:\Qt\4.1.2\mkspecs\features\moc.prf \ 
    7673                C:\Qt\4.1.2\mkspecs\features\win32\thread.prf \ 
    7774                C:\Qt\4.1.2\mkspecs\features\warn_off.prf \ 
     
    9289C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf: 
    9390C:\Qt\4.1.2\mkspecs\features\default_post.prf: 
    94 C:\Qt\4.1.2\mkspecs\features\qt.prf: 
    95 C:\Qt\4.1.2\mkspecs\features\win32\opengl.prf: 
    96 C:\Qt\4.1.2\mkspecs\features\moc.prf: 
    9791C:\Qt\4.1.2\mkspecs\features\win32\thread.prf: 
    9892C:\Qt\4.1.2\mkspecs\features\warn_off.prf: 
     
    116110distclean: release-distclean debug-distclean FORCE 
    117111        -$(DEL_FILE) Makefile 
    118  
    119 release-mocclean: $(MAKEFILE).Release 
    120         $(MAKE) -f $(MAKEFILE).Release mocclean 
    121 debug-mocclean: $(MAKEFILE).Debug 
    122         $(MAKE) -f $(MAKEFILE).Debug mocclean 
    123 mocclean: release-mocclean debug-mocclean 
    124  
    125 release-mocables: $(MAKEFILE).Release 
    126         $(MAKE) -f $(MAKEFILE).Release mocables 
    127 debug-mocables: $(MAKEFILE).Debug 
    128         $(MAKE) -f $(MAKEFILE).Debug mocables 
    129 mocables: release-mocables debug-mocables 
    130112FORCE: 
    131113 
  • GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtPreprocessorThread.h

    r1947 r2608  
    22#define __QT_PREPROCESSOR_THREAD_H 
    33 
    4 //#ifdef USE_QT 
     4#ifdef USE_QT 
    55 
    66#include <QThread> 
     
    3535} 
    3636 
    37 //#endif 
    3837#endif 
     38#endif 
  • GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pompeii

    r2607 r2608  
    1 #!/bin/sh 
     1#!sh 
    22 
    33 
     
    1616VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz 
    1717 
    18 PREFIX=../work/plots/osp-pompeii-SG08a 
     18PREFIX=../work/plots/osp-pompeii-SG08dummy 
    1919 
    2020 
  • GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_powerplant

    r2607 r2608  
    1 #!/bin/sh 
     1#!sh 
    22 
    33#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    4 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=500000000" 
     4COMMAND="../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+" 
    55 
    66 
     
    88VIEWCELLS=../data/PowerPlant/powerplant-seq-viewcells.xml.gz 
    99 
    10 PREFIX=../work/plots/osp-powerplant-1e5 
    11  
     10PREFIX=../work/plots/osp-powerplant-SG08 
    1211 
    1312 
  • GTP/trunk/Lib/Vis/Preprocessing/src/default.env

    r2606 r2608  
    526526  #maxDepthAllowed 22 
    527527  #maxListLength    6 
    528 } 
    529  
     528  # For Power plant 
     529  #maxDepthAllowed 8 
     530  #maxListLength    10 
     531} 
     532 
  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/configh.h

    r2602 r2608  
    1313#ifndef __CONFIGH_H__ 
    1414#define __CONFIGH_H__ 
     15 
     16#if defined(_MSC_VER) 
     17// use perftimer only on msvc 
     18// define __SSE__ macro as it is not defined under MSVC 
     19#define __SSE__ 
     20// If we support the use of SSE instructions for ray shooting 
     21#define _USE_HAVRAN_SSE 
     22#endif 
    1523 
    1624#ifndef USE_GOLEM_NAMESPACE 
  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktball.cpp

    r2603 r2608  
    424424 
    425425void 
    426 CKTB::FindNearestI(RayPacket2x2 &raypack, Vector3 &boxmin, Vector3 &boxmax) 
     426CKTB::FindNearestI(RayPacket2x2 &raypack, 
     427                                   const Vector3 &boxmin, 
     428                                   const Vector3 &boxmax) 
    427429{ 
    428430  if (!makeMinBoxes) 
  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktball.h

    r2602 r2608  
    1616// GOLEM headers 
    1717#include "configh.h" 
     18#include "ktbconf.h" 
    1819//#include "ktbi.h" 
    1920#include "ktbai.h" 
  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbconf.h

    r2603 r2608  
    2323#endif 
    2424 
    25 // If we support the use of SSE instructions for ray shooting 
    26 // #define _USE_HAVRAN_SSE 
    2725 
    2826namespace GtpVisibilityPreprocessor { 
  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbf2trv.cpp

    r2595 r2608  
    413413// This code allows to specify the box where the ray should be traversed! 
    414414void 
    415 CKTBTraversal::FindNearestI(RayPacket2x2 &rp, Vector3 &boxmin, Vector3 &boxmax) 
     415CKTBTraversal::FindNearestI(RayPacket2x2 &rp, 
     416                                                        const Vector3 &boxmin, 
     417                                                        const Vector3 &boxmax) 
    416418{ 
    417419  static AxisAlignedBox3 localbox; 
  • GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

    r2603 r2608  
    173173        } 
    174174 
     175         
    175176        Environment::GetSingleton()->GetStringValue("Scene.filename", buff); 
    176177        string filename(buff); 
  • GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

    r2602 r2608  
    55TEMPLATE = app 
    66 
    7 #CONFIG -= qt 
     7CONFIG -= qt 
    88 
    99TARGET = preprocessor 
Note: See TracChangeset for help on using the changeset viewer.