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

Timestamp:

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

Author:

mattausch

Message:

 

File:

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

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

@@ -2826 +2826 @@
         SplitObjects(splitPlane, leaf->mObjects, front->mObjects, back->mObjects);
 
-        ProcessLeafObjects(back, leaf);
-    ProcessLeafObjects(front, leaf);
-  
+        ProcessLeafObjects(leaf, front, back);
+    
         backData.mNode = back;
         frontData.mNode = front;
@@ -3408 +3407 @@
 
 
-void OspTree::ProcessLeafObjects(KdLeaf *leaf, KdLeaf *parent) const
-{
-        ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
-
-        for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
-        {
-                Intersectable *object = *oit;
-
-                if (parent)
-                {
+void OspTree::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);
 
@@ -3424 +3424 @@
                                 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);
+                }
+        }
+        
 }
 
@@ -3702 +3754 @@
 
                 
-        mOspTree.ProcessLeafObjects(kdleaf, NULL);
+        mOspTree.ProcessLeafObjects(NULL, kdleaf, NULL);
 
         // compute first split candidate