Changeset 1643 for GTP/trunk/Lib/Vis
- Timestamp:
- 10/19/06 04:29:00 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.env
r1642 r1643 188 188 Termination { 189 189 minPvs 0 190 maxViewCells 1000190 maxViewCells 500000 191 191 } 192 192 … … 208 208 209 209 Termination { 210 maxLeaves 1000210 maxLeaves 500000 211 211 } 212 212 -
GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh
r1642 r1643 79 79 # mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl 80 80 81 METHOD=multilevel 81 # METHOD=multilevel 82 # echo "$SCENE $METHOD" 83 84 # $PROGRAM $ENVIRONMENT \ 85 # -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 86 # -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 87 # -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 88 # -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 89 # -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 90 # -hierarchy_construction_type=2 \ 91 # -hierarchy_construction_multilevel=true \ 92 # -hierarchy_construction_samples=20000 \ 93 # -hierarchy_term_max_leaves=500 \ 94 # -hierarchy_construction_levels=1 \ 95 # -hierarchy_construction_recompute_split_on_repair=true 96 97 # mv debug.log $LOG_PREFIX-$METHOD-debug.log 98 # mv view_cells.wrl $LOG_PREFIX-$METHOD-view_cells.wrl 99 # mv final_object_partition.wrl $LOG_PREFIX-$METHOD-final_object_partition.wrl 100 # mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl 101 102 # METHOD=sequential 103 # echo "$SCENE $METHOD" 104 105 # $PROGRAM $ENVIRONMENT \ 106 # -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 107 # -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 108 # -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 109 # -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 110 # -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 111 # -hierarchy_construction_type=0 \ 112 # -bvh_term_max_leaves=500 113 114 # mv debug.log $LOG_PREFIX-$METHOD-debug.log 115 # mv view_cells.wrl $LOG_PREFIX-$METHOD-view_cells.wrl 116 # mv final_object_partition.wrl $LOG_PREFIX-$METHOD-final_object_partition.wrl 117 # mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl 118 119 METHOD=gradient_simplesplit 82 120 echo "$SCENE $METHOD" 83 121 … … 87 125 -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 88 126 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 127 -bvh_use_sah=true \ 128 -vsp_use_cost_heuristics=false \ 89 129 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 90 130 -hierarchy_construction_type=2 \ 91 -hierarchy_construction_multilevel=true \92 -hierarchy_construction_samples=20000 \93 -hierarchy_term_max_leaves=500 \94 -hierarchy_construction_levels=1 \95 131 -hierarchy_construction_recompute_split_on_repair=true 96 132 -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp
r1640 r1643 221 221 222 222 223 //////////////////////////////////// /////////////////////////223 //////////////////////////////////// 224 224 //-- termination criteria for autopartition 225 225 226 Environment::GetSingleton()->GetIntValue("BvHierarchy.Termination.maxDepth", mTermMaxDepth); 226 227 Environment::GetSingleton()->GetIntValue("BvHierarchy.Termination.maxLeaves", mTermMaxLeaves); … … 249 250 Environment::GetSingleton()->GetFloatValue("BvHierarchy.maxStaticMemory", mMaxMemory); 250 251 Environment::GetSingleton()->GetBoolValue("BvHierarchy.useCostHeuristics", mUseCostHeuristics); 251 252 Environment::GetSingleton()->GetBoolValue("BvHierarchy.useSah", mUseSah); 253 252 254 char subdivisionStatsLog[100]; 253 255 Environment::GetSingleton()->GetStringValue("BvHierarchy.subdivisionStats", subdivisionStatsLog); … … 1246 1248 //-- split objects using heuristics 1247 1249 1248 if (mHierarchyManager->GetViewSpaceSubdivisionType() == 1249 HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) 1250 if (!mUseSah && 1251 (mHierarchyManager->GetViewSpaceSubdivisionType() == 1252 HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV)) 1250 1253 { 1251 1254 /////////// -
GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h
r1640 r1643 870 870 //-- split heuristics based parameters 871 871 872 bool mUseCostHeuristics; 873 /// balancing factor for PVS criterium 872 /// if a heuristics should be used for finding a split plane 873 bool mUseCostHeuristics; 874 /// if sah heuristcs should be used for finding a split plane 875 bool mUseSah; 876 /// balancing factor for PVS criterium 874 877 float mCtDivCi; 875 878 /// if only driving axis should be used for split -
GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp
r1642 r1643 2445 2445 "true"); 2446 2446 2447 2448 RegisterOption("BvHierarchy.useSah", 2449 optBool, 2450 "bvh_use_sah=", 2451 "false"); 2452 2447 2453 RegisterOption("BvHierarchy.subdivisionStats", 2448 2454 optString, -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r1642 r1643 1101 1101 1102 1102 // subdivide object space first 1103 SubdivisionCandidate *ospVc = ResetObjectSpaceSubdivision(sampleRays, objects); 1103 SubdivisionCandidate *ospVc = 1104 ResetObjectSpaceSubdivision(sampleRays, objects); 1104 1105 mTQueue.Push(ospVc); 1105 1106 … … 1120 1121 // subdivide view space with respect to the objects 1121 1122 1122 SubdivisionCandidate *vspVc = ResetViewSpaceSubdivision(sampleRays, objects, forcedViewSpace); 1123 SubdivisionCandidate *vspVc = 1124 ResetViewSpaceSubdivision(sampleRays, objects, forcedViewSpace); 1123 1125 mTQueue.Push(vspVc); 1124 1126
Note: See TracChangeset
for help on using the changeset viewer.