Changeset 2699


Ignore:
Timestamp:
05/23/08 14:10:13 (16 years ago)
Author:
bittner
Message:

havran ray caster fix

Location:
GTP/trunk/Lib/Vis/Preprocessing
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_arena.sh

    r2633 r2699  
    66#TARGET=debug 
    77TARGET=release 
    8 COMMAND="../bin/$TARGET/Preprocessor.exe -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000" 
     8COMMAND="../bin/$TARGET/Preprocessor.exe -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -preprocessor_use_kd_pvs+" 
    99 
    1010echo "starting $TARGET version" 

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

    r2697 r2699  
    1111echo "starting $TARGET version" 
    1212 
     13#SCENE=../data/Arena/arena-high-lods.obj 
     14#VIEWCELLS=../data/Arena/arena-high-lods-5000-viewcells.xml.gz 
    1315#SCENE=../data/vienna/vienna_cropped.obj 
    1416#SCENE=../data/roofs2.obj 
    … …  
    1618SCENE=../data/vienna/vienna_rep.obj 
    1719 
    18 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz  
     20#SCENE=../data/vienna/vienna_cropped.obj 
     21#VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz  
    1922VIEWPOINTS=../data/vienna/testwalk.vp 
    2023 
     24#LOG_PREFIX=../src/SG08/rebut-arena-pixel2 
    2125LOG_PREFIX=../src/SG08/try_100_real 
    2226#LOG_PREFIX=../src/SG08/city_full_100 
    … …  
    4044-gvs_min_contribution=50 \ 
    4145-gvs_per_viewcell=true \ 
     46-preprocessor_detect_empty_viewspace+ -kd_pvs_area=1e-5 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \ 
    4247-gvs_stats=$LOG_PREFIX-gvsStats.log \ 
    4348-view_cells_filename=$VIEWCELLS \ 

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

    r2686 r2699  
    6060  Environment::GetSingleton()->GetStringValue("Scene.filename", buff); 
    6161  string filename(buff); 
     62 
    6263  const string kdfile = ReplaceSuffix(filename, ".obj", ".kdh"); 
    6364 
    6465  if (!ImportBinTree(kdfile, objlist)) { 
    65         cout << "\nKd-tree for Havran ray caster imported."<<endl<<flush; 
     66        cout << "\nKd-tree for Havran ray caster imported."<<endl<<flush; 
    6667  } 
    6768  else { 

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

    r2698 r2699  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 22. V 11:01:58 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 23. V 13:41:28 2008 
    44# Project:  preprocessor.pro 
    55# Template: app 
    … …  
    77############################################################################# 
    88 
    9 first: debug 
    10 install: debug-install 
    11 uninstall: debug-uninstall 
     9first: release 
     10install: release-install 
     11uninstall: release-uninstall 
    1212MAKEFILE      = Makefile 
    1313QMAKE         = qmake 
    … …  
    2727MKDIR         = mkdir 
    2828SUBTARGETS    =  \ 
    29                 debug \ 
    30                 release 
     29                release \ 
     30                debug 
    3131 
     32release: $(MAKEFILE).Release FORCE 
     33        $(MAKE) -f $(MAKEFILE).Release 
     34release-make_default: $(MAKEFILE).Release FORCE 
     35        $(MAKE) -f $(MAKEFILE).Release  
     36release-make_first: $(MAKEFILE).Release FORCE 
     37        $(MAKE) -f $(MAKEFILE).Release first 
     38release-all: $(MAKEFILE).Release FORCE 
     39        $(MAKE) -f $(MAKEFILE).Release all 
     40release-clean: $(MAKEFILE).Release FORCE 
     41        $(MAKE) -f $(MAKEFILE).Release clean 
     42release-distclean: $(MAKEFILE).Release FORCE 
     43        $(MAKE) -f $(MAKEFILE).Release distclean 
     44release-install: $(MAKEFILE).Release FORCE 
     45        $(MAKE) -f $(MAKEFILE).Release install 
     46release-uninstall: $(MAKEFILE).Release FORCE 
     47        $(MAKE) -f $(MAKEFILE).Release uninstall 
    3248debug: $(MAKEFILE).Debug FORCE 
    3349        $(MAKE) -f $(MAKEFILE).Debug 
    … …  
    4662debug-uninstall: $(MAKEFILE).Debug FORCE 
    4763        $(MAKE) -f $(MAKEFILE).Debug uninstall 
    48 release: $(MAKEFILE).Release FORCE 
    49         $(MAKE) -f $(MAKEFILE).Release 
    50 release-make_default: $(MAKEFILE).Release FORCE 
    51         $(MAKE) -f $(MAKEFILE).Release  
    52 release-make_first: $(MAKEFILE).Release FORCE 
    53         $(MAKE) -f $(MAKEFILE).Release first 
    54 release-all: $(MAKEFILE).Release FORCE 
    55         $(MAKE) -f $(MAKEFILE).Release all 
    56 release-clean: $(MAKEFILE).Release FORCE 
    57         $(MAKE) -f $(MAKEFILE).Release clean 
    58 release-distclean: $(MAKEFILE).Release FORCE 
    59         $(MAKE) -f $(MAKEFILE).Release distclean 
    60 release-install: $(MAKEFILE).Release FORCE 
    61         $(MAKE) -f $(MAKEFILE).Release install 
    62 release-uninstall: $(MAKEFILE).Release FORCE 
    63         $(MAKE) -f $(MAKEFILE).Release uninstall 
    6464 
    65 Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \ 
     65Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \ 
    6666                C:\Qt\4.1.2\mkspecs\features\qt_config.prf \ 
    6767                C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \ 
    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\debug.prf \ 
     70                C:\Qt\4.1.2\mkspecs\features\release.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\debug.prf: 
     91C:\Qt\4.1.2\mkspecs\features\release.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: debug-make_default release-make_default FORCE 
    112 make_first: debug-make_first release-make_first FORCE 
    113 all: debug-all release-all FORCE 
    114 clean: debug-clean release-clean FORCE 
     111make_default: release-make_default debug-make_default FORCE 
     112make_first: release-make_first debug-make_first FORCE 
     113all: release-all debug-all FORCE 
     114clean: release-clean debug-clean FORCE 
    115115        -$(DEL_FILE) "..\bin\release"\preprocessor.exp 
    116         -$(DEL_FILE) "..\bin\release"\preprocessor.pdb 
    117         -$(DEL_FILE) "..\bin\release"\preprocessor.ilk 
    118         -$(DEL_FILE) vc*.pdb 
    119         -$(DEL_FILE) vc*.idb 
    120 distclean: debug-distclean release-distclean FORCE 
     116distclean: release-distclean debug-distclean FORCE 
    121117        -$(DEL_FILE) Makefile 
    122118 
     119release-mocclean: $(MAKEFILE).Release 
     120        $(MAKE) -f $(MAKEFILE).Release mocclean 
    123121debug-mocclean: $(MAKEFILE).Debug 
    124122        $(MAKE) -f $(MAKEFILE).Debug mocclean 
    125 release-mocclean: $(MAKEFILE).Release 
    126         $(MAKE) -f $(MAKEFILE).Release mocclean 
    127 mocclean: debug-mocclean release-mocclean 
     123mocclean: release-mocclean debug-mocclean 
    128124 
     125release-mocables: $(MAKEFILE).Release 
     126        $(MAKE) -f $(MAKEFILE).Release mocables 
    129127debug-mocables: $(MAKEFILE).Debug 
    130128        $(MAKE) -f $(MAKEFILE).Debug mocables 
    131 release-mocables: $(MAKEFILE).Release 
    132         $(MAKE) -f $(MAKEFILE).Release mocables 
    133 mocables: debug-mocables release-mocables 
     129mocables: release-mocables debug-mocables 
    134130FORCE: 
    135131 
     132$(MAKEFILE).Release: Makefile 
    136133$(MAKEFILE).Debug: Makefile 
    137 $(MAKEFILE).Release: Makefile 

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

    r2698 r2699  
    527527                cout << "finished loading" << endl; 
    528528        } 
    529  
     529         
    530530        return result; 
    531531} 
    … …  
    10371037        GetIntValue("Preprocessor.rayCastMethod", rayCastMethod); 
    10381038 
    1039 #ifdef USE_HAVRAN_RAYCASTER 
    1040  
     1039  // first buildup the tree for havran ray caster if it is used 
    10411040  if ((rayCastMethod == 2) || (rayCastMethod == 3))  
    1042   { 
    1043           HavranRayCaster *hr = 0; 
    1044  
    1045           if (rayCastMethod == 3) 
    1046                   hr = reinterpret_cast<HavranDynRayCaster*>(mRayCaster); 
    1047           else 
    1048                   hr = reinterpret_cast<HavranRayCaster*>(mRayCaster); 
    1049  
    1050           string ktbFilename = internKdTree; 
    1051           int l = (int)ktbFilename.length(); 
    1052           ktbFilename[l-1] = 't'; 
    1053           ktbFilename[l-2] = 'b'; 
    1054           ktbFilename[l-3] = 'k'; 
    1055  
    1056           cout << "Trying to load tree from file " << ktbFilename << endl; 
    1057           if (hr->ImportBinTree(ktbFilename, this->mObjects)) { 
    1058                   cout << "Loading failed - building kd-tree" << endl; 
    1059                   hr->Build(this->mObjects); 
    1060                   cout << "Exporting kd-tree to file " << ktbFilename << endl; 
    1061                   hr->ExportBinTree(ktbFilename); 
    1062           } 
    1063           else 
    1064                   cout << " done." << endl; 
    1065   } 
    1066 #endif 
     1041        { 
     1042          HavranRayCaster *hr = 0; 
     1043 
     1044          if (rayCastMethod == 3) 
     1045                hr = reinterpret_cast<HavranDynRayCaster*>(mRayCaster); 
     1046          else 
     1047                hr = reinterpret_cast<HavranRayCaster*>(mRayCaster); 
     1048           
     1049          hr->Build(this->mObjects); 
     1050        } 
     1051   
     1052// #ifdef USE_HAVRAN_RAYCASTER 
     1053//   if ((rayCastMethod == 2) || (rayCastMethod == 3))  
     1054//   { 
     1055//        HavranRayCaster *hr = 0; 
     1056 
     1057//        if (rayCastMethod == 3) 
     1058//                hr = reinterpret_cast<HavranDynRayCaster*>(mRayCaster); 
     1059//        else 
     1060//                hr = reinterpret_cast<HavranRayCaster*>(mRayCaster); 
     1061 
     1062//        string ktbFilename = internKdTree; 
     1063//        int l = (int)ktbFilename.length(); 
     1064//        ktbFilename[l-1] = 't'; 
     1065//        ktbFilename[l-2] = 'b'; 
     1066//        ktbFilename[l-3] = 'k'; 
     1067 
     1068//        cout << "Trying to load tree from file " << ktbFilename << endl; 
     1069//        if (hr->ImportBinTree(ktbFilename, this->mObjects)) { 
     1070//                cout << "Loading failed - building kd-tree" << endl; 
     1071//                hr->Build(this->mObjects); 
     1072//                cout << "Exporting kd-tree to file " << ktbFilename << endl; 
     1073//                hr->ExportBinTree(ktbFilename); 
     1074//        } 
     1075//        else 
     1076//                cout << " done." << endl; 
     1077//   } 
     1078// #endif 
    10671079 
    10681080 

  • GTP/trunk/Lib/Vis/Preprocessing/src/common.h

    r2678 r2699  
    2424 
    2525#define DYNAMIC_OBJECTS_HACK 1 
    26 #define USE_HAVRAN_RAYCASTER 0 
     26#define USE_HAVRAN_RAYCASTER 1 
    2727 
    2828 

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

    r2695 r2699  
    222222        //////////// 
    223223        //-- initialize external ray caster 
    224  
    225224        if (preprocessor->LoadInternKdTree(internKdTree)) 
    226225        { 
    … …  
    234233        } 
    235234 
     235         
     236         
    236237        // export objects as obj 
    237238        if (preprocessor->mExportObj) 

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

    r2698 r2699  
    1 #CONFIG += release 
    2 CONFIG += debug 
     1CONFIG += release 
     2#CONFIG += debug 
    33CONFIG += console warn_off thread mlrt qt 
    44 

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

    r2698 r2699  
    44 
    55#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    6 COMMAND="../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" 
     6COMMAND="../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_detect_empty_viewspace+ -total_time=140" 
    77 
    88#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 

  • GTP/trunk/Lib/Vis/Preprocessing/work/plots/plot_sampling

    r2639 r2699  
    22 
    33#PREFIX=osp-rss-single 
     4#PREFIX=sg08-rebuttal-arena-pixel 
    45PREFIX=osp-vienna 
    56#PREFIX=osp-pompeii 
    … …  
    2324#" 
    2425 
     26#FILES="`ls $PREFIX*.log`" 
    2527#FILES="../../scripts/stats.log" 
    2628#FILES="`ls $PREFIX*.log`" 
    … …  
    6971FILES="osp-vienna-SG08-combined-m8-2.log osp-1e5-r-reference-global.log osp-1e5-r-reference.log" 
    7072 
     73#FINAL PLOT 
     74#FILES="osp-1e5-i-mixed-b1-n4l.log osp-1e5-r-reference-global.log osp-1e5-r-reference.log \ 
     75#osp-vienna-SG08-hr-combined-m8-2.log \ 
     76#" 
     77 
     78#FILES="osp-vienna-SG08-hr-r-reference.log osp-vienna-SG08-hr-reference-global.log \ 
     79#osp-vienna-SG08-ir-r-reference.log osp-vienna-SG08-ir-reference-global.log \ 
     80#osp-vienna-SG08-gr-r-reference.log osp-vienna-SG08-gr-reference-global.log \ 
     81#" 
     82 
    7183 
    7284#FINAL TIME PLOT - VIENNA 
    … …  
    148160#  " 
    149161# osp-powerplant-SG08b-i-mixed-b1-n4a.log \ 
     162#FILES="osp-PIXEL-1e5-i-mixed-b1-n4l.log \ 
     163#osp-vienna-SG08a-PIXEL-i-mixed-b1-n4l.log \ 
     164#osp-vienna-SG08-PIXEL-i-mixed-b1-n4l.log \ 
     165#osp-vienna-SG08b-PIXEL-i-mixed-b1-n4l.log \ 
     166#" 
     167#osp-vienna-SG08-PIXEL-i-mixed-b1-n4l.log \ 
     168 
     169 
     170#PIXEL ERROR 
     171#FILES="osp-PIXEL-1e5-i-mixed-b1-n4l.log osp-vienna-SG08a-PIXEL-i-mixed-b1-n4l.log osp-vienna-SG08b-PIXEL-i-mixed-b1-n4l.log osp-vienna-SG08c-PIXEL-i-mixed-b1-n4l.log" 
     172# FILES="osp-vienna-SG08d-PIXEL-i-mixed-b1-n4l.log \ 
     173# osp-vienna-SG08e-PIXEL-r-reference.log \ 
     174# osp-vienna-SG08d-PIXEL-r-reference-global.log \ 
     175# osp-vienna-SG08e-PIXEL-i-mixed-b1-n4l.log \ 
     176# osp-vienna-SG08e-PIXELRb-i-mixed-b1-n4l.log \ 
     177# osp-vienna-SG08e-PIXELRb-nofilter-i-mixed-b1-n4l.log \ 
     178# osp-vienna-SG08e-PIXELRc-i-mixed-b1-n4l.log \ 
     179# " 
     180 
     181#PIXEL ERROR REBUTTAL SG08 
     182#FILES="osp-PIXEL-1e5-i-mixed-b1-n4l.log osp-vienna-SG08a-PIXEL-i-mixed-b1-n4l.log osp-vienna-SG08b-PIXEL-i-mixed-b1-n4l.log osp-vienna-SG08c-PIXEL-i-mixed-b1-n4l.log" 
     183# FILES="osp-vienna-SG08e-PIXELRc-r-reference.log \ 
     184# osp-vienna-SG08e-PIXELRc-r-reference-global.log \ 
     185# osp-vienna-SG08e-PIXELRc-i-mixed-b1-n4l-nofilter.log \ 
     186# osp-vienna-SG08e-PIXELRc-i-mixed-b1-n4l.log \ 
     187# " 
     188 
     189#FILES="osp-vienna-SG08e-PIXELRd-1e4-r-reference.log \ 
     190#osp-vienna-SG08e-PIXELRd-1e4-r-reference-global.log \ 
     191#osp-vienna-SG08e-PIXELRd-1e4-i-mixed-b1-n4l-nofilter.log \ 
     192#osp-vienna-SG08e-PIXELRd-1e4-i-mixed-b1-n4l.log \ 
     193#" 
     194 
     195FILES="osp-arena-SG08e-PIXELRn-1e5-r-reference.log \ 
     196osp-arena-SG08e-PIXELRn-1e5-r-reference-global.log \ 
     197osp-arena-SG08e-PIXELRn-1e5-i-mixed-b1-n4l.log \ 
     198osp-arena-SG08e-PIXELRn-1e5-i-mixed-b1-n4l-filter.log \ 
     199" 
     200 
     201#osp-arena-SG08e-PIXELRn-1e4-r-reference.log \ 
     202#osp-arena-SG08e-PIXELRn-1e4-r-reference-global.log \ 
     203#osp-arena-SG08e-PIXELRn-1e4-i-mixed-b1-n4l.log \ 
     204#osp-vienna-SG08e-PIXELRn-1e4-i-mixed-b1-n4l-filter.log \ 
    150205 
    151206 
    … …  
    220275#./showplot $PREFIX-avgpvsrendererror 
    221276 
     277$COMMAND3 $STYLE TotalSamples AvgPixelError $FILES 
    222278#$COMMAND1 $STYLE TotalSamples AvgPixelError $FILES 
    223279#./showplot $PREFIX-avgpixelerror 
    … …  
    226282./showplot $PREFIX-avgpixelerror 
    227283 
     284$COMMAND3 $STYLE TotalSamples MaxPixelError $FILES 
    228285#$COMMAND1 $STYLE TotalSamples MaxPvsRenderError $FILES 
    229286#./showplot $PREFIX-maxpvsrendererror 
    … …  
    232289./showplot $PREFIX-maxpixelerror 
    233290 
     291$COMMAND3 $STYLE Time AvgPixelError $FILES 
     292./showplot $PREFIX-avgpixelerrortime 
     293 
     294$COMMAND3 $STYLE Time MaxPixelError $FILES 
     295./showplot $PREFIX-maxpixelerrortime 
     296 
     297$COMMAND2 $STYLE TotalSamples ErrorFreeFrames $FILES 
     298./showplot $PREFIX-errorfreeframes 
    234299#$COMMAND2 $STYLE TotalSamples ErrorFreeFrames $FILES 
    235300#./showplot $PREFIX-errorfreeframes 

  • GTP/trunk/Lib/Vis/Preprocessing/work/plots/ps_memory_plot2

    r2639 r2699  
    1414 
    1515 
     16 
    1617#echo set term x11 > $FILE 
    1718#echo set grid >> $FILE  
    … …  
    1920echo set xlabel \"$2\" >> $FILE  
    2021echo set ylabel \"$3\" >> $FILE 
     22#echo set yrange \[0:4000\] >> $FILE 
    2123#echo set yrange \[0:2000\] >> $FILE 
    2224 
Note: See TracChangeset for help on using the changeset viewer.