Changeset 1676 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

10/24/06 17:42:03 (18 years ago)

Author:

mattausch

Message:

worked on pvs heuristics

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -251 +251 @@
         Environment::GetSingleton()->GetBoolValue("BvHierarchy.useCostHeuristics", mUseCostHeuristics);
         Environment::GetSingleton()->GetBoolValue("BvHierarchy.useSah", mUseSah);
-        
-        char subdivisionStatsLog[100];
+
+    char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("BvHierarchy.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);
@@ -260 +260 @@
         
         Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useGlobalSorting", mUseGlobalSorting);
+        Environment::GetSingleton()->GetIntValue("BvHierarchy.minRaysForVisibility", mMinRaysForVisibility);
+        
 
         mUseBboxAreaForSah = true;
@@ -283 +285 @@
         Debug << "render cost decrease weight: " << mRenderCostDecreaseWeight << endl;
         Debug << "use global sort: " << mUseGlobalSorting << endl;
+        Debug << "minimal rays for visibility: " << mMinRaysForVisibility << endl;
+
         Debug << endl;
 }
@@ -487 +491 @@
         if (computeSplitPlane)
         {
+                const bool sufficientSamples = splitCandidate.mParentData.mNumRays < mMinRaysForVisibility;
+
+                const bool useVisibiliyBasedHeuristics = 
+                        !mUseSah &&
+                        !(mHierarchyManager->GetViewSpaceSubdivisionType() == HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) &&
+                        sufficientSamples;
+
                 // compute best object partition
                 const float ratio =     SelectObjectPartition(splitCandidate.mParentData, 
                                                                                                   splitCandidate.mFrontObjects, 
-                                                                                                  splitCandidate.mBackObjects);
+                                                                                                  splitCandidate.mBackObjects,
+                                                                                                  useVisibiliyBasedHeuristics);
         
                 // cost ratio violated?
@@ -497 +509 @@
                 const int previousMisses = splitCandidate.mParentData.mMaxCostMisses;
 
-                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
-                                                                                previousMisses + 1 : previousMisses);
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? previousMisses + 1 : previousMisses);
 
         }
@@ -1218 +1229 @@
 float BvHierarchy::SelectObjectPartition(const BvhTraversalData &tData,
                                                                                  ObjectContainer &frontObjects,
-                                                                                 ObjectContainer &backObjects)
+                                                                                 ObjectContainer &backObjects,
+                                                                                 bool useVisibilityBasedHeuristics)
 {
         ObjectContainer nFrontObjects[3];
@@ -1245 +1257 @@
                 //-- split objects using heuristics
                                 
-                                if (!mUseSah &&
-                                        (mHierarchyManager->GetViewSpaceSubdivisionType() == 
-                                        HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV))
+                                if (useVisibilityBasedHeuristics)
                                 {
                                         ///////////