Changeset 2698 for GTP/trunk


Ignore:
Timestamp:
05/23/08 13:33:29 (17 years ago)
Author:
bittner
Message:

merge on nemo

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

Legend:

Unmodified
Added
Removed

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

    r2667 r2698  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: út 18. III 16:04:11 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 22. V 11:01:58 2008 
    44# Project:  preprocessor.pro 
    55# Template: app 
    … …  
    77############################################################################# 
    88 
    9 first: release 
    10 install: release-install 
    11 uninstall: release-uninstall 
     9first: debug 
     10install: debug-install 
     11uninstall: debug-uninstall 
    1212MAKEFILE      = Makefile 
    1313QMAKE         = qmake 
    … …  
    2727MKDIR         = mkdir 
    2828SUBTARGETS    =  \ 
    29                 release \ 
    30                 debug 
     29                debug \ 
     30                release 
    3131 
     32debug: $(MAKEFILE).Debug FORCE 
     33        $(MAKE) -f $(MAKEFILE).Debug 
     34debug-make_default: $(MAKEFILE).Debug FORCE 
     35        $(MAKE) -f $(MAKEFILE).Debug  
     36debug-make_first: $(MAKEFILE).Debug FORCE 
     37        $(MAKE) -f $(MAKEFILE).Debug first 
     38debug-all: $(MAKEFILE).Debug FORCE 
     39        $(MAKE) -f $(MAKEFILE).Debug all 
     40debug-clean: $(MAKEFILE).Debug FORCE 
     41        $(MAKE) -f $(MAKEFILE).Debug clean 
     42debug-distclean: $(MAKEFILE).Debug FORCE 
     43        $(MAKE) -f $(MAKEFILE).Debug distclean 
     44debug-install: $(MAKEFILE).Debug FORCE 
     45        $(MAKE) -f $(MAKEFILE).Debug install 
     46debug-uninstall: $(MAKEFILE).Debug FORCE 
     47        $(MAKE) -f $(MAKEFILE).Debug uninstall 
    3248release: $(MAKEFILE).Release FORCE 
    3349        $(MAKE) -f $(MAKEFILE).Release 
    … …  
    4662release-uninstall: $(MAKEFILE).Release FORCE 
    4763        $(MAKE) -f $(MAKEFILE).Release uninstall 
    48 debug: $(MAKEFILE).Debug FORCE 
    49         $(MAKE) -f $(MAKEFILE).Debug 
    50 debug-make_default: $(MAKEFILE).Debug FORCE 
    51         $(MAKE) -f $(MAKEFILE).Debug  
    52 debug-make_first: $(MAKEFILE).Debug FORCE 
    53         $(MAKE) -f $(MAKEFILE).Debug first 
    54 debug-all: $(MAKEFILE).Debug FORCE 
    55         $(MAKE) -f $(MAKEFILE).Debug all 
    56 debug-clean: $(MAKEFILE).Debug FORCE 
    57         $(MAKE) -f $(MAKEFILE).Debug clean 
    58 debug-distclean: $(MAKEFILE).Debug FORCE 
    59         $(MAKE) -f $(MAKEFILE).Debug distclean 
    60 debug-install: $(MAKEFILE).Debug FORCE 
    61         $(MAKE) -f $(MAKEFILE).Debug install 
    62 debug-uninstall: $(MAKEFILE).Debug FORCE 
    63         $(MAKE) -f $(MAKEFILE).Debug uninstall 
    6464 
    6565Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \ 
    … …  
    6868                C:\Qt\4.1.2\mkspecs\features\default_pre.prf \ 
    6969                C:\Qt\4.1.2\mkspecs\features\win32\default_pre.prf \ 
    70                 C:\Qt\4.1.2\mkspecs\features\release.prf \ 
     70                C:\Qt\4.1.2\mkspecs\features\debug.prf \ 
    7171                C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf \ 
    7272                C:\Qt\4.1.2\mkspecs\features\default_post.prf \ 
    … …  
    8989C:\Qt\4.1.2\mkspecs\features\default_pre.prf: 
    9090C:\Qt\4.1.2\mkspecs\features\win32\default_pre.prf: 
    91 C:\Qt\4.1.2\mkspecs\features\release.prf: 
     91C:\Qt\4.1.2\mkspecs\features\debug.prf: 
    9292C:\Qt\4.1.2\mkspecs\features\debug_and_release.prf: 
    9393C:\Qt\4.1.2\mkspecs\features\default_post.prf: 
    … …  
    109109qmake_all: FORCE 
    110110 
    111 make_default: release-make_default debug-make_default FORCE 
    112 make_first: release-make_first debug-make_first FORCE 
    113 all: release-all debug-all FORCE 
    114 clean: release-clean debug-clean FORCE 
     111make_default: debug-make_default release-make_default FORCE 
     112make_first: debug-make_first release-make_first FORCE 
     113all: debug-all release-all FORCE 
     114clean: debug-clean release-clean FORCE 
    115115        -$(DEL_FILE) "..\bin\release"\preprocessor.exp 
    116 distclean: release-distclean debug-distclean FORCE 
     116        -$(DEL_FILE) "..\bin\release"\preprocessor.pdb 
     117        -$(DEL_FILE) "..\bin\release"\preprocessor.ilk 
     118        -$(DEL_FILE) vc*.pdb 
     119        -$(DEL_FILE) vc*.idb 
     120distclean: debug-distclean release-distclean FORCE 
    117121        -$(DEL_FILE) Makefile 
    118122 
     123debug-mocclean: $(MAKEFILE).Debug 
     124        $(MAKE) -f $(MAKEFILE).Debug mocclean 
    119125release-mocclean: $(MAKEFILE).Release 
    120126        $(MAKE) -f $(MAKEFILE).Release mocclean 
    121 debug-mocclean: $(MAKEFILE).Debug 
    122         $(MAKE) -f $(MAKEFILE).Debug mocclean 
    123 mocclean: release-mocclean debug-mocclean 
     127mocclean: debug-mocclean release-mocclean 
    124128 
     129debug-mocables: $(MAKEFILE).Debug 
     130        $(MAKE) -f $(MAKEFILE).Debug mocables 
    125131release-mocables: $(MAKEFILE).Release 
    126132        $(MAKE) -f $(MAKEFILE).Release mocables 
    127 debug-mocables: $(MAKEFILE).Debug 
    128         $(MAKE) -f $(MAKEFILE).Debug mocables 
    129 mocables: release-mocables debug-mocables 
     133mocables: debug-mocables release-mocables 
    130134FORCE: 
    131135 
     136$(MAKEFILE).Debug: Makefile 
    132137$(MAKEFILE).Release: Makefile 
    133 $(MAKEFILE).Debug: Makefile 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

    r2696 r2698  
    16001600SceneGraphLeaf *Preprocessor::RegisterDynamicGeometryWithRayCaster(SceneGraphLeaf *leaf) 
    16011601{ 
    1602         if (mRayCaster) 
    1603                 mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation()); 
     1602  if (mRayCaster) 
     1603        mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation()); 
     1604  // $$ JB in order to compile 
     1605  return leaf; 
    16041606} 
    16051607 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

    r2696 r2698  
    1515#include "Timer/PerfTimer.h" 
    1616#endif 
     17 
     18#define USE_HALTON 1 
    1719 
    1820namespace GtpVisibilityPreprocessor { 

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

    r2667 r2698  
    520520 
    521521BSP { 
    522   #termCrit       auto 
    523   #termCrit       auto2 
    524   termCrit        adhoc 
     522  # termCrit      auto 
     523  # termCrit      auto2 
     524   termCrit       adhoc 
    525525  # For Arena 
    526526  #maxDepthAllowed 15 
    527527  #maxListLength    8 
    528528  # For Vienna 
    529   #maxDepthAllowed 22 
    530   #maxListLength    6 
     529   maxDepthAllowed 22 
     530   maxListLength    6 
    531531  # For Powerplant 
    532   maxDepthAllowed  27 
    533   maxListLength     4 
     532  # maxDepthAllowed  27 
     533  # maxListLength     4 
    534534} 
    535535 
    … …  
    556556  # rayCastMethod 0 
    557557  # Intel 
    558   rayCastMethod 1 
     558  # rayCastMethod 1 
    559559  # Havran - 2 - static scene 
    560   # rayCastMethod 2 
     560  rayCastMethod 2 
    561561  # Havran - 3 - dynamic scene 
    562562  # rayCastMethod 3 

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

    r2634 r2698  
    1 CONFIG += release 
    2 #CONFIG += debug 
     1#CONFIG += release 
     2CONFIG += debug 
    33CONFIG += console warn_off thread mlrt qt 
    44 
    … …  
    142142SOURCES +=  QtInterface/QtPreprocessorThread.cpp \ 
    143143QtInterface/QtGlRenderer.cpp QtInterface/QtGlViewer.cpp  
    144 SOURCES +=  QtInterface/LogReader.cpp QtInterface/LogWriter.cpp 
     144SOURCES +=  QtInterface/LogReader.cpp QtInterface/LogWriter.cpp QtInterface/ObjectPlacer.cpp 
    145145} else { 
    146146#SOURCES += BoostPreprocessorThread.cpp  

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

    r2653 r2698  
    44 
    55#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    6 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=50000000 -samples_per_pass=1000000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_ray_cast_method=1 -preprocessor_detect_empty_viewspace+ -total_time=140" 
     6COMMAND="../scripts/preprocessor-debug.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=50000000 -samples_per_pass=1000000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_detect_empty_viewspace+ -total_time=140" 
    77 
    88#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 
Note: See TracChangeset for help on using the changeset viewer.