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

Timestamp:

10/02/06 08:38:25 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1663 +1663 @@
         mBvhStats.Reset();
         mBvhStats.Start();
-
         mBvhStats.nodes = 1;
                 
@@ -1669 +1668 @@
         BvhSubdivisionCandidate::sBvHierarchy = this;
         
+        // create new root
+        CreateRoot(objects);
+
         // compute bounding box from objects
-        // note: we assume that root was already created
         mBoundingBox = mRoot->GetBoundingBox();
-        BvhLeaf *bvhleaf = dynamic_cast<BvhLeaf *>(mRoot);
+        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
 
         // multiply termination criterium for comparison,
@@ -1693 +1694 @@
 
         // create bvh traversal data
-        BvhTraversalData oData(bvhleaf, 0, prop, nRays);
+        BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
 
         // create sorted object lists for the first data
@@ -1709 +1710 @@
 
         EvalSubdivisionCandidate(*oSubdivisionCandidate);
-        bvhleaf->SetSubdivisionCandidate(oSubdivisionCandidate);
+        bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
         const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
@@ -1784 +1785 @@
 
 
+SubdivisionCandidate *BvHierarchy::Reset(const VssRayContainer &sampleRays, 
+                                                                                 const ObjectContainer &objects)
+{
+        // reset stats
+        mBvhStats.Reset();
+        mBvhStats.Start();
+        mBvhStats.nodes = 1;
+
+        // reset root
+        DEL_PTR(mRoot);
+        CreateRoot(objects);
+        
+#if PROBABILIY_IS_BV_VOLUME
+        mTermMinProbability *= mBoundingBox.GetVolume();
+        // probability that bounding volume is seen
+        const float prop = GetBoundingBox().GetVolume();
+#else
+        mTermMinProbability *= mVspTree->GetBoundingBox().GetVolume();
+        // probability that volume is "seen" from the view cells
+        const float prop = EvalViewCellsVolume(objects);
+#endif
+
+        const int nRays = CountRays(objects);
+        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
+
+        // create bvh traversal data
+        BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
+
+        ///////////////////
+        //-- add first candidate for object space partition     
+
+        BvhSubdivisionCandidate *oSubdivisionCandidate = 
+                new BvhSubdivisionCandidate(oData);
+
+        EvalSubdivisionCandidate(*oSubdivisionCandidate);
+        bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
+
+        const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+        mTotalCost = (float)objects.size() * prop / viewSpaceVol;
+
+        PrintSubdivisionStats(*oSubdivisionCandidate);
+
+        return oSubdivisionCandidate;
+}
+
+
 void BvhStatistics::Print(ostream &app) const
 {