Changeset 7732 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

May 19, 2006, 4:32:27 PM (19 years ago)

Author:

patrick

Message:

orxonox: removed a memory leak

Location:

trunk/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (2 diffs)
• model.cc (modified) (1 diff)
• static_model.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/md2Model.cc

@@ -125 +125 @@
 MD2Model::~MD2Model()
 {
+  this->pModelInfo.pVertices = NULL;
+  this->pModelInfo.pNormals = NULL;
+  this->pModelInfo.pTexCoor = NULL;
+  this->pModelInfo.pTriangles = NULL;
+
   ResourceManager::getInstance()->unload(this->data);
 }
@@ -408 +413 @@
   delete [] this->pLightNormals;
   delete [] this->pTexCoor;
-
 }
 

trunk/src/lib/graphics/importer/model.cc

@@ -45 +45 @@
 */
 Model::~Model()
-{ }
+{
+  if( this->pModelInfo.pVertices != NULL)
+    delete [] this->pModelInfo.pVertices;
+
+  if( this->pModelInfo.pTriangles != NULL)
+    delete [] this->pModelInfo.pTriangles;
+
+  if( this->pModelInfo.pNormals != NULL)
+    delete [] this->pModelInfo.pNormals;
+
+  if( this->pModelInfo.pTexCoor != NULL)
+    delete [] this->pModelInfo.pTexCoor;
+}
 
 

trunk/src/lib/graphics/importer/static_model.cc

@@ -185 +185 @@
     delete (*modMat);
   }
+
+  // mark this stuff as beeing deleted
+  this->pModelInfo.pVertices = NULL;
+  this->pModelInfo.pNormals = NULL;
+  this->pModelInfo.pTexCoor = NULL;
 }