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

Timestamp:

08/30/06 21:54:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -29 +29 @@
 int BvhNode::sReservedMailboxes = 1;
 
-
 BvHierarchy *BvHierarchy::BvhSubdivisionCandidate::sBvHierarchy = NULL;
-
 
 
@@ -85 +83 @@
 
 BvhLeaf::BvhLeaf(const AxisAlignedBox3 &bbox):
-BvhNode(bbox)
+BvhNode(bbox), mSubdivisionCandidate(NULL)
 {
 }
@@ -430 +428 @@
 
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-        const float oldRenderCost = 
-                splitCandidate.mParentData.mProbability * (float)leaf->mObjects.size() / viewSpaceVol;
+        const float oldProp = EvalViewCellsVolume(leaf->mObjects);
+        const float oldProp2 = splitCandidate.mParentData.mProbability; //Debug << "here8 " << (oldProp - oldProp2) / viewSpaceVol << "  " << oldProp  / viewSpaceVol << " " << oldProp2  / viewSpaceVol << endl;
+
+        const float oldRenderCost = oldProp * (float)leaf->mObjects.size() / viewSpaceVol;
 
         // compute global decrease in render cost
         float newRenderCost = EvalRenderCost(splitCandidate.mParentData,
-                                                                             splitCandidate.mFrontObjects, 
+                                                                             splitCandidate.mFrontObjects,
                                                                                  splitCandidate.mBackObjects);
 
@@ -445 +445 @@
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
-#if 0
+#if 1
         const float priority = (float)-splitCandidate.mParentData.mDepth;
 #else   
@@ -452 +452 @@
         const float factor = mRenderCostDecreaseWeight;
         const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-
 #endif
 
@@ -476 +475 @@
         return (0
                 || (mBvhStats.Leaves() >= mTermMaxLeaves)
-                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 //|| mOutOfMemory 
                 );
@@ -574 +573 @@
         }
 
-        const float oldRenderCost = tData.mProbability * (float)tData.mNode->mObjects.size();
-        const float newRenderCost = 
-                EvalRenderCost(tData, objectsFront, objectsBack);
+        const float oldProp = EvalViewCellsVolume(tData.mNode->mObjects);
+        //const float oldProp2 = tData.mProbability; Debug << "here65 " << oldProp - oldProp2 << endl;
+
+        const float oldRenderCost = oldProp * (float)tData.mNode->mObjects.size();
+        const float newRenderCost = EvalRenderCost(tData, objectsFront, objectsBack);
 
         const float ratio = newRenderCost / oldRenderCost;
@@ -960 +961 @@
 
         //-- pvs rendering heuristics
-        const float newRenderCost = nObjectsFront * pFront + 
-                                                                nObjectsBack * pBack;
-
+        const float newRenderCost = nObjectsFront * pFront + nObjectsBack * pBack;
+        /*
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-        /*Debug << "\nbvh render cost\n" 
+        Debug << "\nbvh render cost\n" 
                   << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << endl
                   << "new rc: " << newRenderCost / viewSpaceVol << endl;*/
-                 
 
         return newRenderCost;
@@ -1100 +1099 @@
 
         Debug << "collecting " << (int)viewCells.size() << " dirty candidates" << endl;
+
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
@@ -1105 +1105 @@
                 VspLeaf *leaf = vc->mLeaf;
                 SubdivisionCandidate *candidate = leaf->GetSubdivisionCandidate();
+                Debug << "here100 candidate: " << candidate << " type: " << candidate->Type() << endl;
                 
                 dirtyList.push_back(leaf->GetSubdivisionCandidate());
@@ -1301 +1302 @@
 
         // compute bounding box from objects
-        // we assume that root was already created
+        // note: we assume that root was already created
         mBoundingBox = mRoot->GetBoundingBox();
         BvhLeaf *bvhleaf = dynamic_cast<BvhLeaf *>(mRoot);
@@ -1311 +1312 @@
         AssociateObjectsWithRays(sampleRays);
         
-
         // probabilty is voume of all "seen" view cells
 #if 1
@@ -1326 +1326 @@
                 new BvhSubdivisionCandidate(oData);
 
-        //UpdateViewCellsPvs(kdleaf, rays);
-
         EvalSubdivisionCandidate(*oSubdivisionCandidate);
+        bvhleaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();