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

Timestamp:

03/11/07 02:17:58 (17 years ago)

Author:

mattausch

Message:

added render cost bound for objects, improved undersampling compensation

File:

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

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

@@ -634 +634 @@
 
 
+static float AvgRaysPerObject(const int pvs, const int nRays)
+{
+        return (float)nRays / ((float)pvs + Limits::Small);
+}
+
+
 void BvHierarchy::EvalSubdivisionCandidate(BvhSubdivisionCandidate &splitCandidate, 
                                                                                    const bool computeSplitPlane,
@@ -689 +695 @@
         // avg contribution of a ray to a pvs
         const float pvs = (float)CountViewCells(*tData.mSampledObjects);
-        const float avgRayContri = AvgRayContribution((int)pvs, tData.mNumRays);
+        //const float avgRayContri = AvgRayContribution((int)pvs, tData.mNumRays);
+        const float avgRaysPerObject = AvgRaysPerObject((int)pvs, tData.mNumRays);
 
         // high avg ray contri, the result is influenced by undersampling
-        splitCandidate.SetAvgRayContribution(avgRayContri);
+        splitCandidate.SetAvgRaysPerObject(avgRaysPerObject);
         const float viewSpaceVol = GetViewSpaceVolume();
 
@@ -699 +706 @@
         const float parentVol = tData.mCorrectedVolume * oldRatio;
 
+        //cout << "h " << avgRaysPerObject << " ";
         // this leaf is a pvs entry in all the view cells
         // that see one of the objects.
@@ -708 +716 @@
 
         splitCandidate.mCorrectedFrontVolume = 
-                mHierarchyManager->EvalCorrectedPvs(splitCandidate.mVolumeFrontViewCells, parentVol, avgRayContri);
+                mHierarchyManager->EvalCorrectedPvs(splitCandidate.mVolumeFrontViewCells, parentVol, avgRaysPerObject);
         
         splitCandidate.mCorrectedBackVolume = 
-                mHierarchyManager->EvalCorrectedPvs(splitCandidate.mVolumeBackViewCells, parentVol, avgRayContri);
+                mHierarchyManager->EvalCorrectedPvs(splitCandidate.mVolumeBackViewCells, parentVol, avgRaysPerObject);
         
         const float relfrontCost = splitCandidate.mCorrectedFrontVolume * 
@@ -727 +735 @@
         // increase in pvs entries
         const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate, 
-                                                                                                  avgRayContri, 
+                                                                                                  avgRaysPerObject, 
                                                                                                   (int)pvs, 
                                                                                                   splitCandidate.mNumFrontViewCells, 
@@ -737 +745 @@
         {
                 cout << "bvh volume cost"
-                 << " avg ray contri: " << avgRayContri << " ratio: " << oldRatio 
+                 << " avg rays per object: " << avgRaysPerObject << " ratio: " << oldRatio 
                  << " parent: " << parentVol << " old vol: " << oldVolume 
                  << " frontvol: " << splitCandidate.mVolumeFrontViewCells << " corr. " << splitCandidate.mCorrectedFrontVolume 
@@ -766 +774 @@
 
 int BvHierarchy::EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, 
-                                                                        const float avgRayContri,
+                                                                        const float avgRaysPerObjects,
                                                                         const int numParentViewCells,
                                                                         const int numFrontViewCells,
@@ -780 +788 @@
         
         splitCandidate.mCorrectedFrontPvs = 
-                mHierarchyManager->EvalCorrectedPvs((float)frontViewCells, parentPvs, avgRayContri);
+                mHierarchyManager->EvalCorrectedPvs((float)frontViewCells, parentPvs, avgRaysPerObjects);
         splitCandidate.mCorrectedBackPvs =
-                mHierarchyManager->EvalCorrectedPvs((float)backViewCells, parentPvs, avgRayContri);
+                mHierarchyManager->EvalCorrectedPvs((float)backViewCells, parentPvs, avgRaysPerObjects);
 
         if (0)
         cout << "bvh pvs"
-                 << " avg ray contri: " << avgRayContri << " ratio: " << oldPvsRatio 
+                 << " avg ray contri: " << avgRaysPerObjects << " ratio: " << oldPvsRatio 
                  << " parent: " << parentPvs << " " << " old vol: " << oldPvsSize
                  << " frontpvs: " << frontViewCells << " corr. " << splitCandidate.mCorrectedFrontPvs 
@@ -1014 +1022 @@
 #endif
 
-#if 1
 
 float BvHierarchy::EvalSah(const BvhTraversalData &tData,
@@ -1111 +1118 @@
                 ar = rbox.SurfaceArea();
 
+#if BOUND_RENDERCOST
                 const float sum = noValidSplit ? 1e25f : objectsLeft * al + objectsRight * ar;
-      
+#else
+                const float rcLeft = std::max(objectsLeft, MIN_RENDERCOST);
+                const float rcRight = std::max(objectsRight, MIN_RENDERCOST);
+
+                const float sum = noValidSplit ? 1e25f : objectsLeft * al + objectsRight * ar;
+
+#endif
                 /*cout << "pos=" << (*cit).mPos << "\t q=(" << objectsLeft << "," << objectsRight <<")\t r=(" 
                          << lbox.SurfaceArea() << "," << rbox.SurfaceArea() << ")" << endl;
@@ -1153 +1167 @@
 }
 
-#else
-
-float BvHierarchy::EvalSah(const BvhTraversalData &tData,
-                                                   const int axis,
-                                                   ObjectContainer &objectsFront,
-                                                   ObjectContainer &objectsBack)
+
+
+float BvHierarchy::EvalSahWithTigherBbox(const BvhTraversalData &tData,
+                                                                                 const int axis,
+                                                                                 ObjectContainer &objectsFront,
+                                                                                 ObjectContainer &objectsBack)
 {
         // go through the lists, count the number of objects left and right
@@ -1294 +1308 @@
 }
 
-#endif
 
 static bool PrepareOutput(const int axis,
@@ -1423 +1436 @@
                 const bool noValidSplit = (nObjectsRight <= Limits::Small);
 
+#if BOUND_RENDERCOST
                 // the heuristics
             const float sum = noValidSplit ? 
                         1e25f : volLeft * (float)nObjectsLeft + volRight * (float)nObjectsRight;
-
+#else
+                const float rcLeft = max(nObjectsLeft, MIN_RENDERCOST);
+                const float rcRight = max(nObjectsRight, MIN_RENDERCOST);
+
+                // the heuristics
+            const float sum = noValidSplit ? 
+                        1e25f : volLeft * (float)rcLeft + volRight * (float)rcRight;
+
+#endif
+                
 #ifdef GTP_DEBUG
                 if (printStats)
@@ -1842 +1865 @@
 float BvHierarchy::EvalAbsCost(const ObjectContainer &objects)
 {
+        float result;
 #if USE_BETTER_RENDERCOST_EST
         ObjectContainer::const_iterator oit, oit_end = objects.end();
@@ -1847 +1871 @@
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
-                objRenderCost += ViewCellsManager::GetRendercost(*oit);
+                result += ViewCellsManager::GetRendercost(*oit);
         }
 #else
-        return (float)objects.size();
+        result = (float)objects.size();
 #endif
+
+#if BOUND_RENDERCOST
+        result = max(result, MIN_RENDERCOST);
+#endif
+
+        return result;
 }
 
@@ -1875 +1905 @@
         ///////////////
         //-- render cost heuristics
+
         const float objRenderCost = EvalAbsCost(objects);