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

Timestamp:

08/29/06 17:34:19 (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

@@ -213 +213 @@
         Environment::GetSingleton()->GetFloatValue("BvHierarchy.Termination.minGlobalCostRatio",
                 mTermMinGlobalCostRatio);
-        Environment::GetSingleton()->GetIntValue("BvHierarchy.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
+        Environment::GetSingleton()->GetIntValue("BvHierarchy.Termination.globalCostMissTolerance", 
+                mTermGlobalCostMissTolerance);
 
         //-- factors for bsp tree split plane heuristics
@@ -285 +286 @@
         // add the new nodes to the tree
         BvhInterior *node = new BvhInterior(tData.mBoundingBox, leaf->GetParent());
-        //cout << "bbox: " << tData.mBoundingBox << endl;
-
+        
 
         //-- the front and back traversal data is filled with the new values
@@ -292 +292 @@
         frontData.mDepth = backData.mDepth = tData.mDepth + 1;
 
-        frontData.mBoundingBox = ComputeBoundingBox(frontObjects, &(tData.mBoundingBox));
-        backData.mBoundingBox = ComputeBoundingBox(backObjects, &(tData.mBoundingBox));
+        frontData.mBoundingBox = ComputeBoundingBox(frontObjects, &tData.mBoundingBox);
+        backData.mBoundingBox = ComputeBoundingBox(backObjects, &tData.mBoundingBox);
         
         /////////////
@@ -354 +354 @@
         if (!LocalTerminationCriteriaMet(tData) && !globalCriteriaMet)
         {       
+                //-- continue subdivision
+
                 BvhTraversalData tFrontData;
                 BvhTraversalData tBackData;
-
-                //-- continue subdivision
-                
+                        
                 // create new interior node and two leaf node
                 newNode = SubdivideNode(sc->mFrontObjects,
@@ -392 +392 @@
 
                 // delete old leaf node
-                DEL_PTR(tData.mNode);
+                //DEL_PTR(tData.mNode);
         }
 
@@ -409 +409 @@
                         CollectRays(leaf->mObjects, leaf->mVssRays);
                 }
-        }
-        
-        tData.Clear(); // cleanup
+
+                // detach node so it won't get deleted
+                tData.mNode = NULL;
+        }
         
         return newNode;
@@ -447 +448 @@
         const float renderCostDecr = oldRenderCost - newRenderCost;
 
-        //Debug << "render cost decr: " << renderCostDecr << endl;
+        Debug << "\nbvh render cost decr: " << renderCostDecr << endl;
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
-#if 0
-        const float priority = (float)-data.mDepth;
+#if 1
+        const float priority = (float)-splitCandidate.mParentData.mDepth;
 #else   
         // take render cost of node into account 
@@ -469 +470 @@
         // matt: TODO
         return ( 0
-                || (data.mNode->mObjects.size() < mTermMinObjects)
-                || (data.mProbability <= mTermMinProbability)
-                || (data.mDepth >= mTermMaxDepth)
+                //|| ((int)data.mNode->mObjects.size() < mTermMinObjects)
+                //|| (data.mProbability <= mTermMinProbability)
+                //|| (data.mDepth >= mTermMaxDepth)
                  );
 }
@@ -536 +537 @@
                 AxisAlignedBox3 box = obj->GetBox();
 
-                const float objMid = (box.Max(axis) + box.Min(axis)) * 0.5;
+                const float objMid = (box.Max(axis) + box.Min(axis)) * 0.5f;
 
                 // object mailed => belongs to back objects
@@ -936 +937 @@
 
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-        Debug << "\n***** eval render cost *********\n" 
+        /*Debug << "\nbvh render cost\n" 
                   << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << endl
-                  << "new rc: " << newRenderCost / viewSpaceVol << endl;
+                  << "new rc: " << newRenderCost / viewSpaceVol << endl;*/
                  
 
@@ -1319 +1320 @@
 }
 
+void BvHierarchy::CreateRoot(const ObjectContainer &objects)
+{
+        //-- create new root
+        AxisAlignedBox3 box = ComputeBoundingBox(objects);
+        BvhLeaf *bvhleaf = new BvhLeaf(box, NULL, (int)objects.size());
+        bvhleaf->mObjects = objects;
+
+        mRoot = bvhleaf;
+
+        // associate root with current objects
+        AssociateObjectsWithLeaf(bvhleaf);
+}
+
 
 SubdivisionCandidate *BvHierarchy::PrepareConstruction(const VssRayContainer &sampleRays,
-                                                                                                           const ObjectContainer &objects
-                                                                                                           //,AxisAlignedBox3 *forcedObjectSpace
-                                                                                                           )
+                                                                                                           const ObjectContainer &objects)
 {
         // note matt: we assume that we have objects sorted by their id
@@ -1332 +1344 @@
 
         // compute bounding box from objects
-        mBoundingBox = ComputeBoundingBox(objects);
+        // we assume that root was already created
+        mBoundingBox = mRoot->GetBoundingBox();
+        BvhLeaf *bvhleaf = dynamic_cast<BvhLeaf *>(mRoot);
 
         mTermMinProbability *= mBoundingBox.GetVolume();
         mGlobalCostMisses = 0;
         
-        //-- create new root
-
-        BvhLeaf *bvhleaf = new BvhLeaf(mBoundingBox, NULL, (int)objects.size());
-        bvhleaf->mObjects = objects;
-        mRoot = bvhleaf;
-
         // only rays intersecting objects in node are interesting
         AssociateObjectsWithRays(sampleRays);
-        // associate root with current objects
-        AssociateObjectsWithLeaf(bvhleaf);
-
-        //-- add first candidate for object space partition
-        
+        
+
         // probabilty is voume of all "seen" view cells
 #if 1
-        const float prop = EvalViewCellsVolume(bvhleaf->mObjects);
+        const float prop = EvalViewCellsVolume(objects);
 #else
         const float prop = GetBoundingBox().GetVolume();
@@ -1360 +1365 @@
         BvhTraversalData oData(bvhleaf, 0, mBoundingBox, prop);
 
-        //-- first split candidate
+        //-- add first candidate for object space partition     
         BvhSubdivisionCandidate *oSubdivisionCandidate = 
                 new BvhSubdivisionCandidate(oData);