Changeset 1122

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• KdTree.cpp (modified) (3 diffs)
• KdTree.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)
• VspOspTree.cpp (modified) (4 diffs)
• VspOspTree.h (modified) (1 diff)

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);
-                }
-        }
-        
-}
-
-
-}
+}

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

@@ -541 +541 @@
 
 
-  /** does some post processing on the objects in the new child leaves.
-  */
-  void ProcessLeafObjects(KdLeaf *parent, KdLeaf *front, KdLeaf *back) const;
-
   int mTermMaxNodes;
   float mSplitBorder;

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

@@ -2695 +2695 @@
         }
         
-        // only for debugging: test valitidy
-        TestSubdivision();
+        // only for debugging purpose: test if the subdivision is valid
+        if (0) TestSubdivision();
 
         mColorCode = savedColorCode;
@@ -3946 +3946 @@
 
         // only for debugging purpose: test if the subdivision is valid
-        TestSubdivision();
+        if (0) TestSubdivision();
 
         //-- refines the merged view cells
@@ -4901 +4901 @@
         long startTime;
 
-        mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
-
+        //mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
+        mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
         
         //-- stats

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

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

@@ -1439 +1439 @@
                                           ObjectContainer &back);
 
-        void ProcessLeafObjects(KdLeaf *leaf, KdLeaf *parent) const;
+         /** does some post processing on the objects in the new child leaves.
+         */
+        void ProcessLeafObjects(KdLeaf *parent, KdLeaf *front, KdLeaf *back) const;
 
         /** Selects an axis aligned for the next split.