Changeset 1914 for GTP/trunk

Timestamp:

12/20/06 12:44:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -504 +504 @@
                 // decrease the weighted average cost of the subdivisoin
                 mTotalCost -= sc->GetRenderCostDecrease();
+                cout << "))))))))))))) " << sc->GetRenderCostDecrease() << endl;
                 mPvsEntries += sc->GetPvsEntriesIncr();
 
@@ -649 +650 @@
         const float backVol = EvalViewCellsVolume(splitCandidate.mBackObjects) / GetViewSpaceVolume();
 
-        cout <<"here8 "<< parentVol << " " << " old ratio: " << oldRatio << " frointvol: " << frontVol << endl;
+        cout <<"here8 "<< parentVol << " " << " old vol: " << oldVolume << " frontvol: " << frontVol << endl;
         splitCandidate.mCorrectedFrontVolume = 
                 mHierarchyManager->EvalCorrectedPvs(frontVol, parentVol, avgRayContri);
@@ -663 +664 @@
         const float relfrontCost = splitCandidate.mCorrectedFrontVolume * 
                 EvalAbsCost(splitCandidate.mFrontObjects);
-        const float relBackCost =  splitCandidate.mCorrectedFrontVolume * 
+        const float relBackCost =  splitCandidate.mCorrectedBackVolume * 
                 EvalAbsCost(splitCandidate.mBackObjects);
         const float relParentCost = parentVol * 
@@ -2198 +2199 @@
         BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
 
-        // probability that volume is "seen" from the view cells
-        const float prop = EvalViewCellsVolume(objects) / GetViewSpaceVolume();
-
         // only rays intersecting objects in node are interesting
         const int nRays = AssociateObjectsWithRays(sampleRays);
         //cout << "using " << nRays << " of " << (int)sampleRays.size() << " rays" << endl;
 
+        // probability that volume is "seen" from the view cells
+        const float prop = EvalViewCellsVolume(objects) / GetViewSpaceVolume();
+
         // create bvh traversal data
         BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
@@ -2223 +2224 @@
         oData.mCorrectedPvs = oData.mPvs = (float)mPvsEntries;
         oData.mCorrectedVolume = oData.mVolume = prop;
-        cout << "here52 " << oData.mCorrectedPvs << " " << oData.mVolume << " " << oData.mCorrectedVolume  << endl;
+        cout << "here52 " << oData.mCorrectedPvs << " " << oData.mVolume << " " << oData.mCorrectedVolume  << " prop: " << prop << endl;
 
         BvhSubdivisionCandidate *oSubdivisionCandidate = 
@@ -2361 +2362 @@
         mRoot = bvhleaf;
         
-#if PROBABILIY_IS_BV_VOLUME
-        mTermMinProbability *= mBoundingBox.GetVolume();
-        // probability that bounding volume is seen
-        const float prop = GetBoundingBox().GetVolume();
-#else
-        mTermMinProbability *= mVspTree->GetBoundingBox().GetVolume();
+        //mTermMinProbability *= mVspTree->GetBoundingBox().GetVolume();
         // probability that volume is "seen" from the view cells
+        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
         const float prop = EvalViewCellsVolume(objects);
-#endif
 
         const int nRays = CountRays(objects);
@@ -2389 +2385 @@
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
-        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
-        mTotalCost = (float)objects.size() * prop / viewSpaceVol;
+        mTotalCost = (float)objects.size() * prop;
 
         PrintSubdivisionStats(*oSubdivisionCandidate);