Changeset 2015 for GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

Timestamp:

01/22/07 20:25:06 (17 years ago)

Author:

bittner

Message:

pvs efficiency tuning

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp (modified) (2 diffs)

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

@@ -744 +744 @@
 {
         int hits = 0;
-
         float mint = 0.0f, maxt = 1.0f;
         const Vector3 dir = termination - origin;
@@ -765 +764 @@
         while (1)
         {
-                if (!node->IsLeaf())
+          if (!node->IsLeaf()) {
+                KdInterior *in = (KdInterior *)node;
+                position = in->mPosition;
+                axis = in->mAxis;
+                
+                if (entp[axis] <= position)
+                  {
+                        if (extp[axis] <= position)
+                          {
+                                node = in->mBack;
+                                // cases N1,N2,N3,P5,Z2,Z3
+                                continue;
+                          } 
+                        else
+                          {
+                                // case N4
+                                node = in->mBack;
+                                farChild = in->mFront;
+                          }
+                  }
+                else
+                  {
+                        if (position <= extp[axis])
+                          {
+                                node = in->mFront;
+                                // cases P1,P2,P3,N5,Z1
+                                continue;
+                          }
+                        else
+                          {
+                                node = in->mFront;
+                                farChild = in->mBack;
+                                // case P4
+                          }
+                  }
+                
+                // $$ modification 3.5.2004 - hints from Kamil Ghais
+                // case N4 or P4
+                float tdist = (position - origin[axis]) / dir[axis];
+                //tStack.push(RayTraversalData(farChild, extp, maxt)); //TODO
+                extp = origin + dir * tdist;
+                maxt = tdist;
+          }
+          else
                 {
-                        KdInterior *in = (KdInterior *)node;
-                        position = in->mPosition;
-                        axis = in->mAxis;
-
-                        if (entp[axis] <= position)
-                        {
-                                if (extp[axis] <= position)
-                                {
-                                        node = in->mBack;
-                                        // cases N1,N2,N3,P5,Z2,Z3
-                                        continue;
-                                } 
-                                else
-                                {
-                                        // case N4
-                                        node = in->mBack;
-                                        farChild = in->mFront;
-                                }
-                        }
-                        else
-                        {
-                                if (position <= extp[axis])
-                                {
-                                        node = in->mFront;
-                                        // cases P1,P2,P3,N5,Z1
-                                        continue;
-                                }
-                                else
-                                {
-                                        node = in->mFront;
-                                        farChild = in->mBack;
-                                        // case P4
-                                }
-                        }
-
-                        // $$ modification 3.5.2004 - hints from Kamil Ghais
-                        // case N4 or P4
-                        float tdist = (position - origin[axis]) / dir[axis];
-                        //tStack.push(RayTraversalData(farChild, extp, maxt)); //TODO
-                        extp = origin + dir * tdist;
-                        maxt = tdist;
-                }
-                else
-                {
-                        // compute intersection with all objects in this leaf
+                  // compute intersection with all objects in this leaf
                   KdLeaf *leaf = (KdLeaf *)node;
-
-                        // add view cell to intersections
-                        ViewCell *vc = leaf->mViewCell;
-
-                        if (!vc->Mailed())
-                        {
-                                vc->Mail();
-                                viewcells.push_back(vc);
-                                ++ hits;
-                        }
-
-                        // get the next node from the stack
-                        if (tStack.empty())
-                                break;
-
-                        entp = extp;
-                        mint = maxt;
-                        
-                        RayTraversalData &s  = tStack.top();
-                        node = s.mNode;
-                        extp = s.mExitPoint;
-                        maxt = s.mMaxT;
-                        tStack.pop();
+                  
+                  // add view cell to intersections
+                  ViewCell *vc = leaf->mViewCell;
+                  
+                  if (!vc->Mailed()) {
+                        vc->Mail();
+                        viewcells.push_back(vc);
+                        ++ hits;
+                  }
+                  
+                  // get the next node from the stack
+                  if (tStack.empty())
+                        break;
+                  
+                  entp = extp;
+                  mint = maxt;
+                  
+                  RayTraversalData &s  = tStack.top();
+                  node = s.mNode;
+                  extp = s.mExitPoint;
+                  maxt = s.mMaxT;
+                  tStack.pop();
                 }
         }
-
+        
         return hits;
 }