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

Timestamp:

07/06/06 16:22:15 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -92 +92 @@
   }
 
-        ProcessLeafObjects(leaf, NULL);
+        ProcessLeafObjects(NULL, leaf, NULL);
 
   cout <<"KdTree Root Box:"<<mBox<<endl;
@@ -308 +308 @@
   }
   
-   ProcessLeafObjects(back, leaf);
-    ProcessLeafObjects(front, leaf);
+   ProcessLeafObjects(leaf, front, back);
+  
 
   delete leaf;
   return node;
 }
-
 
 
@@ -1095 +1094 @@
 
 
-void KdTree::ProcessLeafObjects(KdLeaf *leaf, KdLeaf *parent) const
-{
-        ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
-
-        for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
+void KdTree::ProcessLeafObjects(KdLeaf *parent, KdLeaf *front, KdLeaf *back) const
+{
+        if (parent)
         {
-                Intersectable *object = *oit;
-
-                if (parent)
+                // remove the parents from the set
+                ObjectContainer::const_iterator oit, oit_end = parent->mObjects.end();
+
+                for (oit = parent->mObjects.begin(); oit != oit_end; ++ oit)
                 {
+                        Intersectable *object = *oit;
+
                         set<KdLeaf *>::iterator kdit = object->mKdLeaves.find(parent);
 
@@ -1111 +1111 @@
                                 object->mKdLeaves.erase(kdit);
                 }
-
-                object->mKdLeaves.insert(leaf);
-
-                if (object->mKdLeaves.size() > 1)
-                        leaf->mMultipleObjects.push_back(object);
         }
-}
-
-
-}
+
+        //Intersectable::NewMail();
+
+        if (front)
+        {
+                // Add front to leaf kd cells
+                ObjectContainer::const_iterator oit, oit_end = front->mObjects.end();
+
+                for (oit = front->mObjects.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *object = *oit;
+                        object->mKdLeaves.insert(front);
+                }
+        }
+
+        if (back)
+        {
+                // Add back to leaf kd cells
+                ObjectContainer::const_iterator oit, oit_end = back->mObjects.end();
+
+                for (oit = back->mObjects.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *object = *oit;
+                        object->mKdLeaves.insert(back); 
+                }
+        }
+
+        // note: can find out about multiple objects only now after adding and deleting
+        // finished 
+        if (front)
+        {
+                // find objects from multiple kd-leaves
+                ObjectContainer::const_iterator oit, oit_end = front->mObjects.end();
+
+                for (oit = front->mObjects.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *object = *oit;
+
+                        if (object->mKdLeaves.size() > 1)
+                                front->mMultipleObjects.push_back(object);
+                }
+        }
+
+        if (back) 
+        {
+                // find objects from multiple kd-leaves
+                ObjectContainer::const_iterator oit, oit_end = back->mObjects.end();
+
+                for (oit = back->mObjects.begin(); oit != oit_end; ++ oit)
+                {
+                        Intersectable *object = *oit;
+
+                        if (object->mKdLeaves.size() > 1)
+                                back->mMultipleObjects.push_back(object);
+                }
+        }
+        
+}
+
+
+}