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

Timestamp:

11/15/06 14:56:00 (18 years ago)

Author:

bittner

Message:

pvs updates

File:

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

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

@@ -2424 +2424 @@
 
 
-void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box,
+                                                                 ObjectContainer &objects)
 {
   stack<BvhNode *> nodeStack;
@@ -2430 +2431 @@
   nodeStack.push(mRoot);
 
-  while (!nodeStack.empty()) 
-        {
-          BvhNode *node = nodeStack.top();
+  while (!nodeStack.empty()) {
+        BvhNode *node = nodeStack.top();
+        
+        nodeStack.pop();
+        
+        if (node->IsLeaf()) {
+          BvhLeaf *leaf = (BvhLeaf *)node;
+          if (Overlap(box, leaf->GetBoundingBox())) {
+                Intersectable *object = GetOrCreateBvhIntersectable(leaf);
+                if (!object->Mailed()) {
+                  object->Mail();
+                  objects.push_back(object);
+                }
+          }
+        } 
+        else  {
+          BvhInterior *interior = (BvhInterior *)node;
           
-          nodeStack.pop();
+          if (Overlap(box, interior->GetBoundingBox()))
+                nodeStack.push(interior->GetFront());
           
-          if (node->IsLeaf()) 
-                {
-                  BvhLeaf *leaf = (BvhLeaf *)node;
-                  if (Overlap(box, leaf->GetBoundingBox())) {
-                        Intersectable *object = GetOrCreateBvhIntersectable(leaf);
-                        if (!object->Mailed()) {
-                          object->Mail();
-                          objects.push_back(object);
-                        }
-                  }
-                } 
-          else 
-                {
-                  BvhInterior *interior = (BvhInterior *)node;
-                  
-                  if (Overlap(box, interior->GetBoundingBox()))
-                        nodeStack.push(interior->GetFront());
-                  
-                  if (Overlap(box, interior->GetBoundingBox()))
-                        nodeStack.push(interior->GetBack());
-                }
-        }
-}
-
-}
+          if (Overlap(box, interior->GetBoundingBox()))
+                nodeStack.push(interior->GetBack());
+        }
+  }
+}
+
+}