Changeset 5232 in orxonox.OLD

Timestamp:

Sep 24, 2005, 12:37:39 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: solved a memory leak in the QuadtreeNode

Location:

trunk/src/lib

Files:

• graphics/spatial_separation/quadtree_node.cc (modified) (6 diffs)
• math/curve.cc (modified) (3 diffs)

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

@@ -38 +38 @@
 {
   /* save all important variables localy */
+  this->numTriangles = numTriangles;
   this->pTriangles = triangles;
-  this->numTriangles = numTriangles;
+  this->numVertices = numVertices;
   this->pVertices = pVertices;
-  this->numVertices = numVertices;
+
   this->quadtree = quadtree;
   this->parent = parent;
@@ -260 +261 @@
     ++counter;
   }
+  delete iterator;
+
   counter = 0;
   iterator = listB->getIterator();
@@ -269 +272 @@
     ++counter;
   }
+  delete iterator;
+
   counter = 0;
   iterator = listC->getIterator();
@@ -278 +283 @@
     ++counter;
   }
+  delete iterator;
+
   counter = 0;
   iterator = listD->getIterator();
@@ -287 +294 @@
     ++counter;
   }
+  delete iterator;
 
   /* now do cleanup */
@@ -293 +301 @@
   delete listC;
   delete listD;
-  delete iterator;
 
 

trunk/src/lib/math/curve.cc

@@ -64 +64 @@
   if (dirCurve)
     delete dirCurve;
-
 }
 
@@ -203 +202 @@
 
   // rebuilding the Curve itself
-  float k=0;
+  float k = 0;
   float n = nodeCount -1;
   float binCoef = 1;
-  while(tmpNode)
+  while( tmpNode)
     {
       tmpNode->factor = binCoef;
-      if (tmpNode =tmpNode->next)
+      if( tmpNode = tmpNode->next)
         {
-          binCoef *=(n-k)/(k+1);
+          binCoef *= (n-k) / (k+1);
           ++k;
         }
@@ -217 +216 @@
 
   // rebuilding the Derivation curve
-  if(this->derivation <= 1)
+  if( this->derivation <= 1)
     {
       tmpNode = firstNode;
       delete dirCurve;
       dirCurve = new BezierCurve(1);
-      while(tmpNode->next)
+      while( tmpNode->next)
         {
-          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
+          Vector tmpVector = (tmpNode->next->position) - (tmpNode->position);
           tmpVector.x*=(float)nodeCount;
           tmpVector.y*=(float)nodeCount;