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

Timestamp:

01/21/07 00:40:56 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -26 +26 @@
 #define USE_FIXEDPOINT_T 0
 #define USE_VOLUMES_FOR_HEURISTICS 1
-
-  //int BvhNode::sMailId = 10000; //2147483647;
-  //int BvhNode::sReservedMailboxes = 1;
+#define TEST_POWERPLANT 0
+  
+//int BvhNode::sMailId = 10000;
+//int BvhNode::sReservedMailboxes = 1;
 
 BvHierarchy *BvHierarchy::BvhSubdivisionCandidate::sBvHierarchy = NULL;
@@ -382 +383 @@
                                                                                 BvhTraversalData &frontData,
                                                                                 BvhTraversalData &backData)
-{
+{ 
         const BvhTraversalData &tData = sc.mParentData;
         BvhLeaf *leaf = tData.mNode;
@@ -427 +428 @@
         ++ mBvhStats.splits;
 
-
+ 
         ////////////////////////////////////////
         //-- fill front and back traversal data with the new values
@@ -446 +447 @@
         AssociateObjectsWithLeaf(back);
         AssociateObjectsWithLeaf(front);
-   
+  
+        ////////////
         //-- compute pvs correction to cope with undersampling
+
         frontData.mPvs = (float)CountViewCells(front->mObjects);
         backData.mPvs = (float)CountViewCells(back->mObjects);
@@ -453 +456 @@
         frontData.mCorrectedPvs = sc.mCorrectedFrontPvs;
         backData.mCorrectedPvs = sc.mCorrectedBackPvs;
+
 
         // compute probability of this node being visible, 
@@ -462 +466 @@
         backData.mCorrectedVolume = sc.mCorrectedBackVolume;
 
+
     // how often was max cost ratio missed in this branch?
         frontData.mMaxCostMisses = sc.GetMaxCostMisses();
@@ -468 +473 @@
         // set the time stamp so the order of traversal can be reconstructed
         node->SetTimeStamp(mHierarchyManager->mTimeStamp ++);
-                
+         
         // assign the objects in sorted order
-        if (mUseGlobalSorting)
+        if (!TEST_POWERPLANT && mUseGlobalSorting)
         {
                 AssignSortedObjects(sc, frontData, backData);
@@ -497 +502 @@
                 BvhTraversalData tFrontData;
                 BvhTraversalData tBackData;
-                        
+                
                 // create new interior node and two leaf node
                 currentNode = SubdivideNode(*sc, tFrontData, tBackData);
@@ -628 +633 @@
         }
 
+
         const BvhTraversalData &tData = splitCandidate.mParentData;
         BvhLeaf *leaf = tData.mNode;
@@ -671 +677 @@
 
         if (0)
-        cout << "bvh volume cost"
+        {
+                cout << "bvh volume cost"
                  << " avg ray contri: " << avgRayContri << " ratio: " << oldRatio 
                  << " parent: " << parentVol << " old vol: " << oldVolume 
                  << " frontvol: " << frontVol << " corr. " << splitCandidate.mCorrectedFrontVolume 
                  << " backvol: " << backVol << " corr. " << splitCandidate.mCorrectedBackVolume << endl;
+        }
 
 #ifdef GTP_DEBUG
@@ -849 +857 @@
 
 
-#if 0
+#if 1
 
 /// compute object boundaries using spatial mid split
@@ -857 +865 @@
                                                                                         ObjectContainer &objectsBack)
 {
-        const float maxBox = tData.mBoundingBox.Max(axis);
-        const float minBox = tData.mBoundingBox.Min(axis);
+        AxisAlignedBox3 parentBox = tData.mNode->GetBoundingBox();
+
+        const float maxBox = parentBox.Max(axis);
+        const float minBox = parentBox.Min(axis);
 
         float midPoint = (maxBox + minBox) * 0.5f;
@@ -882 +892 @@
         }
 
-        const float oldRenderCost = EvalRenderCost(tData.mNode->mObjects);
-        const float newRenderCost = EvalRenderCost(objectsFront) * EvalRenderCost(objectsBack);
+        AxisAlignedBox3 fbox = EvalBoundingBox(objectsFront, &parentBox);
+        AxisAlignedBox3 bbox = EvalBoundingBox(objectsBack, &parentBox);
+
+        const float oldRenderCost = (float)tData.mNode->mObjects.size() * parentBox.SurfaceArea();
+        const float newRenderCost = (float)objectsFront.size() * fbox.SurfaceArea() +  (float)objectsBack.size() * bbox.SurfaceArea();
 
         const float ratio = newRenderCost / oldRenderCost;
@@ -920 +933 @@
 
 #if 1
+        // hack: always take driving axis
         const float cost = (tData.mNode->GetBoundingBox().Size().DrivingAxis() == axis) ? -1.0f : 0.0f;
 #else
         const float oldRenderCost = EvalRenderCost(tData.mNode->mObjects);
-        const float newRenderCost = EvalRenderCost(objectsFront) * EvalRenderCost(objectsBack);
+        const float newRenderCost = EvalRenderCost(objectsFront) + EvalRenderCost(objectsBack);
 
         const float cost = newRenderCost / oldRenderCost;
@@ -986 +1000 @@
         }
 
