Ignore:
Timestamp:
05/23/08 15:39:19 (17 years ago)
Author:
bittner
Message:

havran ray caster bug fixed

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

Legend:

Unmodified
Added
Removed

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

    r2700 r2701  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: pá 23. V 14:49:37 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 23. V 15:20:40 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 
    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\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

    r2700 r2701  
    10531053          else 
    10541054                  hr = reinterpret_cast<HavranRayCaster*>(mRayCaster); 
    1055  
    1056           string ktbFilename = internKdTree; 
    1057           int l = (int)ktbFilename.length(); 
    1058           ktbFilename[l-1] = 't'; 
    1059           ktbFilename[l-2] = 'b'; 
    1060           ktbFilename[l-3] = 'k'; 
    1061  
    1062           cout << "Trying to load tree from file " << ktbFilename << endl; 
    1063           if (hr->ImportBinTree(ktbFilename, this->mObjects)) { 
    1064                   cout << "Loading failed - building kd-tree" << endl; 
    1065                   hr->Build(this->mObjects); 
    1066                   cout << "Exporting kd-tree to file " << ktbFilename << endl; 
    1067                   hr->ExportBinTree(ktbFilename); 
    1068           } 
    1069           else 
    1070                   cout << " done." << endl; 
     1055           
     1056          hr->Build(this->mObjects); 
    10711057  } 
     1058 
    10721059#endif 
    10731060 

  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbs.cpp

    r2686 r2701  
    11671167    int axis = d->axis; 
    11681168    AxisAlignedBox3 obox; 
    1169     for (ObjectContainer::iterator it = d->objlist->begin(); it != endit; it++) { 
     1169    for (ObjectContainer::iterator it = d->objlist->begin(); it != endit; ) { 
    11701170      Intersectable *obj = *it; 
    11711171      obox = obj->GetBox(); 
    … …  
    11791179        // we simply shorten the list - this object belongs only to the right list 
    11801180        (*it) = *(endit-1); 
    1181         it--; 
    11821181        endit--; 
     1182        continue; 
    11831183      } 
    11841184      else { 
    … …  
    11871187        d->tightbox.Include(obox); 
    11881188      } 
     1189          it++; 
    11891190    } // for 
    11901191  } 

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

    r2700 r2701  
    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

    r2700 r2701  
    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" 
Note: See TracChangeset for help on using the changeset viewer.