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

Timestamp:

03/07/07 16:26:58 (17 years ago)

Author:

mattausch

Message:

using mutationsamples for evaluation

File:

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

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

@@ -27 +27 @@
 #define USE_VOLUMES_FOR_HEURISTICS 1
 #define TEST_POWERPLANT 0
-  
+#define USE_BETTER_RENDERCOST_EST 0
+
 //int BvhNode::sMailId = 10000;
 //int BvhNode::sReservedMailboxes = 1;
@@ -172 +173 @@
         }
 }
+
+
 
 /******************************************************************/
@@ -673 +676 @@
         // high avg ray contri, the result is influenced by undersampling
         splitCandidate.SetAvgRayContribution(avgRayContri);
-        const float viewSpaceVol =  GetViewSpaceVolume();
+        const float viewSpaceVol = GetViewSpaceVolume();
 
         const float oldVolume = EvalViewCellsVolume(leaf->mObjects) / viewSpaceVol;
@@ -1046 +1049 @@
                 Intersectable *obj = (*cit).mObject;
 
-                const float renderCost = mViewCellsManager->EvalRenderCost(obj);
+#if USE_BETTER_RENDERCOST_EST
+                const float renderCost = ViewCellsManager::EvalRenderCost(obj);
                 
                 objectsLeft += renderCost;
                 objectsRight -= renderCost;
 
+                const bool noValidSplit = ((objectsLeft <= Limits::Small) || (objectsRight <= Limits::Small));
+
+#else
+                ++ objectsLeft;
+                -- objectsRight;
+
+                const bool noValidSplit = !objectsLeft || !objectsRight;
+#endif
                 const AxisAlignedBox3 obox = obj->GetBox();
 
@@ -1070 +1082 @@
                 ar = rbox.SurfaceArea();
 
-                const bool noValidSplit = ((objectsLeft <= Limits::Small) || (objectsRight <= Limits::Small));
                 const float sum = noValidSplit ? 1e25f : objectsLeft * al + objectsRight * ar;
       
@@ -1317 +1328 @@
         float volRight = totalVol;
         
+#if USE_BETTER_RENDERCOST_EST
         const float nTotalObjects = EvalAbsCost(tData.mNode->mObjects);
         float nObjectsLeft = 0;
         float nObjectsRight = nTotalObjects;
+#else
+        const int nTotalObjects = (int)EvalAbsCost(tData.mNode->mObjects);
+        int nObjectsLeft = 0;
+        int nObjectsRight = (int)nTotalObjects;
+#endif
 
         const float viewSpaceVol = 
@@ -1362 +1379 @@
                 EvalHeuristicsContribution(object, volLeft, volRight);
 
-                const float rc = mViewCellsManager->EvalRenderCost(object);
-
+#if USE_BETTER_RENDERCOST_EST
+
+                const float rc = ViewCellsManager::EvalRenderCost(object);
+                
                 nObjectsLeft += rc;
                 nObjectsRight -= rc;
@@ -1370 +1389 @@
                 const bool noValidSplit = ((nObjectsLeft <= Limits::Small) || 
                                                                    (nObjectsRight <= Limits::Small));
-
+#else
+                ++ nObjectsLeft;
+                -- nObjectsRight;
+
+                // split is only valid if #objects on left and right is not zero
+                const bool noValidSplit = !nObjectsLeft || !nObjectsRight;
+
+#endif
+                
                 // the heuristics
             const float sum = noValidSplit ? 
@@ -1378 +1405 @@
                 if (printStats)
                 {
-                        PrintHeuristics(nObjectsRight, sum, volLeft, volRight, viewSpaceVol,
+                        PrintHeuristics(nObjectsRight, sum, volLeft, 
+                                                        volRight, viewSpaceVol,
                                                         sumStats, vollStats, volrStats);
                 }
@@ -1432 +1460 @@
 void BvHierarchy::PrepareLocalSubdivisionCandidates(const BvhTraversalData &tData,
                                                                                                         const int axis)                                                                                 
-{mSort2Timer.Entry();
+{
+        mSortTimer.Entry();
+        
         //-- insert object queries
         ObjectContainer *objects = mUseGlobalSorting ? 
@@ -1438 +1468 @@
 
         CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis);
-                mSort2Timer.Exit();
+        
+        mSortTimer.Exit();
 }
 
@@ -1466 +1497 @@
         for (oit = objects.begin(); oit < oit_end; ++ oit)
         {
-                Intersectable *object = *oit;
-                const AxisAlignedBox3 &box = object->GetBox();
-                const float midPt = (box.Min(axis) + box.Max(axis)) * 0.5f;
-
-                (*subdivisionCandidates)->push_back(SortableEntry(object, midPt));
+                (*subdivisionCandidates)->push_back(SortableEntry(*oit, (*oit)->GetBox().Center(axis)));
         }
 
@@ -1502 +1529 @@
         const bool onlyUnmailed = true;
 
-        const int numRays = CollectViewCells(tData.mNode->mObjects, 
-                                                                                 viewCells, 
-                                                                                 setCounter, 
-                                                                                 onlyUnmailed);
-
-        //cout << "number of rays: " << numRays << endl;
+        
+        CollectViewCells(tData.mNode->mObjects, 
+                                         viewCells, 
+                                         setCounter, 
+                                         onlyUnmailed);
 
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
+
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
@@ -1520 +1547 @@
         }
 
-        // we will mail view cells switching to the back side
+        // mail view cells that go from front node to back node
         ViewCell::NewMail();
         
@@ -1536 +1563 @@
         // (also multiple times, if they are pierced by several rays)
         ViewCellContainer viewCells;
+
         const bool useMailboxing = false;
-
-        CollectViewCells(obj, viewCells, useMailboxing, false, true);
+        const bool setCounter = false;
+        const bool onlyUnmailedRays = true;
+
+        CollectViewCells(obj, viewCells, useMailboxing, setCounter, onlyUnmailedRays);
 
         // classify view cells and compute volume contri accordingly
@@ -1551 +1581 @@
                 // view cells can also be seen from left child node
                 ViewCell *viewCell = *vit;
+
 #if USE_VOLUMES_FOR_HEURISTICS
                 const float vol = viewCell->GetVolume();
@@ -2248 +2279 @@
         int nViewCells = 0;
 
-        //ViewCell::NewMail();
+        ViewCell::NewMail();
         ObjectContainer::const_iterator oit, oit_end = objects.end();