Changeset 2634
- Timestamp:
- 01/23/08 01:57:40 (17 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp
r2618 r2634 1098 1098 nodeStack.pop(); 1099 1099 if (!node->Mailed()) { 1100 node->Mail();1101 1100 if (node->IsLeaf() || GetSurfaceArea(node) <= maxArea) { 1102 1101 Intersectable *object = GetOrCreateKdIntersectable(node); 1103 1102 if (!node->Mailed()) { 1103 node->Mail(); 1104 1104 objects.push_back(object); 1105 1105 } -
GTP/trunk/Lib/Vis/Preprocessing/src/Makefile
r2629 r2634 1 1 ############################################################################# 2 2 # Makefile for building: preprocessor 3 # Generated by qmake (2.00a) (Qt 4.1.2) on: út 22. I 23:58:5820083 # Generated by qmake (2.00a) (Qt 4.1.2) on: st 23. I 01:44:33 2008 4 4 # Project: preprocessor.pro 5 5 # Template: app … … 63 63 $(MAKE) -f $(MAKEFILE).Debug uninstall 64 64 65 Makefile: preprocessor.pro C:/Qt/4.1.2/mkspecs/win32-msvc 2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \65 Makefile: preprocessor.pro C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \ 66 66 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \ 67 67 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \ -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp
r2629 r2634 1206 1206 1207 1207 // !!!!!!!!!!!!!!!! VH no sorting 1208 if ( 1208 if ( 1209 1209 rays.size() > 10000 1210 1210 ) -
GTP/trunk/Lib/Vis/Preprocessing/src/PvsDefinitions.h
r2627 r2634 9 9 //$$ 19.1. 2008 test for speed 10 10 //#define USE_BIT_PVS 11 //#define USE_HASH_PVS11 #define USE_HASH_PVS 12 12 13 13 -
GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp
r2633 r2634 19 19 20 20 21 21 22 #define USE_CG 1 22 23 … … 150 151 151 152 if (!evaluateFilter) 152 153 pvs = viewcell->GetPvs(); 153 154 else 154 155 mViewCellsManager->ApplyFilter2(viewcell, -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2633 r2634 3369 3369 // $$ warning collect objects takes only unmailed ones! 3370 3370 if (mUseKdPvs) { 3371 3372 //GetPreprocessor()->mKdTree->CollectSmallKdObjects(box, objects, 0. 1f);3371 GetPreprocessor()->mKdTree->CollectKdObjects(box, objects); 3372 //GetPreprocessor()->mKdTree->CollectSmallKdObjects(box, objects, 0.02f); 3373 3373 3374 3374 } else -
GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbconf.h
r2629 r2634 24 24 25 25 // If we support the use of SSE instructions for ray shooting 26 #define _USE_HAVRAN_SSE26 //#define _USE_HAVRAN_SSE 27 27 28 28 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp
r2629 r2634 6 6 7 7 #define NOMINMAX 8 #ifdef _ _WINDOWS__8 #ifdef _WIN32 9 9 #include <windows.h> 10 10 #ifdef _CRT_SET … … 316 316 // $$matt 317 317 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 } 324 324 325 325 if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger) -
GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro
r2629 r2634 81 81 82 82 LIBS += RTScene.lib RTWorld.lib 83 DEFINES += GTP_INTERNAL 83 DEFINES += GTP_INTERNAL NDEBUG 84 84 INCLUDEPATH += ../MultiLevelRayTracing 85 85 } … … 125 125 Intersectable.cpp TraversalTree.cpp ObjectPvs.cpp ObjectsParser.cpp \ 126 126 FilterBasedDistribution.cpp DifferenceSampling.cpp HavranRayCaster.cpp \ 127 HavranDynRayCaster.cpp OcclusionQuery.cpp 127 HavranDynRayCaster.cpp OcclusionQuery.cpp RandomViewCellsHandler.cpp 128 128 129 129 … … 133 133 SOURCES += havran/allocgo2.cpp havran/ktbai.cpp havran/ktbtrav.cpp \ 134 134 havran/ktb.cpp havran/ktball.cpp havran/sbbox.cpp \ 135 havran/ktb8b.cpp havran/ktbftrav.cpp havran/timer.cpp 135 havran/ktb8b.cpp havran/ktbftrav.cpp havran/timer.cpp havran/ktbs.cpp \ 136 havran/ktbf2trv.cpp 136 137 137 138 -
GTP/trunk/Lib/Vis/Preprocessing/src/run_test2
r2627 r2634 2 2 3 3 4 4 5 #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 "6 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 -preprocessor_ray_cast_method=2 -preprocessor_detect_empty_viewspace-" 6 7 7 8 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" … … 29 30 30 31 SCENE=../data/Arena/arena-high-lods.obj 32 VIEWCELLS=../data/Arena/arena-high-lods-5000-viewcells.xml.gz 31 33 #VIEWCELLS=../data/Arena/viewcells-5000.xml.gz 32 VIEWCELLS=../data/Arena/arena-high-lods-57000-viewcells.xml.gz34 #VIEWCELLS=../data/Arena/arena-high-lods-57000-viewcells.xml.gz 33 35 34 36 … … 57 59 58 60 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 59 -rss_distributions= direction\61 -rss_distributions=mutation+object_direction+spatial \ 60 62 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ -view_cells_filter_width=1.0 \ 61 63 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
Note: See TracChangeset
for help on using the changeset viewer.