Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.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/VspTree.cpp (modified) (13 diffs)

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

@@ -709 +709 @@
                                                         const bool globalCriteriaMet)
 {
+#ifdef PERFTIMER  
         mSubdivTimer.Entry();
-
+#endif
+        
         // todo remove dynamic cast
         VspSubdivisionCandidate *sc = 
@@ -788 +790 @@
         }
 
+#ifdef PERFTIMER  
         mSubdivTimer.Exit();
-
+#endif
         return newNode;
 }
@@ -797 +800 @@
                                                                            bool computeSplitPlane)
 {
+#ifdef PERFTIMER  
         mPlaneTimer.Entry();
-
+#endif
+        
         if (computeSplitPlane)
         {
@@ -818 +823 @@
         }
         
+#ifdef PERFTIMER  
         mPlaneTimer.Exit();
         mEvalTimer.Entry();
-
+#endif
+        
         VspLeaf *leaf = static_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
 
@@ -917 +924 @@
 
         //cout << "vsp render cost decrease=" << renderCostDecr << endl;
+#ifdef PERFTIMER  
         mEvalTimer.Exit();
+#endif
 }
 
@@ -948 +957 @@
                                                                         VspTraversalData &backData)
 {
+#ifdef PERFTIMER  
         mNodeTimer.Entry();
-        
+#endif  
         VspLeaf *leaf = static_cast<VspLeaf *>(sc.mParentData.mNode);
 
@@ -1042 +1052 @@
         interior->mTimeStamp = mHierarchyManager->mTimeStamp ++;
 
+#ifdef PERFTIMER  
         mNodeTimer.Exit();
-
+#endif
         return interior;
 }
@@ -1103 +1114 @@
                                                                                 float maxBand)
 {
+#ifdef PERFTIMER  
         mSortTimer.Entry();
-
+#endif
         mLocalSubdivisionCandidates->clear();
 
@@ -1154 +1166 @@
                 sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
 
+#ifdef PERFTIMER  
         mSortTimer.Exit();
+#endif
 }
 
@@ -1573 +1587 @@
                                                                 float &pBack)
 {
+#ifdef PERFTIMER  
         mSplitTimer.Entry();
-
+#endif
         float nPosition[3];
         float nCostRatio[3];
@@ -1670 +1685 @@
         pBack = nProbBack[bestAxis];
 
+#ifdef PERFTIMER  
         mSplitTimer.Exit();
-
+#endif
         return nCostRatio[bestAxis];
 }
@@ -3158 +3174 @@
 void VspTree::GetViewCells(const VssRay &ray, ViewCellContainer &viewCells)
 {
+#ifdef PERFTIMER  
         mViewCellsTimer.Entry();
+#endif
         
         static Ray hray;
@@ -3175 +3193 @@
         CastLineSegment(origin, termination, viewCells, false);
 
+#ifdef PERFTIMER  
         mViewCellsTimer.Exit();
+#endif
 }