Changeset 4854 in orxonox.OLD

Timestamp:

Jul 13, 2005, 10:38:31 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: temp removed the spatial separation structures from the loading procedure since it caused a segfault

Location:

orxonox/trunk/src

Files:

• lib/graphics/spatial_separation/quadtree_node.cc (modified) (2 diffs)
• lib/graphics/spatial_separation/spatial_separation.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -138 +138 @@
   tIterator<sTriangleExt*>*      iterator;                              //!< iterator for the list iterations
   sTriangleExt*                  tempTri;                               //!< temp save place for triangle pointer
+  int                            counter;                               //!< counter for the while loops
 
   lenA = listA->getSize();
@@ -150 +151 @@
 
 
+  counter = 0;
   iterator = listA->getIterator();
-
-
+  tempTri = *iterator->nextElement();
+  while( tempTri)
+    {
+      pTriA[counter] = tempTri;
+      tempTri = *iterator->nextElement();
+      ++counter;
+    }
+
+  counter = 0;
+  iterator = listB->getIterator();
+  tempTri = *iterator->nextElement();
+  while( tempTri)
+    {
+      pTriB[counter] = tempTri;
+      tempTri = *iterator->nextElement();
+      ++counter;
+    }
+  
+  counter = 0;
+  iterator = listC->getIterator();
+  tempTri = *iterator->nextElement();
+  while( tempTri)
+    {
+      pTriC[counter] = tempTri;
+      tempTri = *iterator->nextElement();
+      ++counter;
+    }
+
+  counter = 0;
+  iterator = listD->getIterator();
+  tempTri = *iterator->nextElement();
+  while( tempTri)
+    {
+      pTriD[counter] = tempTri;
+      tempTri = *iterator->nextElement();
+      ++counter;
+    }
 
   PRINTF(0)("separation complete\n");

orxonox/trunk/src/lib/graphics/spatial_separation/spatial_separation.cc

@@ -97 +97 @@
 {
   this->quadtree = new Quadtree(model->getModelInfo());
-  this->quadtree->separate();
-
+  //this->quadtree->separate();
 
   return this->quadtree;

orxonox/trunk/src/world_entities/terrain.cc

@@ -39 +39 @@
   this->loadParams(root);
 
-  SpatialSeparation* ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
-  delete ssp;
+  //SpatialSeparation* ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+  //delete ssp;
 }