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

Timestamp:

12/20/06 00:26:02 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -381 +381 @@
         const BvhTraversalData &tData = sc.mParentData;
         BvhLeaf *leaf = tData.mNode;
+
         AxisAlignedBox3 parentBox = leaf->GetBoundingBox();
 
@@ -424 +425 @@
 
         ////////////////////////////////////////
-        //-- fill  front and back traversal data with the new values
+        //-- fill front and back traversal data with the new values
 
         frontData.mDepth = backData.mDepth = tData.mDepth + 1;
@@ -442 +443 @@
         AssociateObjectsWithLeaf(front);
    
-#if PROBABILIY_IS_BV_VOLUME
-        // volume of bvh (= probability that this bvh can be seen)
-        frontData.mProbability = fbox.GetVolume();
-        backData.mProbability = bbox.GetVolume();
-#else
+        //-- compute pvs correction to cope with undersampling
+        frontData.mPvs = CountViewCells(front->mObjects);
+        backData.mPvs = CountViewCells(back->mObjects);
+
+        frontData.mCorrectedPvs = sc.mCorrectedFrontPvs;
+        backData.mCorrectedPvs = sc.mCorrectedBackPvs;
+
         // compute probability of this node being visible, 
         // i.e., volume of the view cells that can see this node
-        frontData.mProbability = EvalViewCellsVolume(sc.mFrontObjects);
-        backData.mProbability = EvalViewCellsVolume(sc.mBackObjects);
-#endif
+        frontData.mRenderCost = EvalRenderCost(sc.mFrontObjects);
+        backData.mRenderCost = EvalRenderCost(sc.mBackObjects);
+
+        frontData.mCorrectedRenderCost = sc.mCorrectedFrontCost;
+        backData.mCorrectedRenderCost = sc.mCorrectedBackCost;
 
     // how often was max cost ratio missed in this branch?
         frontData.mMaxCostMisses = sc.GetMaxCostMisses();
         backData.mMaxCostMisses = sc.GetMaxCostMisses();
-        
+
         // set the time stamp so the order of traversal can be reconstructed
         node->SetTimeStamp(mHierarchyManager->mTimeStamp ++);
@@ -619 +624 @@
         }
 
-        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 BvhTraversalData &tData = splitCandidate.mParentData;
+        BvhLeaf *leaf = tData.mNode;
+
+        // avg contribution of a ray to a pvs
+        const float pvs = CountViewCells(leaf->mObjects);
+        const float avgRayContri = AvgRayContribution(pvs, tData.mNumRays);
+
+        cout << "bvh avg ray contri: " << avgRayContri << endl;
+        // high avg ray contri, the result is influenced by undersampling
+        splitCandidate.SetAvgRayContribution(avgRayContri);
+
         const float oldRenderCost = EvalRenderCost(leaf->mObjects);
+        const float oldRatio = oldRenderCost / tData.mRenderCost;
+        const float parentCost = tData.mCorrectedRenderCost * oldRatio;
+
+        cout << "old ratio: " << oldRatio << endl;
+        // this leaf is a pvs entry in all the view cells
+        // that see one of the objects.
+        const int frontCost = EvalRenderCost(splitCandidate.mFrontObjects);
+        const int backCost = EvalRenderCost(splitCandidate.mBackObjects);
+
+        cout <<"here8 ============ "<< parentCost << endl;
+        splitCandidate.mCorrectedFrontCost = 
+                mHierarchyManager->EvalCorrectedPvs(frontCost, parentCost, avgRayContri);
+
+        cout << "bvh front cost: " << frontCost << " corrected: " << splitCandidate.mCorrectedFrontCost << endl;
+        cout <<"here104 "<< endl;
+
+        splitCandidate.mCorrectedBackCost = 
+                mHierarchyManager->EvalCorrectedPvs(backCost, parentCost, avgRayContri);
+        
+        cout << "back cost: " << backCost << " corrected: " << splitCandidate.mCorrectedBackCost << endl;
 
         // compute global decrease in render cost
-        const float newRenderCost = EvalRenderCost(splitCandidate.mFrontObjects) +
-                                                                EvalRenderCost(splitCandidate.mBackObjects);
-
-        const float renderCostDecr = oldRenderCost - newRenderCost;
+        const float newRenderCost = 
+                splitCandidate.mCorrectedFrontCost + splitCandidate.mCorrectedBackCost;
+        const float renderCostDecr = parentCost - newRenderCost;
         
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
         // increase in pvs entries
-        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate);
+        const int pvsEntriesIncr = EvalPvsEntriesIncr(splitCandidate, avgRayContri);
         splitCandidate.SetPvsEntriesIncr(pvsEntriesIncr);
         
@@ -666 +683 @@
 
 
-int BvHierarchy::EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate) const
+int BvHierarchy::EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, 
+                                                                        const float avgRayContri) const
 {
         const int oldPvsSize = CountViewCells(splitCandidate.mParentData.mNode->mObjects);
-        
-        const int fPvsSize = CountViewCells(splitCandidate.mFrontObjects);
-        const int bPvsSize = CountViewCells(splitCandidate.mBackObjects);
-
-        return fPvsSize + bPvsSize - oldPvsSize;
+        const float oldPvsRatio = splitCandidate.mParentData.mPvs > 0 ? oldPvsSize / splitCandidate.mParentData.mPvs : 1;
+
+        const float parentPvs = splitCandidate.mParentData.mCorrectedPvs * oldPvsRatio;
+
+        const int frontViewCells = CountViewCells(splitCandidate.mFrontObjects);
+        const int backViewCells = CountViewCells(splitCandidate.mBackObjects);
+        
+        cout <<"here105 " << splitCandidate.mParentData.mCorrectedPvs << endl;
+        cout <<"here106 " << oldPvsRatio << endl;
+
+        splitCandidate.mCorrectedFrontPvs = 
+                mHierarchyManager->EvalCorrectedPvs(frontViewCells, parentPvs, avgRayContri);
+        splitCandidate.mCorrectedBackPvs =
+                mHierarchyManager->EvalCorrectedPvs(backViewCells, parentPvs, avgRayContri);
+
+        return splitCandidate.mCorrectedFrontPvs + splitCandidate.mCorrectedBackPvs - parentPvs;
 }
 
@@ -730 +759 @@
 
         
-        if (data.mProbability <= mTermMinProbability)
+        /*if (data.mProbability <= mTermMinProbability)
         {
                 ++ mBvhStats.minProbabilityNodes;
-        }
+        }*/
 
         ////////////////////////////////////////////
@@ -2167 +2196 @@
         // create bvh traversal data
         BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
-
+        
         // create sorted object lists for the first data
         if (mUseGlobalSorting)
@@ -2178 +2207 @@
         //-- add first candidate for object space partition     
 
+        mTotalCost = EvalRenderCost(objects);
+        mPvsEntries = CountViewCells(objects);
+
+        oData.mCorrectedPvs = oData.mPvs = mPvsEntries;
+        oData.mCorrectedRenderCost = oData.mRenderCost = mTotalCost;
+        cout << "here52 " << oData.mCorrectedPvs << " " << oData.mRenderCost << " " << oData.mCorrectedRenderCost << endl;
+
+
         BvhSubdivisionCandidate *oSubdivisionCandidate = 
                 new BvhSubdivisionCandidate(oData);
 
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
-
-        mTotalCost = EvalRenderCost(objects);
-        mPvsEntries = CountViewCells(objects);
 
         if (mApplyInitialPartition)