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

Timestamp:

10/22/06 09:03:24 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -25 +25 @@
 #define PROBABILIY_IS_BV_VOLUME 1
 #define USE_FIXEDPOINT_T 0
-//#define COUNT_ORIGIN_OBJECTS 0
+
+#define USE_VOLUMES_FOR_HEURISTICS 1
+
 
 int BvhNode::sMailId = 10000; //2147483647;
@@ -261 +263 @@
         Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useGlobalSorting", mUseGlobalSorting);
 
+        mUseBboxAreaForSah = true;
 
         /////////////
@@ -432 +435 @@
                 // decrease the weighted average cost of the subdivisoin
                 mTotalCost -= sc->GetRenderCostDecrease();
+                mPvsEntries += sc->GetPvsEntriesIncr();
 
                 // subdivision statistics
@@ -527 +531 @@
                 //-- surface area heuristics
 
-        //      if (objects.empty())
-        //              return 0.0f;
-
                 const AxisAlignedBox3 box = EvalBoundingBox(leaf->mObjects);
                 const float area = box.SurfaceArea();
@@ -814 +815 @@
         int objectsLeft = 0, objectsRight = (int)tData.mNode->mObjects.size();
   
-        AxisAlignedBox3 box = tData.mNode->GetBoundingBox();
-
-        float minBox = box.Min(axis);
-        float maxBox = box.Max(axis);
-        float boxArea = box.SurfaceArea();
+        const AxisAlignedBox3 nodeBbox = tData.mNode->GetBoundingBox();
+
+        const float minBox = nodeBbox.Min(axis);
+        const float maxBox = nodeBbox.Max(axis);
+        const float boxArea = nodeBbox.SurfaceArea();
 
         float minSum = 1e20f;
@@ -828 +829 @@
         SortableEntryContainer::const_iterator currentPos =
                 mSubdivisionCandidates->begin();
-
-        
-        // we keep track of both borders of the bounding boxes =>
-        // store the events in descending order
+        
         vector<float> bordersRight;
-        bordersRight.resize(mSubdivisionCandidates->size());
-
-        SortableEntryContainer::reverse_iterator rcit = 
-                mSubdivisionCandidates->rbegin(), rcit_end = mSubdivisionCandidates->rend();
-        
-        vector<float>::reverse_iterator rbit = bordersRight.rbegin();
-        
-        for (; rcit != rcit_end; ++ rcit, ++ rbit) 
-        {
-                Intersectable *obj = (*rcit).mObject;
-                const AxisAlignedBox3 box = obj->GetBox();
-
-                if (box.Min(axis) < minBorder)
-                {
-                        minBorder = box.Min(axis);
-                }
-
-                (*rbit) = minBorder;
-        }
+
+        if (mUseBboxAreaForSah)
+        {
+                // we keep track of both borders of the bounding boxes =>
+                // store the events in descending order
+
+                bordersRight.resize(mSubdivisionCandidates->size());
+
+                SortableEntryContainer::reverse_iterator rcit = 
+                        mSubdivisionCandidates->rbegin(), rcit_end = mSubdivisionCandidates->rend();
+        
+                vector<float>::reverse_iterator rbit = bordersRight.rbegin();
+        
+                for (; rcit != rcit_end; ++ rcit, ++ rbit) 
+                {
+                        Intersectable *obj = (*rcit).mObject;
+                        const AxisAlignedBox3 obox = obj->GetBox();
+
+                        if (obox.Min(axis) < minBorder)
+                        {
+                                minBorder = obox.Min(axis);
+                        }
+
+                        (*rbit) = minBorder;
+                }
+        }
+
+        // temporary surface areas
+        float al = 0;
+        float ar = boxArea;
 
         vector<float>::const_iterator bit = bordersRight.begin();
@@ -863 +872 @@
                 -- objectsRight;
 
-                AxisAlignedBox3 lbox = box;
-                AxisAlignedBox3 rbox = box;
-        
                 const AxisAlignedBox3 obox = obj->GetBox();
 
-                // the borders of the bounding boxes have changed
-                if (obox.Max(axis) > maxBorder)
-                {
-                        maxBorder = obox.Max(axis);
-                }
-
-                minBorder = (*bit);
-        
-        lbox.SetMax(axis, maxBorder);
-                rbox.SetMin(axis, minBorder);
-        
-                const float al = lbox.SurfaceArea();
-                const float ar = rbox.SurfaceArea();
+                if (mUseBboxAreaForSah)
+                {
+                        AxisAlignedBox3 lbox = nodeBbox;
+                        AxisAlignedBox3 rbox = nodeBbox;
+        
+                        // the borders of the bounding boxes have changed
+                        if (obox.Max(axis) > maxBorder)
+                        {
+                                maxBorder = obox.Max(axis);
+                        }
+
+                        minBorder = (*bit);
+
+                        lbox.SetMax(axis, maxBorder);
+                        rbox.SetMin(axis, minBorder);
+        
+                        al = lbox.SurfaceArea();
+                        ar = rbox.SurfaceArea();
+                }
+                else
+                {
+                        // just add up areas of the object bbs
+                        // (as we are not sampling volumetric visibility,
+                        // this should provide better heuristics
+                        const float area = obox.SurfaceArea();
+
+                        al += area;
+                        ar -= area;
+                }
 
                 const float sum = objectsLeft * al + objectsRight * ar;
@@ -1151 +1173 @@
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
-                vol += (*vit)->GetVolume();
+#if USE_VOLUMES_FOR_HEURISTICS
+                const float volIncr = (*vit)->GetVolume();
+#else
+                const float volIncr = 1.0f;
+#endif
+                vol += volIncr;
         }
 
@@ -1185 +1212 @@
                 // view cells can also be seen from left child node
                 ViewCell *viewCell = *vit;
-
+#if USE_VOLUMES_FOR_HEURISTICS
                 const float vol = viewCell->GetVolume();
-
+#else
+                const float vol = 1.0f;
+#endif
                 if (!viewCell->Mailed())
                 {
@@ -1352 +1381 @@
                         << "#Leaves\n" << mBvhStats.Leaves() << endl
                         << "#RenderCostDecrease\n" << costDecr << endl 
-                        << "#TotalRenderCost\n" << mTotalCost << endl;
+                        << "#TotalRenderCost\n" << mTotalCost << endl
+                        << "#EntriesInPvs\n" << mPvsEntries << endl;
 }
 
@@ -1881 +1911 @@
         const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
         mTotalCost = (float)objects.size() * prop / viewSpaceVol;
+        mPvsEntries = CountViewCells(objects);
 
         PrintSubdivisionStats(*oSubdivisionCandidate);