Changeset 5233 in orxonox.OLD

Timestamp:

Sep 24, 2005, 1:17:18 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: filled some other memory leaks with safer code

Location:

trunk/src/lib/graphics/spatial_separation

Files:

• quadtree.cc (modified) (2 diffs)
• quadtree_node.cc (modified) (3 diffs)

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

@@ -82 +82 @@
 {
   // delete what has to be deleted here
-  delete [] this->nodes;
   if (this->materials != NULL)
   {
@@ -90 +89 @@
   }
 
+  delete this->offset;
+
   delete this->rootNode;
-  delete offset;
+  //delete [] this->nodes;
 }
 

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

@@ -128 +128 @@
 QuadtreeNode::~QuadtreeNode ()
 {
-  if( this->nodeA != NULL)
+  if( this->nodeA)
     delete this->nodeA;
-  if( this->nodeB != NULL)
+  if( this->nodeB)
     delete this->nodeB;
-  if( this->nodeC != NULL)
+  if( this->nodeC)
     delete this->nodeC;
-  if( this->nodeD != NULL)
+  if( this->nodeD)
     delete this->nodeD;
+
+  if( this->nodes)
+    delete [] this->nodes;
 
   if( this->pTriangles)
@@ -247 +250 @@
   lenD = listD->getSize();
 
-  pTriA = new sTriangleExt*[listA->getSize()];
-  pTriB = new sTriangleExt*[listB->getSize()];
-  pTriC = new sTriangleExt*[listC->getSize()];
-  pTriD = new sTriangleExt*[listD->getSize()];
+  pTriA = new sTriangleExt*[lenA];
+  pTriB = new sTriangleExt*[lenB];
+  pTriC = new sTriangleExt*[lenC];
+  pTriD = new sTriangleExt*[lenD];
 
   counter = 0;
@@ -315 +318 @@
   v.z = this->pDimension->getCenter().z + this->pDimension->getAxis() / 2.0f;
   rA = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
+
   v.z = this->pDimension->getCenter().z - this->pDimension->getAxis() / 2.0f;
   rB = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
+
   v.x = this->pDimension->getCenter().x - this->pDimension->getAxis() / 2.0f;
   rC = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
+
   v.z = this->pDimension->getCenter().z + this->pDimension->getAxis() / 2.0f;
   rD = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
+
 
   /* now create the new nodes  */