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

Timestamp:

10/27/06 03:05:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -131 +131 @@
 }
 
+
 void BvhLeaf::CollectObjects(ObjectContainer &objects)
 {
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        ObjectContainer::const_iterator oit, oit_end = mObjects.end();
+        for (oit = mObjects.begin(); oit != oit_end; ++ oit)
         {
                 objects.push_back(*oit);
@@ -330 +331 @@
         return nRays;
 }
-
-
-void BvHierarchy::UpdateNode(const BvhSubdivisionCandidate &sc)
-{
-        BvhInterior *node = NULL;//sc->mParentData.mNode;
-        //AssociateObjectsWithLeaf(node->GetBack());
-        //AssociateObjectsWithLeaf(node->GetFront());
-   
-        node->mRenderCostDecr = sc.GetRenderCostDecrease();
-        node->mPvsEntriesIncr = sc.GetPvsEntriesIncr();
-}
                                                                         
 
@@ -906 +896 @@
                 else
                 {
-                        // just add up areas of the object bbs
+                        // just add up areas of the objects itself
                         // (as we are not sampling volumetric visibility,
                         // this should provide better heuristics
-                        const float area = obox.SurfaceArea();
+                        const float area = //obox.SurfaceArea();
 
                         al += area;
@@ -1905 +1895 @@
         //-- add first candidate for object space partition     
 
-        BvhSubdivisionCandidate *oSubdivisionCandidate = 
-                new BvhSubdivisionCandidate(oData);
-
+        BvhSubdivisionCandidate *oSubdivisionCandidate = new BvhSubdivisionCandidate(oData);
+
+        // evaluate priority
         EvalSubdivisionCandidate(*oSubdivisionCandidate);
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
@@ -2115 +2105 @@
 float BvHierarchy::GetMemUsage() const
 {
-        return (float)
-                 (sizeof(BvHierarchy)
-                  + mBvhStats.Leaves() * sizeof(BvhLeaf) 
-                  + mBvhStats.Interior() * sizeof(BvhInterior)
-                  ) / (1024.0f * 1024.0f);
-}
-
-
-SubdivisionCandidate *BvHierarchy::CreateSubdivisionCandidate(BvhInterior *oldNode)
-{
-        return new BvhSubdivisionCandidate(BvhTraversalData());
-}
-
-
-BvhNode *BvHierarchy::SubdivideAndCopy(SplitQueue &tQueue,
-                                                                           SubdivisionCandidate *splitCandidate,
-                                                                           const bool globalCriteriaMet,
-                                                                           BvhNode *originalNode)
-{
-        BvhSubdivisionCandidate *sc = dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
+        return (float)(sizeof(BvHierarchy)
+                                   + mBvhStats.Leaves() * sizeof(BvhLeaf) 
+                                   + mBvhStats.Interior() * sizeof(BvhInterior)
+                                   ) / float(1024 * 1024);
+}
+
+
+BvhNode *BvHierarchy::SubdivideAndCopy(SplitQueue &tQueue, 
+                                                                           SubdivisionCandidate *splitCandidate)
+{
+        BvhSubdivisionCandidate *sc = 
+                dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
         BvhTraversalData &tData = sc->mParentData;
 
@@ -2149 +2131 @@
                         
                 BvhInterior *oldInterior = dynamic_cast<BvhInterior *>(oldNode);
-                //sc->SetSplitPlane(oldInterior->mSplitPlane);
-
+                
                 oldInterior->GetFront()->CollectObjects(sc->mFrontObjects);
                 oldInterior->GetBack()->CollectObjects(sc->mBackObjects);
-                EvalSubdivisionCandidate(*sc);
+                
+                // evaluate the changes in render cost and pvs entries
+                EvalSubdivisionCandidate(*sc, false);
 
                 // create new interior node and two leaf node
                 currentNode = SubdivideNode(*sc, tFrontData, tBackData);
         
-                // evaluate the changes in render cost and pvs entries
-                EvalSubdivisionCandidate(*sc, false);
-
                 currentNode->mRenderCostDecr = oldNode->mRenderCostDecr + sc->GetRenderCostDecrease();
                 currentNode->mPvsEntriesIncr = oldNode->mPvsEntriesIncr + sc->GetPvsEntriesIncr();