Changeset 1643 for GTP/trunk/Lib/Vis/Preprocessing/src
- Timestamp:
- 10/19/06 04:29:00 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
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.