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

Timestamp:

12/14/06 09:16:08 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -585 +585 @@
 
 
+static float AvgRayContribution(const int pvs, const int nRays)
+{
+        return (float)pvs / (float)nRays;
+}
+
+
 void BvHierarchy::EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitCandidate, 
                                                                                    bool computeSplitPlane)
@@ -591 +597 @@
         {
                 const bool sufficientSamples = 
-                                splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
+                        splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
 
                 const bool useVisibiliyBasedHeuristics = 
@@ -609 +615 @@
                 const int previousMisses = splitCandidate.mParentData.mMaxCostMisses;
 
-                splitCandidate.SetMaxCostMisses(
-                        maxCostRatioViolated ? previousMisses + 1 : previousMisses);
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
+                                                                                previousMisses + 1 : previousMisses);
         }
 
@@ -629 +635 @@
         const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
         splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
-
-        const int numViewCells = CountViewCells(leaf->mObjects);
-
-        const float avgRayContrib = 
-                (float)splitCandidate.mParentData.mNumRays / (float)numViewCells;
-
-        cout << "avgRayContrib: " << avgRayContrib << endl;
+        
 #ifdef GTP_DEBUG
         Debug << "old render cost: " << oldRenderCost << endl;
@@ -642 +642 @@
 #endif
 
-        const float priority = EvalPriority(splitCandidate, 
-                                                                                oldRenderCost, 
-                                                                                renderCostDecr);
-        
+        float priority = EvalPriority(splitCandidate, 
+                                                                  oldRenderCost, 
+                                                                  renderCostDecr);
+        
+        // avg ray contri: this leaf is a pvs entry in all the view cells
+        // that see one of the objects.
+        const int numViewCells = CountViewCells(leaf->mObjects);
+        
+        const float avgRayContri = 
+                AvgRayContribution(numViewCells, splitCandidate.mParentData.mNumRays);
+
+        cout << "avgRayContri: " << avgRayContri << endl;
+
+        // avg ray contri very high. i.e., the result is influenced by undersampling
+        // => decrease priority
+        if (avgRayContri > 99925)
+        {
+                priority /= avgRayContri;
+        }
+
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);