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

Timestamp:

05/21/08 01:18:40 (16 years ago)

Author:

mattausch

Message:

fixed several errors

File:

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

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

@@ -1077 +1077 @@
       KdInterior *interior = (KdInterior *)node;
           
-      if ( box.Max()[interior->mAxis] > interior->mPosition )
+      if ( box.Max()[interior->mAxis] >= interior->mPosition )
         nodeStack.push(interior->mFront);
       
-      if (box.Min()[interior->mAxis] < interior->mPosition)
+      if (box.Min()[interior->mAxis] <= interior->mPosition)
         nodeStack.push(interior->mBack);
     }
@@ -1155 +1155 @@
 
 
-void KdTree::CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects)
+void KdTree::CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects) const
 {
         stack<KdNode *> nodeStack;
@@ -1778 +1778 @@
 }
 
+
+KdNode *
+KdTree::GetPvsNodeCheck(const Vector3 &point, Intersectable *obj) const
+{
+  KdNode *node = mRoot;
+  
+  while (node->mPvsTermination == 0 ) {
+    KdInterior *inter = (KdInterior *)node;
+    if (point[inter->mAxis] < inter->mPosition)
+      node = inter->mBack;
+    else
+      node = inter->mFront;
+  }
+  
+  ObjectContainer objects;
+  CollectObjectsWithDublicates(node, objects);
+
+  ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+  bool found = false;
+  for (oit = objects.begin(); oit != oit_end; ++ oit)
+  {
+          if ((*oit)->GetId() == obj->GetId())
+                  found = true;
+  }
+
+  if (!found) return NULL;
+
+  return node;
+}
+
 KdNode *
 KdTree::GetNode(const Vector3 &point,