Changeset 4855 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 13, 2005, 11:27:44 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: reimplemented the array creation process, now there are no more segfaults

Location:

orxonox/trunk/src

Files:

• lib/graphics/spatial_separation/quadtree_node.cc (modified) (8 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

@@ -55 +55 @@
 void QuadtreeNode::init()
 {
-  PRINTF(0)("Creating QuadtreeNode\n");
   this->setClassID(CL_QUADTREE_NODE, "QuadtreeNode");
 
@@ -125 +124 @@
   printf("Temp. list Num. o El: A: %i, B: %i, C: %i, D: %i\n", listA->getSize(), listB->getSize(), listC->getSize(), listD->getSize());
 
-
   
   /* Separating into to the triangle lists  */
@@ -137 +135 @@
   float                          lenD;                                  //!< length array D
   tIterator<sTriangleExt*>*      iterator;                              //!< iterator for the list iterations
-  sTriangleExt*                  tempTri;                               //!< temp save place for triangle pointer
+  sTriangleExt**                 tempTri;                               //!< temp save place for triangle pointer
   int                            counter;                               //!< counter for the while loops
 
@@ -153 +151 @@
   counter = 0;
   iterator = listA->getIterator();
-  tempTri = *iterator->nextElement();
-  while( tempTri)
-    {
-      pTriA[counter] = tempTri;
-      tempTri = *iterator->nextElement();
+  tempTri = iterator->nextElement();
+  while( tempTri)
+    {
+      pTriA[counter] = *tempTri;
+      tempTri = iterator->nextElement();
       ++counter;
     }
@@ -163 +161 @@
   counter = 0;
   iterator = listB->getIterator();
-  tempTri = *iterator->nextElement();
-  while( tempTri)
-    {
-      pTriB[counter] = tempTri;
-      tempTri = *iterator->nextElement();
+  tempTri = iterator->nextElement();
+  while( tempTri)
+    {
+      pTriB[counter] = *tempTri;
+      tempTri = iterator->nextElement();
       ++counter;
     }
@@ -173 +171 @@
   counter = 0;
   iterator = listC->getIterator();
-  tempTri = *iterator->nextElement();
-  while( tempTri)
-    {
-      pTriC[counter] = tempTri;
-      tempTri = *iterator->nextElement();
+  tempTri = iterator->nextElement();
+  while( tempTri)
+    {
+      pTriC[counter] = *tempTri;
+      tempTri = iterator->nextElement();
       ++counter;
     }
@@ -183 +181 @@
   counter = 0;
   iterator = listD->getIterator();
-  tempTri = *iterator->nextElement();
-  while( tempTri)
-    {
-      pTriD[counter] = tempTri;
-      tempTri = *iterator->nextElement();
+  tempTri = iterator->nextElement();
+  while( tempTri)
+    {
+      pTriD[counter] = *tempTri;
+      tempTri = iterator->nextElement();
       ++counter;
     }
@@ -241 +239 @@
 
   PRINTF(0)("Dimension Informationation: X: min/max %f/%f Y: min/max %f/%f\n", minX, maxX, minY, maxY);
-  PRINTF(0)("Center: %f,%f   Axis: %f\n", rect->getCenter()->x, rect->getCenter()->y, rect->getCenter()->z, rect->getAxis());
+  PRINTF(0)("Center: %f, %f, %f   Axis: %f\n", rect->getCenter()->x, rect->getCenter()->y, rect->getCenter()->z, rect->getAxis());
   return rect;
 }

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;
+}
+
 
 /**