Changeset 1893 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• VspTree.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);

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

@@ -284 +284 @@
 
 
-float HierarchyManager::AvgRayContribution(const float pvs, const float rays) const
-{
-        return (float)pvs / rays;
-}
-
-
 void HierarchyManager::EvalSubdivisionStats()
 {

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

@@ -265 +265 @@
   
         Intersectable *GetIntersectable(Intersectable *obj, const Vector3 &point) const;
-  
-        float AvgRayContribution(const float pvs, const float rays) const;
 
         /** Export object space partition bounding boxes.

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

@@ -827 +827 @@
                 const int maxCostMisses = splitCandidate.mParentData.mMaxCostMisses;
                 // max cost threshold violated?
-                splitCandidate.SetMaxCostMisses(maxCostRatioViolated  ? maxCostMisses + 1: maxCostMisses);
+                splitCandidate.SetMaxCostMisses(maxCostRatioViolated ? 
+                                                                                maxCostMisses + 1: maxCostMisses);
         }
         
@@ -848 +849 @@
         const float factor = mRenderCostDecreaseWeight;
 
-        float priority;
-
-        if (1)
-        {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                if (mHierarchyManager->mConsiderMemory)
-                {
-                        priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
-                }
-        }
-        else
-        {
-                if (!mHierarchyManager->mConsiderMemory)
-                {
-                        priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                }
-                else
-                {
-                        const float ratio = 
-                                renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
-
-                        priority = factor * ratio + (1.0f - factor) * oldRenderCost;
-                }
+        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+
+        if (mHierarchyManager->mConsiderMemory)
+        {
+                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
+        }
+
+        /////////////
+        // avg ray contri
+
+        const float avgRayContri = splitCandidate.mParentData.GetAvgRayContribution();
+        cout << "vsp avgRayContri: " << avgRayContri << endl;
+
+        // avg ray contri very high. i.e., the result is influenced by undersampling
+        // => decrease priority
+        if (avgRayContri > 99925)
+        {
+                priority /= avgRayContri;
         }
 
@@ -1869 +1865 @@
         VspLeaf *leaf = dynamic_cast<VspLeaf *>(data.mNode);
 
-
         if (data.mPvs > mVspStats.maxPvs)
         {
@@ -1885 +1880 @@
         {
         ++ mVspStats.maxDepthNodes;
-                //Debug << "new max depth: " << mVspStats.maxDepthNodes << endl;
         }
 
@@ -1908 +1902 @@
         ++ mCreatedViewCells;
 
-#ifdef GTPGTP_DEBUG
+#ifdef GTP_DEBUG
         Debug << "BSP stats: "
                   << "Depth: " << data.mDepth << " (max: " << mTermMaxDepth << "), "