Changeset 4580 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 10, 2005, 3:13:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: arrays of Models get stored till the end

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• array.h (modified) (3 diffs)
• model.cc (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/importer/array.h

@@ -67 +67 @@
   this->firstEntry = new Entry;
   this->firstEntry->next =NULL;
-  this->currentEntry=firstEntry;
+  this->currentEntry = this->firstEntry;
   this->finalized = false;
   this->entryCount = 0; //0 means one entry
@@ -109 +109 @@
     walker = walker->next;
   }
+  walker = this->firstEntry;
+  Entry* previous;
+  while (walker)
+  {
+    previous = walker;
+    walker = walker->next;
+    delete previous;
+  }
+  this->firstEntry = NULL;
   this->finalized = true;
 }
@@ -130 +139 @@
   }
   else
-    PRINTF(2)("adding failed, because list has been finalized\n");
+    PRINTF(2)("adding failed, because array has already been finalized\n");
 }
 

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

@@ -176 +176 @@
   delete this->firstGroup;
 
-  // deleting Arrays
+  // deleting Arrays (if not allready done by finalize)
   this->deleteArrays();
 
@@ -203 +203 @@
 
   // deletes everything we allocated.
-  if (this->type == MODEL_DISPLAY_LIST)
-    this->deleteArrays();
+  //if (this->type == MODEL_DISPLAY_LIST)
+    //this->deleteArrays();
   this->cleanup();