Changeset 2847 in orxonox.OLD for orxonox

Timestamp:

Nov 13, 2004, 12:12:33 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: implemented destructors of Class Array and Class Material… working

Location:

orxonox/trunk/importer

Files:

• array.cc (modified) (1 diff)
• array.h (modified) (1 diff)
• framework.cc (modified) (1 diff)
• material.cc (modified) (1 diff)
• object.cc (modified) (5 diffs)

orxonox/trunk/importer/array.cc

@@ -22 +22 @@
 {
   initializeArray ();
+}
+
+/**
+   \brief deletes an Array.
+   It does this by first deleting all the array-entries, and then delete the array[] itself
+*/
+Array::~Array()
+{
+  if (verbose >= 2)
+    printf("deleting array\n");
+  Entry* walker = firstEntry;
+  Entry* last;
+  while (walker != NULL)
+    {
+      last = walker;
+      walker = walker->next;
+      delete last;
+    }
+  delete [] array;
 }
 

orxonox/trunk/importer/array.h

@@ -21 +21 @@
  public:
   Array ();
+  ~Array();
 
   void initializeArray ();

orxonox/trunk/importer/framework.cc

@@ -2 +2 @@
 #include "object.h"
 
-int verbose = 1;
+int verbose = 2;
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
 Object* obj;

orxonox/trunk/importer/material.cc

@@ -36 +36 @@
   
   setName (mtlName);
+}
+
+/** 
+    \brief deletes a Material
+*/
+Material::~Material()
+{
+  if (verbose >= 2)
+    printf ("delete Material %s\n", name);
+  if (nextMat != NULL)
+    delete nextMat;
 }
 

orxonox/trunk/importer/object.cc

@@ -24 +24 @@
 
   initialize();
-  //  importFile ("");
+
   BoxObject();
 
@@ -57 +57 @@
 
   finalize();
+}
+
+/**
+   \brief deletes an Object
+*/
+Object::~Object()
+{
+  if (verbose >= 2)
+    printf ("Don't know what to delete, or how to destroy a glList\n");
+
 }
 
@@ -80 +90 @@
   vTexture = new Array();
 
+  material = new Material();
+
   glNewList (listNumber, GL_COMPILE);
   glEnableClientState (GL_VERTEX_ARRAY);
@@ -111 +123 @@
   glEnd();
   glEndList();
+  delete vertices;
+  delete normals;
+  delete vTexture;
+  if (material != NULL)
+    delete material;
   return true;
 }
@@ -351 +368 @@
     printf ("Opening mtlFile: %s\n", mtlFileName);
   char Buffer[500];
-  vertices = new Array();
-  material = new Material();
   Material* tmpMat = material;
   while(!MTL_FILE->eof())