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

Timestamp:

03/05/07 11:07:44 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -384 +384 @@
                                                                                 BvhTraversalData &backData)
 { 
+        mNodeTimer.Entry();
         const BvhTraversalData &tData = sc.mParentData;
         BvhLeaf *leaf = tData.mNode;
@@ -480 +481 @@
         }
         
+        mNodeTimer.Exit();
+
         // return the new interior node
         return node;
@@ -489 +492 @@
                                                                 const bool globalCriteriaMet)
 {
+        mSubdivTimer.Entry();
+
         BvhSubdivisionCandidate *sc = 
                 static_cast<BvhSubdivisionCandidate *>(splitCandidate);
@@ -505 +510 @@
                 // create new interior node and two leaf node
                 currentNode = SubdivideNode(*sc, tFrontData, tBackData);
-        
+
                 // decrease the weighted average cost of the subdivisoin
                 mTotalCost -= sc->GetRenderCostDecrease();
@@ -524 +529 @@
                 EvalSubdivisionCandidate(*frontCandidate);
                 EvalSubdivisionCandidate(*backCandidate);
-        
+
                 // cross reference
                 tFrontData.mNode->SetSubdivisionCandidate(frontCandidate); 
@@ -550 +555 @@
         }
         
+        mSubdivTimer.Exit();
+
         return currentNode;
 }
@@ -608 +615 @@
                                                                                    bool computeSplitPlane)
 {
+        mEvalTimer.Entry();
         if (computeSplitPlane)
         {
@@ -697 +705 @@
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);
+        mEvalTimer.Exit();
 }
 
@@ -1549 +1558 @@
                                                                                  bool useVisibilityBasedHeuristics)
 {
+        mSplitTimer.Entry();
+
         if (mIsInitialSubdivision)
         {
@@ -1653 +1664 @@
         backObjects = nBackObjects[bestAxis];
 
+        mSplitTimer.Exit();
+
         //cout << "val: " << nCostRatio[bestAxis] << " axis: " << bestAxis << endl;
         return nCostRatio[bestAxis];
@@ -2312 +2325 @@
                                                                                                 const ObjectContainer &objects)
 {
+        mSortTimer.Entry();
+
+        const bool doSort = true;
+
         // we sort the objects as a preprocess so they don't have
         // to be sorted for each split
@@ -2320 +2337 @@
                 CreateLocalSubdivisionCandidates(objects, 
                                                                              &sortedObjects, 
-                                                                                 true, 
+                                                                                 doSort, 
                                                                                  i);
                 
@@ -2342 +2359 @@
 
         *(tData.mSortedObjects[3]) = objects;
-        //stable_sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
-        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);
+
+        mSortTimer.Exit();
 }