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

Timestamp:

05/14/08 19:06:06 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp (modified) (1 diff)

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

@@ -1477 +1477 @@
 
 KdLeaf *KdTree::ImportBinLeaf(IN_STREAM &stream, 
-                              KdInterior *parent,
-                              const ObjectContainer &objects)
-{
-  int leafId = TYPE_LEAF;
-  int objId = leafId;
-  int size;
-  
-  stream.read(reinterpret_cast<char *>(&size), sizeof(int));
-  KdLeaf *leaf = new KdLeaf(parent, size);
-
-  MeshInstance dummyInst(NULL);
-        
-  // read object ids
-  // note: this can also be done geometrically
-  for (int i = 0; i < size; ++ i)
-    {   
-      stream.read(reinterpret_cast<char *>(&objId), sizeof(int));
-      dummyInst.SetId(objId);
-      
-      ObjectContainer::const_iterator oit =
-        lower_bound(objects.begin(), objects.end(), (Intersectable *)&dummyInst, ilt);
-      
-      if ((oit != objects.end()) && ((*oit)->GetId() == objId))
-        leaf->mObjects.push_back(*oit);
-      else
-        Debug << "error: object with id " << objId << " does not exist" << endl;
-    }
-  
-  return leaf;
+                                                          KdInterior *parent,
+                                                          const ObjectContainer &objects)
+{
+        int leafId = TYPE_LEAF;
+        int objId = leafId;
+        int size;
+
+        stream.read(reinterpret_cast<char *>(&size), sizeof(int));
+        KdLeaf *leaf = new KdLeaf(parent, size);
+
+        MeshInstance dummyInst(NULL);
+
+        // read object ids
+        // note: this can also be done geometrically
+        for (int i = 0; i < size; ++ i)
+        {       
+                stream.read(reinterpret_cast<char *>(&objId), sizeof(int));
+                dummyInst.SetId(objId);
+
+                ObjectContainer::const_iterator oit =
+                        lower_bound(objects.begin(), objects.end(), (Intersectable *)&dummyInst, ilt);
+
+                if ((oit != objects.end()) && ((*oit)->GetId() == objId))
+                        leaf->mObjects.push_back(*oit);
+                else
+                        Debug << "error: object with id " << objId << " does not exist" << endl;
+        }
+
+        return leaf;
 }