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

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

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

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

@@ -525 +525 @@
         //TestEvaluation(sc);
 
+#ifdef PERFTIMER   
         // fill view cells cache
         mNodeTimer.Entry();
+#endif  
 
         const BvhTraversalData &tData = sc.mParentData;
@@ -634 +636 @@
         UpdateViewCells(sc);
 
+#ifdef PERFTIMER  
         mNodeTimer.Exit();
-
+#endif
+        
         // return the new interior node
         return node;
@@ -647 +651 @@
                                                                 )
 {
+#ifdef PERFTIMER  
         mSubdivTimer.Entry();
-
+#endif
+        
         BvhSubdivisionCandidate *sc = 
                 static_cast<BvhSubdivisionCandidate *>(splitCandidate);
@@ -718 +724 @@
         }
         
+#ifdef PERFTIMER  
         mSubdivTimer.Exit();
-
+#endif
+        
         return currentNode;
 }
@@ -780 +788 @@
                                                                                    const bool preprocessViewCells)
 {
-        mPlaneTimer.Entry();
+#ifdef PERFTIMER  
+  mPlaneTimer.Entry();
+#endif
 
         const BvhTraversalData &tData = splitCandidate.mParentData;
@@ -824 +834 @@
         }
 
+#ifdef PERFTIMER  
         mPlaneTimer.Exit();
-
+#endif
 
         ///////////////////
 
+#ifdef PERFTIMER  
         mEvalTimer.Entry();
-
+#endif
+        
         // mark view cells according to what part of the split they see
         // and compute volume
@@ -984 +997 @@
 #endif
 
+#ifdef PERFTIMER  
         mEvalTimer.Exit();
+#endif
 }
 
@@ -1676 +1691 @@
                                                                                                         const int axis)                                                                                 
 {
+#ifdef PERFTIMER  
         mSortTimer.Entry();
-        
+#endif  
         //-- insert object queries
         ObjectContainer *objects = mUseGlobalSorting ? 
@@ -1684 +1700 @@
         CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis);
         
+#ifdef PERFTIMER  
         mSortTimer.Exit();
+#endif
 }
 
@@ -1840 +1858 @@
                                                                                  bool useVisibilityBasedHeuristics)
 {
+#ifdef PERFTIMER  
         mSplitTimer.Entry();
-
+#endif
+        
         if (mIsInitialSubdivision)
         {
@@ -1925 +1945 @@
         backObjects = nBackObjects[bestAxis];
 
+#ifdef PERFTIMER  
         mSplitTimer.Exit();
-
+#endif
+        
         //cout << "val: " << nCostRatio[bestAxis] << " axis: " << bestAxis << endl;
         return nCostRatio[bestAxis];
@@ -2276 +2298 @@
         //-- use view cells cache
 
+#ifdef PERFTIMER  
         mCollectTimer.Entry();
-
+#endif
+        
         ViewCellContainer *objViewCells = obj->GetOrCreateViewCells();
 
@@ -2308 +2332 @@
         }
 
+#ifdef PERFTIMER  
         mCollectTimer.Exit();
-
+#endif
         return (int)objViewCells->size();
 }
@@ -2320 +2345 @@
                                                                                   const bool onlyUnmailedRays)
 {
+#ifdef PERFTIMER  
         mCollectTimer.Entry();
+#endif
         VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
 
@@ -2362 +2389 @@
         }
 
+#ifdef PERFTIMER  
         mCollectTimer.Exit();
+#endif
         return numRays;
 }
@@ -2436 +2465 @@
                                                                   const bool onlyUnmailedRays)
 {
+#ifdef PERFTIMER  
         mCollectTimer.Entry();
+#endif
         VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
 
@@ -2478 +2509 @@
         }
 
+#ifdef PERFTIMER  
         mCollectTimer.Exit();
+#endif
         return numRays;
 }