Ignore:
Timestamp:
01/22/08 23:48:16 (17 years ago)
Author:
bittner
Message:

commit before merge with vlastimil

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

Legend:

Unmodified
Added
Removed

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

    r2625 r2627  
    99//$$ 19.1. 2008 test for speed 
    1010//#define USE_BIT_PVS 
     11//#define USE_HASH_PVS 
    1112 
    1213 

  • GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

    r2625 r2627  
    9191  GlRendererBuffer(sceneGraph, viewcells, tree) 
    9292{ 
    93   mUseVbos = false; 
     93  mUseVbos = true; 
    9494  MakeCurrent(); 
    9595  InitGL(); 
    … …  
    145145 
    146146        ObjectPvs pvs; 
    147          
    148         if (1)  
     147 
     148        bool evaluateFilter; 
     149        Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluateFilter", evaluateFilter); 
     150 
     151        if (!evaluateFilter)  
    149152                pvs = viewcell->GetPvs(); 
    150153        else  
    151                 mViewCellsManager->ApplyFilter2(viewcell, false, 1.0f, pvs); 
     154          mViewCellsManager->ApplyFilter2(viewcell, 
     155                                                                          false, 
     156                                                                          mViewCellsManager->GetFilterWidth(), 
     157                                                                          pvs); 
    152158 
    153159        mUseForcedColors = true; 

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

    r2625 r2627  
    26142614#endif 
    26152615          } 
    2616          
    26172616        mSamplesStat.mViewCells += (int)viewCells.size(); 
    26182617 
    … …  
    46644663                                                                                ViewCellContainer &viewcells) 
    46654664{ 
    4666         return mKdTree->CastLineSegment(origin, termination, viewcells); 
     4665  return mKdTree->CastLineSegment(origin, termination, viewcells); 
    46674666} 
    46684667 
    … …  
    64156414                                                                                        ViewCellContainer &viewcells) 
    64166415{ 
    6417         return mHierarchyManager->CastLineSegment(origin, termination, viewcells); 
     6416 
     6417  return mHierarchyManager->CastLineSegment(origin, termination, viewcells); 
    64186418} 
    64196419 

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

    r2588 r2627  
    99#include "BoundingBoxConverter.h" 
    1010 
    11 #ifdef __WINDOWS__ 
     11#ifdef _WIN32 
    1212#include <hash_map> 
    1313#else 
    … …  
    6161 
    6262 
    63 #ifdef __WINDOWS__ 
     63#ifdef _WIN32 
    6464typedef stdext::hash_map<int, Intersectable *> pvs_hash; 
    6565#else 

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

    r2625 r2627  
    34633463        float mint = 0.0f, maxt = 1.0f; 
    34643464 
    3465         //ViewCell::NewMail(); 
    3466  
     3465        //      ViewCell::NewMail(); 
     3466         
    34673467        Vector3 entp = origin; 
    34683468        Vector3 extp = termination; 

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

    r2612 r2627  
    3131#XERCES = $$NONGTP/Xerces/xerces-c_2_8_0 
    3232   
    33 INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$XERCES/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include 
     33INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$XERCES/include \ 
     34  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include sparsehash/src 
    3435 
    3536win32:LIBPATH += GL $$XERCES/lib $$NONGTP/Devil/lib \ 

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

    r2622 r2627  
    2929 
    3030SCENE=../data/Arena/arena-high-lods.obj 
    31 VIEWCELLS=../data/Arena/viewcells-5000.xml.gz 
     31#VIEWCELLS=../data/Arena/viewcells-5000.xml.gz 
     32VIEWCELLS=../data/Arena/arena-high-lods-57000-viewcells.xml.gz 
    3233 
    3334 
    3435#SCENE=../data/vienna/vienna_cropped.obj 
    3536#VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz 
    36  
    3737 
    3838#VIEWCELLS=../data/vienna/vienna-sequential-30000-single-viewcell.xml 
    … …  
    4949#-rss_distributions=direction+spatial+mutation \ 
    5050 
     51# $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     52# -view_cells_use_kd_pvs+ -af_use_kd_pvs+ -view_cells_filter_width=1.0 \ 
     53# -preprocessor_visibility_file=$PREFIX-reference.xml \ 
     54# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     55# -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     56 
     57 
    5158$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    52 -rss_distributions=direction+spatial+mutation \ 
     59-rss_distributions=direction \ 
    5360-view_cells_use_kd_pvs+ -af_use_kd_pvs+ -view_cells_filter_width=1.0 \ 
    5461-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \ 
    … …  
    5663-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog 
    5764 
     65#+spatial+mutation 
     66 
    5867#-rss_distributions=mutation+object_direction+spatial \ 

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

    r2059 r2627  
    4848 
    4949 
    50 # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    51 # -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
    52 # -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
    53 # -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     50$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     51-preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
     52-view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     53-preprocessor_histogram_file=$PREFIX-r-reference.hlog 
    5454 
    5555# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
Note: See TracChangeset for help on using the changeset viewer.