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

Timestamp:

07/12/06 01:30:05 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -91 +91 @@
         mBox.Include((*mi)->GetBox());
   }
-
-        ProcessLeafObjects(NULL, leaf, NULL);
 
   cout <<"KdTree Root Box:"<<mBox<<endl;
@@ -307 +305 @@
     mStat.objectRefs += objectsBack + objectsFront;
   }
-  
-   ProcessLeafObjects(leaf, front, back);
-  
 
   delete leaf;
@@ -1094 +1089 @@
 
 
-void KdTree::ProcessLeafObjects(KdLeaf *parent, KdLeaf *front, KdLeaf *back) const
-{
-        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);
-
-                        // remove parent leaf
-                        if (kdit != object->mKdLeaves.end())
-                                object->mKdLeaves.erase(kdit);
-                }
-        }
-
-        //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);
-                }
-        }
-        
-}
-
-
-}
+}