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

Timestamp:

11/09/06 19:41:31 (18 years ago)

Author:

bittner

Message:

visibility filter updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (1 diff)

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

@@ -2421 +2421 @@
 void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
 {
-        stack<BvhNode *> nodeStack;
-
-        nodeStack.push(mRoot);
-
-        while (!nodeStack.empty()) 
-        {
-                BvhNode *node = nodeStack.top();
-
-                nodeStack.pop();
-
-                if (node->IsLeaf()) 
-                {
-                        BvhLeaf *leaf = (BvhLeaf *)node;
-
-                        ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
-
-                        for (oit = leaf->mObjects.begin(); oit != oit_end; ++oit) 
-                        {
-                                Intersectable *object = *oit;
-                                if (Overlap(box, object->GetBox())) 
-                                {
-                                        object->Mail();
-                                        objects.push_back(object);
-                                }
+  stack<BvhNode *> nodeStack;
+
+  nodeStack.push(mRoot);
+
+  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;
-
-                        if (Overlap(box, interior->GetBoundingBox()))
-                                nodeStack.push(interior->GetFront());
-
-                        if (Overlap(box, interior->GetBoundingBox()))
-                                nodeStack.push(interior->GetBack());
-                }
-        }
-}
-
-}
+          else 
+                {
+                  BvhInterior *interior = (BvhInterior *)node;
+                  
+                  if (Overlap(box, interior->GetBoundingBox()))
+                        nodeStack.push(interior->GetFront());
+                  
+                  if (Overlap(box, interior->GetBoundingBox()))
+                        nodeStack.push(interior->GetBack());
+                }
+        }
+}
+
+}