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

Timestamp:

01/19/08 05:28:24 (16 years ago)

Author:

mattausch

Message:

did some stuff for the visualization

File:

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

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

@@ -1372 +1372 @@
 bool KdTree::ImportBinTree(const string &filename, ObjectContainer &objects)
 {
-  // export binary version of mesh
-  queue<TraversalData> tStack;
-  IN_STREAM stream(filename.c_str(), IN_BIN_MODE);
-  
-  if (!stream.is_open()) return false;
-  
-  // sort objects by their id
-  //    if (!is_sorted(objects.begin(), objects.end(), ilt))
-  sort(objects.begin(), objects.end(), ilt);
-  
-  mBox.Initialize();
-  ObjectContainer::const_iterator oit, oit_end = objects.end();
-  
-  ///////////////////////////
-  //-- compute bounding box of object space
-  
-  for (oit = objects.begin(); oit != oit_end; ++ oit)
-  {
-    const AxisAlignedBox3 box = (*oit)->GetBox();
-    mBox.Include(box);
-  }
-  
-  // hack: we make a new root
-  DEL_PTR(mRoot);
-  
-  mRoot = ImportNextNode(stream, NULL, objects);
-  
-  tStack.push(TraversalData(mRoot, mBox, 0));
-  mStat.Reset();
-  mStat.nodes = 1;
-  
-  while(!tStack.empty())
-  {
-    TraversalData tData = tStack.front();
-    tStack.pop();
-    
-    KdNode *node = tData.mNode;
-    
-    if (!node->IsLeaf())
-    {
-      mStat.nodes += 2;
-      
-      //Debug << "i" ;
-      KdInterior *interior = static_cast<KdInterior *>(node);
-      interior->mBox = tData.mBox;
-      
-      KdNode *front = ImportNextNode(stream, interior, objects);
-      KdNode *back = ImportNextNode(stream, interior, objects);
-      
-      interior->SetupChildLinks(back, front);
-      
-      ++ mStat.splits[interior->mAxis];
-      
-      // compute new bounding box
-      AxisAlignedBox3 frontBox, backBox;
-      
-      tData.mBox.Split(interior->mAxis, 
-                       interior->mPosition, 
-                       frontBox, 
-                       backBox);
-      
-      tStack.push(TraversalData(front, frontBox, tData.mDepth + 1));                    
-      tStack.push(TraversalData(back, backBox, tData.mDepth + 1));
-    }
-    else
-    {
-      EvaluateLeafStats(tData);
-      //cout << "l";
-    }
-  }
-
-  float area = GetBox().SurfaceArea()*mKdPvsArea;
-  
-  SetPvsTerminationNodes(area);
-  
-  Debug << mStat << endl;
-  
-  return true;
+        // export binary version of mesh
+        queue<TraversalData> tStack;
+        IN_STREAM stream(filename.c_str(), IN_BIN_MODE);
+
+        if (!stream.is_open()) return false;
+
+        // sort objects by their id
+        //      if (!is_sorted(objects.begin(), objects.end(), ilt))
+        sort(objects.begin(), objects.end(), ilt);
+
+        mBox.Initialize();
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        ///////////////////////////
+        //-- compute bounding box of object space
+
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                const AxisAlignedBox3 box = (*oit)->GetBox();
+                mBox.Include(box);
+        }
+
+        // hack: we make a new root
+        DEL_PTR(mRoot);
+
+        mRoot = ImportNextNode(stream, NULL, objects);
+
+        tStack.push(TraversalData(mRoot, mBox, 0));
+        mStat.Reset();
+        mStat.nodes = 1;
+
+        while(!tStack.empty())
+        {
+                TraversalData tData = tStack.front();
+                tStack.pop();
+
+                KdNode *node = tData.mNode;
+
+                if (!node->IsLeaf())
+                {
+                        mStat.nodes += 2;
+
+                        //Debug << "i" ;
+                        KdInterior *interior = static_cast<KdInterior *>(node);
+                        interior->mBox = tData.mBox;
+
+                        KdNode *front = ImportNextNode(stream, interior, objects);
+                        KdNode *back = ImportNextNode(stream, interior, objects);
+
+                        interior->SetupChildLinks(back, front);
+
+                        ++ mStat.splits[interior->mAxis];
+
+                        // compute new bounding box
+                        AxisAlignedBox3 frontBox, backBox;
+
+                        tData.mBox.Split(interior->mAxis, 
+                                interior->mPosition, 
+                                frontBox, 
+                                backBox);
+
+                        tStack.push(TraversalData(front, frontBox, tData.mDepth + 1));                  
+                        tStack.push(TraversalData(back, backBox, tData.mDepth + 1));
+                }
+                else
+                {
+                        EvaluateLeafStats(tData);
+                        //cout << "l";
+                }
+        }
+
+        float area = GetBox().SurfaceArea()*mKdPvsArea;
+
+        SetPvsTerminationNodes(area);
+
+        Debug << mStat << endl;
+
+        return true;
 }
 
@@ -1456 +1456 @@
 KdTree::GetOrCreateKdIntersectable(KdNode *node)
 {
-  if (node == NULL)
-    return NULL;
+        if (node == NULL)
+                return NULL;
 
         if (node->mIntersectable == NULL) 
@@ -1465 +1465 @@
                 KdIntersectable *kdObj = new KdIntersectable(node, GetBox(node));
                 node->mIntersectable = kdObj;
-                
+
                 mKdIntersectables.push_back(kdObj);
                 kdObj->SetId(id);
 #ifdef USE_BIT_PVS
-    // hack: for kd pvs the kd intersecables are the pvs objects
-    ObjectPvsIterator::sObjects.push_back(kdObj);
+                // hack: for kd pvs the kd intersecables are the pvs objects
+                ObjectPvsIterator::sObjects.push_back(kdObj);
 #endif
-  }
-
-  return node->mIntersectable;
+        }
+
+        return node->mIntersectable;
 }
 
@@ -1519 +1519 @@
 }
 
+
+/*KdNode *
+KdTree::GetPvsNode(const Triangle3 &tri) 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;
+  }
+
+  return node;
+}*/
+
+
+
 KdNode *
 KdTree::GetPvsNode(const Vector3 &point) const
@@ -1561 +1581 @@
   
   while (!tStack.empty())
-    {
-      KdNode *node = tStack.top();
-      tStack.pop();
-      
-      if (node->IsLeaf())
-        {
-          leaves.push_back(static_cast<KdLeaf *>(node));
-        }
-      else // interior
-        {
-          KdInterior *interior = static_cast<KdInterior *>(node);
-          
-          if (box.Max(interior->mAxis) >= interior->mPosition)
-            {
-              tStack.push(interior->mFront);
-            }
-          
-          if (box.Min(interior->mAxis) < interior->mPosition)
-            {
-              tStack.push(interior->mBack);
-            }
-        }
-    }
-}
-
-
-
-}
+  {
+          KdNode *node = tStack.top();
+          tStack.pop();
+
+          if (node->IsLeaf())
+          {
+                  leaves.push_back(static_cast<KdLeaf *>(node));
+          }
+          else // interior
+          {
+                  KdInterior *interior = static_cast<KdInterior *>(node);
+
+                  if (box.Max(interior->mAxis) >= interior->mPosition)
+                  {
+                          tStack.push(interior->mFront);
+                  }
+
+                  if (box.Min(interior->mAxis) < interior->mPosition)
+                  {
+                          tStack.push(interior->mBack);
+                  }
+          }
+  }
+}
+
+
+
+}