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

Timestamp:

10/06/06 21:37:00 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -174 +174 @@
         ReadEnvironment();
         mSubdivisionCandidates = new SortableEntryContainer;
+        for (int i = 0; i < 3; ++ i)
+                mSortedObjects[i] = NULL;
 }
 
@@ -189 +191 @@
         DEL_PTR(mSubdivisionCandidates);
 
+        for (int i = 0; i < 3; ++ i)
+        {
+                DEL_PTR(mSortedObjects[i]);
+        }
         mSubdivisionStats.close();
 }
@@ -1004 +1010 @@
 {
         //-- insert object queries
-        ObjectContainer *objects = mUseGlobalSorting ? tData.mSortedObjects[axis] : &tData.mNode->mObjects;
+        ObjectContainer *objects = 
+                mUseGlobalSorting ? tData.mSortedObjects[axis] : &tData.mNode->mObjects;
 
         CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis);
@@ -1042 +1049 @@
 
         if (sort)
-        {
+        {       // no presorted candidate list
                 stable_sort((*subdivisionCandidates)->begin(), (*subdivisionCandidates)->end());
         }
@@ -1154 +1161 @@
         }
         
-        ////////////////////////////////////////////
+        ////////////////////////////////////
         //-- evaluate split cost for all three axis
         
@@ -1179 +1186 @@
                                 else
                                 {
-                                        //-- use surface area heuristic because view cells not constructed yet                          
+                                        //////////////////
+                                        //-- view cells not constructed yet     => use surface area heuristic                   
                                         nCostRatio[axis] =
                                                 EvalSah(
@@ -1210 +1218 @@
         }
 
-        /////////////////////////////////////
+    ////////////////
         //-- assign values
 
@@ -1242 +1250 @@
                 }
 
-                if (1 && ray->mOriginObject)
+                if (COUNT_ORIGIN_OBJECTS && ray->mOriginObject)
                 {
                         ray->mOriginObject->mVssRays.push_back(ray);
@@ -1298 +1306 @@
 
 float BvHierarchy::EvalRenderCost(const ObjectContainer &objects) const
-{
-        if (mHierarchyManager->GetViewSpaceSubdivisionType() == HierarchyManager::NO_VIEWSPACE_SUBDIV)
-        {
+{       
+        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+                HierarchyManager::NO_VIEWSPACE_SUBDIV)
+        {
+                ////////////////
+                //-- surface area heuristics
+
                 if (objects.empty())
                         return 0.0f;
 
-                ////////////////
-                //-- surface area heuristics
-
                 const AxisAlignedBox3 box = EvalBoundingBox(objects);
                 const float area = box.SurfaceArea();
-
-                return (float)objects.size() * area / mViewCellsManager->GetViewSpaceBox().SurfaceArea();
+                const float viewSpaceArea = mViewCellsManager->GetViewSpaceBox().SurfaceArea();
+
+                return (float)objects.size() * area / viewSpaceArea;
         }
         else
@@ -1771 +1781 @@
         if (mUseGlobalSorting)
         {
-                CreateInitialSortedObjectList(oData);
+                AssignInitialSortedObjectList(oData);
         }
         
@@ -1793 +1803 @@
 
 
-void BvHierarchy::CreateInitialSortedObjectList(BvhTraversalData &tData)
-{
-        SortableEntryContainer *sortedObjects = new SortableEntryContainer();
-
+void BvHierarchy::AssignInitialSortedObjectList(BvhTraversalData &tData)
+{
         // we sort the objects as a preprocess so they don't have
         // to be sorted for each split
         for (int i = 0; i < 3; ++ i)
         {
-                CreateLocalSubdivisionCandidates(tData.mNode->mObjects, &sortedObjects, true, i);
-                        
+                // create new objects
+                if (!mSortedObjects[i])
+                {
+                        mSortedObjects[i] = new SortableEntryContainer();
+                        CreateLocalSubdivisionCandidates(tData.mNode->mObjects, &mSortedObjects[i], true, i);
+                }
+
+                // copy list into traversal data list
                 tData.mSortedObjects[i] = new ObjectContainer();
-                tData.mSortedObjects[i]->reserve((int)sortedObjects->size());
-
-                SortableEntryContainer::const_iterator oit, oit_end = sortedObjects->end();
-                for (oit = sortedObjects->begin(); oit != oit_end; ++ oit)
+                tData.mSortedObjects[i]->reserve((int)mSortedObjects[i]->size());
+
+                SortableEntryContainer::const_iterator oit, oit_end = mSortedObjects[i]->end();
+
+                for (oit = mSortedObjects[i]->begin(); oit != oit_end; ++ oit)
                 {
                         tData.mSortedObjects[i]->push_back((*oit).mObject);
                 }
         }
-
-        delete sortedObjects;
 }
 
@@ -1885 +1898 @@
         BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
 
+        AssignInitialSortedObjectList(oData);
+        
+
         ///////////////////
         //-- add first candidate for object space partition