Changeset 2198 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

03/06/07 17:37:28 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (8 diffs)

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

@@ -775 +775 @@
                                                                            bool computeSplitPlane)
 {
-        mEvalTimer.Entry();
+        mPlaneTimer.Entry();
 
         if (computeSplitPlane)
@@ -796 +796 @@
         }
         
+        mPlaneTimer.Exit();
+
+        mEvalTimer.Entry();
+
         VspLeaf *leaf = static_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
 
@@ -1112 +1116 @@
         }
 
-        stable_sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
-        //sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
+        if (1)
+                stable_sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
+        else
+                sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
 
         mSortTimer.Exit();
@@ -2552 +2558 @@
 ViewCell *VspTree::GetViewCell(const Vector3 &point, const bool active)
 {
-        if (mRoot == NULL)
+        if (!mRoot)
                 return NULL;
 
@@ -2590 +2596 @@
         }
   
+        // return active or leaf view cell
         if (active)
         {
@@ -2785 +2792 @@
                 const AxisAlignedBox3 bbox = GetBoundingBox(node);
 
-                if (Overlap(bbox, box)) {
-                  if (node->IsLeaf())
-                        {
-                          VspLeaf *leaf = static_cast<VspLeaf *>(node);
-                          
-                          if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
+                if (Overlap(bbox, box)) 
+                {
+                        if (node->IsLeaf())
+                        {
+                                VspLeaf *leaf = static_cast<VspLeaf *>(node);
+
+                                if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
                                 {
-                                  leaf->GetViewCell()->Mail();
-                                  viewCells.push_back(leaf->GetViewCell());
+                                        leaf->GetViewCell()->Mail();
+                                        viewCells.push_back(leaf->GetViewCell());
                                 }
                         }
-                  else 
-                        {
-                          VspInterior *interior = static_cast<VspInterior *>(node);
-                          
-                          VspNode *first = interior->GetFront();
-                          VspNode *second = interior->GetBack();
-                          
-                          nodeStack.push(first);
-                          nodeStack.push(second);
+                        else 
+                        {
+                                VspInterior *interior = static_cast<VspInterior *>(node);
+
+                                VspNode *first = interior->GetFront();
+                                VspNode *second = interior->GetBack();
+
+                                nodeStack.push(first);
+                                nodeStack.push(second);
                         }
                 }
@@ -2852 +2860 @@
 void VspTree::GetViewCells(const VssRay &ray, ViewCellContainer &viewCells)
 {
+        mViewCellsTimer.Entry();
+        
         static Ray hray;
         hray.Init(ray);
@@ -2863 +2873 @@
         const Vector3 termination = hray.Extrap(tmax);
 
-        // view cells were not precomputed
-        // don't mail because we need mailboxing for something else
+        // view cells were not precomputed and are extracted on the fly
+        // don't mail because the same view cells can be found for different rays
         CastLineSegment(origin, termination, viewCells, false);
+
+        mViewCellsTimer.Exit();
 }