Changeset 1911 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

12/19/06 11:09:01 (18 years ago)

Author:

mattausch

Message:

added support for pvs correction (warning: does not yet compile)

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (3 diffs)
• HierarchyManager.cpp (modified) (2 diffs)
• HierarchyManager.h (modified) (6 diffs)
• VspTree.cpp (modified) (3 diffs)

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

@@ -621 +621 @@
         BvhLeaf *leaf = splitCandidate.mParentData.mNode;
 
+        if (USE_AVGRAYCONTRI)
+        {
+                // this leaf is a pvs entry in all the view cells
+                // that see one of the objects.
+                const int pvs = CountViewCells(leaf->mObjects);
+                //const int pvs = (int)leaf->mObjects.size();
+        
+                // avg contribution of a ray to a pvs
+                const float avgRayContri = 
+                        AvgRayContribution(pvs, splitCandidate.mParentData.mNumRays);
+
+                // high avg ray contri, the result is influenced by undersampling
+                splitCandidate.SetAvgRayContri(avgRayContri);
+        }
+
         const float oldProp = EvalViewCellsVolume(leaf->mObjects);
         const float oldRenderCost = EvalRenderCost(leaf->mObjects);
-                
+
         // compute global decrease in render cost
         const float newRenderCost = EvalRenderCost(splitCandidate.mFrontObjects) +
@@ -645 +660 @@
                                                                   renderCostDecr,
                                                                   oldRenderCost);
-        
-        if (USE_AVGRAYCONTRI)
-        {
-                // this leaf is a pvs entry in all the view cells
-                // that see one of the objects.
-                const int pvs = CountViewCells(leaf->mObjects);
-                //const int pvs = (int)leaf->mObjects.size();
-        
-                // avg contribution of a ray to a pvs
-                const float avgRayContri = 
-                        AvgRayContribution(pvs, splitCandidate.mParentData.mNumRays);
-
-                // high avg ray contri, the result is influenced by undersampling
-                // => decrease priority
-                if (0 && (avgRayContri > mHierarchyManager->mMaxAvgRayContri))
-                {
-                        const float factor = 1.0f + avgRayContri - mHierarchyManager->mMaxAvgRayContri;
-                        priority /= factor;
-                }
-
-                //splitCandidate.SetAvgRayContri(avgRayContri);
-        }
 
         // compute global decrease in render cost
@@ -1706 +1699 @@
         ////////////////
         //-- surface area heuristics
+
         if (leaf->mObjects.empty())
                 return 0.0f;

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

@@ -734 +734 @@
 
 
+float HierarchyManager::EvalPvsCorrectionFactor(const float childPvs, 
+                                                                                                const float totalPvs, 
+                                                                                                const float avgRayContri) const
+{
+        if (!childPvs ||
+                // assume pvs sampled sufficiently => take child pvs
+                (avgRayContri < mMinAvgRayContri))
+                return 1.0f;
+
+        // assume pvs not sampled sufficiently => take total pvs
+        if (avgRayContri > mMaxAvgRayContri)
+                return totalPvs / childPvs;
+
+        const float factor = 
+                        (mMaxAvgRayContri - avgRayContri) / 
+                        (mMaxAvgRayContri - mMinAvgRayContri);
+
+        const float newPvs = factor * childPvs + (1.0f - factor) * totalPvs;    
+        
+        return newPvs / childPvs;
+}
+
+
 bool HierarchyManager::ApplySubdivisionCandidate(SubdivisionCandidate *sc, 
                                                                                                  SplitQueue &splitQueue,
@@ -780 +803 @@
         // high avg ray contri, the result is influenced by undersampling
         // => decrease priority
-        if (USE_AVGRAYCONTRI && (sc->GetAvgRayContribution() > mMaxAvgRayContri))
+        if (0 && USE_AVGRAYCONTRI && (sc->GetAvgRayContribution() > mMaxAvgRayContri))
         {
                 const float factor = 1.0f + sc->GetAvgRayContribution() - mMaxAvgRayContri;

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h

@@ -46 +46 @@
 #define COUNT_ORIGIN_OBJECTS 1
 #define USE_AVGRAYCONTRI 1
+
+
 /** View space / object space hierarchy statistics.
 */
@@ -294 +296 @@
         void CreateUniqueObjectIds();
 
-
-        float mInitialRenderCost;
+        float EvalPvsCorrectionFactor(const float pvsFront, 
+                                                                  const float totalPvs,
+                                                                  const float avgRayContri) const;
 
 
@@ -534 +537 @@
 
 
-
 protected:
 
@@ -563 +565 @@
         // the original vsp type
         int mSavedViewSpaceSubdivisionType;
-        /// the current subdivision candidate
-        //SubdivisionCandidate *mCurrentCandidate;
-
+        
 
         ///////////////////
@@ -575 +575 @@
         OspTree *mOspTree;
 
+        float mInitialRenderCost;
+        
+        float mMaxAvgRayContri;
+
+        float mMinAvgRayContri;
+
         // quick hack:
 public:
@@ -580 +586 @@
         BvHierarchy *mBvHierarchy;
         
-        float mMaxAvgRayContri;
-
 protected:
 

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

@@ -863 +863 @@
         {
                 const int pvs = EvalPvsEntriesSize(*splitCandidate.mParentData.mRays);
+
                 const float avgRayContri = (float)pvs / 
                         ((float)splitCandidate.mParentData.mRays->size() + Limits::Small);
-
-                // high avg ray contri very, the result is influenced by undersampling
-                // => decrease priority
-                if (0 && (avgRayContri > mHierarchyManager->mMaxAvgRayContri))
-                {
-                        const float factor = 1.0f + avgRayContri - mHierarchyManager->mMaxAvgRayContri;
-                        priority /= factor;
-                }
 
                 splitCandidate.SetAvgRayContribution(avgRayContri);
@@ -1527 +1520 @@
 
 float VspTree::EvalRenderCostDecrease(const AxisAlignedPlane &candidatePlane,
-                                                                          const VspTraversalData &data,
-                                                                          float &normalizedOldRenderCost) const
+                                                                          const VspTraversalData &tData,
+                                                                          float &normalizedOldRenderCost,
+                                                                          const float avgRayContri) const
 {
         float pvsFront = 0;
@@ -1582 +1576 @@
         ///////////////////
         //-- evaluate render cost heuristics
-
+#if 0
         const float penaltyOld = totalPvs;
+
     const float penaltyFront = pvsFront;
         const float penaltyBack = pvsBack;
-                        
+#else
+        const float penaltyOld = totalPvs * tData.mPvsCorrectionFactor;
+
+        const float frontCorr = mHierarchyManager->EvalPvsCorrectionFactor(pvsFront, penaltyOld, avgRayContri);
+        const float backCorr = mHierarchyManager->EvalPvsCorrectionFactor(pvsBack, penaltyOld, avgRayContri);
+
+        const float penaltyFront = frontCorr;
+        const float penaltyBack = pvsBack * backCorr;;
+#endif
+
         const float oldRenderCost = pOverall * penaltyOld;
         const float newRenderCost = penaltyFront * pFront + penaltyBack * pBack;