Changeset 2634 for GTP/trunk/Lib/Vis


Ignore:
Timestamp:
01/23/08 01:57:40 (17 years ago)
Author:
bittner
Message:
 
Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r2618 r2634  
    10981098    nodeStack.pop(); 
    10991099        if (!node->Mailed()) { 
    1100           node->Mail(); 
    11011100          if (node->IsLeaf() || GetSurfaceArea(node) <= maxArea)  { 
    11021101                Intersectable *object = GetOrCreateKdIntersectable(node); 
    11031102                if (!node->Mailed()) { 
     1103                  node->Mail(); 
    11041104                  objects.push_back(object); 
    11051105                } 

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

    r2629 r2634  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: út 22. I 23:58:58 2008 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: st 23. I 01:44:33 2008 
    44# Project:  preprocessor.pro 
    55# Template: app 
    … …  
    6363        $(MAKE) -f $(MAKEFILE).Debug 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 \ 

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

    r2629 r2634  
    12061206 
    12071207        // !!!!!!!!!!!!!!!! VH no sorting 
    1208         if (  
     1208        if ( 
    12091209                rays.size() > 10000 
    12101210                ) 

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

    r2627 r2634  
    99//$$ 19.1. 2008 test for speed 
    1010//#define USE_BIT_PVS 
    11 //#define USE_HASH_PVS 
     11#define USE_HASH_PVS 
    1212 
    1313 

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

    r2633 r2634  
    1919 
    2020 
     21 
    2122#define USE_CG 1 
    2223 
    … …  
    150151 
    151152        if (!evaluateFilter)  
    152                 pvs = viewcell->GetPvs(); 
     153          pvs = viewcell->GetPvs(); 
    153154        else  
    154155          mViewCellsManager->ApplyFilter2(viewcell, 

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

    r2633 r2634  
    33693369                        // $$ warning collect objects takes only unmailed ones! 
    33703370                        if (mUseKdPvs) { 
    3371                                                   GetPreprocessor()->mKdTree->CollectKdObjects(box, objects); 
    3372                           //GetPreprocessor()->mKdTree->CollectSmallKdObjects(box, objects, 0.1f); 
     3371                          GetPreprocessor()->mKdTree->CollectKdObjects(box, objects); 
     3372                          //GetPreprocessor()->mKdTree->CollectSmallKdObjects(box, objects, 0.02f); 
    33733373 
    33743374                        } else 

  • GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbconf.h

    r2629 r2634  
    2424 
    2525// If we support the use of SSE instructions for ray shooting 
    26 #define _USE_HAVRAN_SSE 
     26//#define _USE_HAVRAN_SSE 
    2727 
    2828namespace GtpVisibilityPreprocessor { 

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

    r2629 r2634  
    66 
    77#define NOMINMAX 
    8 #ifdef __WINDOWS__ 
     8#ifdef _WIN32 
    99#include <windows.h> 
    1010#ifdef _CRT_SET 
    … …  
    316316                // $$matt 
    317317                preprocessor->renderer =  
    318                         new QtGlRendererBuffer(512, 512, 
    319                         preprocessor->mSceneGraph, 
    320                         preprocessor->mViewCellsManager, 
    321                         preprocessor->mKdTree); 
    322  
    323         } 
     318                  new QtGlRendererBuffer(1024, 1024, 
     319                                                                 preprocessor->mSceneGraph, 
     320                                                                 preprocessor->mViewCellsManager, 
     321                                                                 preprocessor->mKdTree); 
     322                 
     323          } 
    324324         
    325325        if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger) 

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

    r2629 r2634  
    8181 
    8282LIBS += RTScene.lib RTWorld.lib 
    83 DEFINES += GTP_INTERNAL 
     83DEFINES += GTP_INTERNAL NDEBUG 
    8484INCLUDEPATH += ../MultiLevelRayTracing 
    8585} 
    … …  
    125125Intersectable.cpp TraversalTree.cpp ObjectPvs.cpp ObjectsParser.cpp \ 
    126126FilterBasedDistribution.cpp DifferenceSampling.cpp HavranRayCaster.cpp \ 
    127 HavranDynRayCaster.cpp OcclusionQuery.cpp  
     127HavranDynRayCaster.cpp OcclusionQuery.cpp RandomViewCellsHandler.cpp 
    128128 
    129129 
    … …  
    133133SOURCES += havran/allocgo2.cpp havran/ktbai.cpp havran/ktbtrav.cpp \ 
    134134havran/ktb.cpp havran/ktball.cpp havran/sbbox.cpp \ 
    135 havran/ktb8b.cpp havran/ktbftrav.cpp havran/timer.cpp  
     135havran/ktb8b.cpp havran/ktbftrav.cpp havran/timer.cpp havran/ktbs.cpp \ 
     136havran/ktbf2trv.cpp 
    136137 
    137138 

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

    r2627 r2634  
    22 
    33 
     4 
    45#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    5 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3" 
     6COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_ray_cast_method=2 -preprocessor_detect_empty_viewspace-" 
    67 
    78#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 
    … …  
    2930 
    3031SCENE=../data/Arena/arena-high-lods.obj 
     32VIEWCELLS=../data/Arena/arena-high-lods-5000-viewcells.xml.gz 
    3133#VIEWCELLS=../data/Arena/viewcells-5000.xml.gz 
    32 VIEWCELLS=../data/Arena/arena-high-lods-57000-viewcells.xml.gz 
     34#VIEWCELLS=../data/Arena/arena-high-lods-57000-viewcells.xml.gz 
    3335 
    3436 
    … …  
    5759 
    5860$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    59 -rss_distributions=direction \ 
     61-rss_distributions=mutation+object_direction+spatial \ 
    6062-view_cells_use_kd_pvs+ -af_use_kd_pvs+ -view_cells_filter_width=1.0 \ 
    6163-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \ 
Note: See TracChangeset for help on using the changeset viewer.