-        // temporary surface areas
+        // record surface areas during the sweep
         float al = 0;
         float ar = boxArea;
@@ -1394 +1408 @@
 void BvHierarchy::CreateLocalSubdivisionCandidates(const ObjectContainer &objects, 
                                                                                                   SortableEntryContainer **subdivisionCandidates, 
-                                                                                                  const bool sort,
+                                                                                                  const bool sortEntries,
                                                                                                   const int axis)
 {
@@ -1400 +1414 @@
 
         // compute requested size and look if subdivision candidate has to be recomputed
-        const int requestedSize = (int)objects.size() * 2;
+        const int requestedSize = (int)objects.size();
         
         // creates a sorted split candidates array
@@ -1423 +1437 @@
         }
 
-        if (sort)
+        if (sortEntries)
         {       // no presorted candidate list
-                stable_sort((*subdivisionCandidates)->begin(), (*subdivisionCandidates)->end());
+                //stable_sort((*subdivisionCandidates)->begin(), (*subdivisionCandidates)->end());
+                sort((*subdivisionCandidates)->begin(), (*subdivisionCandidates)->end());
         }
 }
@@ -2201 +2216 @@
         // root and bounding box was already constructed
         BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
-
+        
         // only rays intersecting objects in node are interesting
         const int nRays = AssociateObjectsWithRays(sampleRays);
         //cout << "using " << nRays << " of " << (int)sampleRays.size() << " rays" << endl;
-
+        
         // probability that volume is "seen" from the view cells
         const float prop = EvalViewCellsVolume(objects) / GetViewSpaceVolume();
@@ -2213 +2228 @@
         
         // create sorted object lists for the first data
-        if (mUseGlobalSorting)
+        if (!TEST_POWERPLANT && mUseGlobalSorting)
         {
                 AssignInitialSortedObjectList(oData, objects);
@@ -2257 +2272 @@
                         tQueue.Push(sCandidate);
                 }
+
+                cout << "size of initial bv subdivision: " << GetStatistics().Leaves() << endl;
         }
         else
-        {
+        {       
                 // evaluate priority
                 EvalSubdivisionCandidate(*oSubdivisionCandidate);
@@ -2265 +2282 @@
 
                 tQueue.Push(oSubdivisionCandidate);
-        }
-                
-        cout << "size of initial bv subdivision: " << GetStatistics().Leaves() << endl;
+                cout << "size of initial bv subdivision: " << GetStatistics().Leaves() << endl;
+        }
 }
 
@@ -2304 +2320 @@
 
         *(tData.mSortedObjects[3]) = objects;
-        stable_sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
+        //stable_sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
+        sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
 }
 
@@ -2375 +2392 @@
         BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
 
-        AssignInitialSortedObjectList(oData, objects);
+        if (!TEST_POWERPLANT && mUseGlobalSorting)
+                AssignInitialSortedObjectList(oData, objects);
         
 
@@ -2657 +2675 @@
                         delete bsc;
                 }
-                else // initial preprocessing  finished for this candidate
-                {
+                else 
+                {
+                        // initial preprocessing  finished for this candidate
                         // add to candidate container
                         candidateContainer.push_back(bsc);