Changeset 3068 in orxonox.OLD for orxonox/trunk

Timestamp:

Dec 3, 2004, 4:27:42 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: cleanup-procedure created, that deletes all the unneded stuff like faces, faceElements (does not really delete faceElements )

Location:

orxonox/trunk/importer

Files:

• framework.cc (modified) (1 diff)
• object.cc (modified) (7 diffs)
• object.h (modified) (1 diff)

orxonox/trunk/importer/framework.cc

@@ -1 +1 @@
 #include "framework.h"
 
-int verbose = 1;
+int verbose = 4;
 
 void DrawGLScene()

orxonox/trunk/importer/object.cc

@@ -208 +208 @@
 
   group->firstFace = new Face;
+  initFace (group->firstFace);
   group->currentFace = group->firstFace;
 }
@@ -233 +234 @@
 bool Object::cleanup(void)
 {
-  //  if (verbose >=3)
-    printf("finalizing the 3D-Object\n"); 
+  if (verbose >=2)
+    printf("cleaning up the 3D-Object to save Memory.\n");
 
   if (vertices != NULL)
@@ -245 +246 @@
   if (material != NULL)
     delete material;
+
+  cleanupGroup(firstGroup);
   return true; 
+}
+
+/**
+   \brief Cleans up all groups starting from group.
+   \param group the first Group to clean
+*/
+bool Object::cleanupGroup (Group* group)
+{
+  if (verbose>=4)
+    printf ("Cleaning up group\n");
+  if (group->firstFace != NULL)
+    {
+      cleanupFace (group->firstFace);
+      delete group->firstFace;
+    }
+
+  if (group->next !=NULL)
+    cleanupGroup (group->next);
+  return true;
+}
+
+/**
+   \brief Cleans up all Faces starting from face.
+   \param face the first face to clean
+*/
+bool Object::cleanupFace (Face* face)
+{
+  if (verbose>=4)
+    printf ("Cleaning up Face\n");
+
+  if (face->materialString != NULL)
+      delete face->materialString;
+  if (face->firstElem != NULL)
+    {
+      cleanupFaceElement(face->firstElem);
+      delete face->firstElem;
+    }
+      
+  if (face->next != NULL)
+    {
+      cleanupFace (face->next);
+      delete face->next;
+    }
+      
+}
+
+
+/**
+   \brief Cleans up all FaceElements starting from faceElem.
+   \param faceElem the first FaceElement to clean.
+*/
+bool Object::cleanupFaceElement(FaceElement* faceElem)
+{
+  if (faceElem->value != NULL)
+    if (verbose>=4)
+      printf ("Cleaning up faceElement %s\n", faceElem->value);
+    //delete faceElem->value;
+
+  if (faceElem->next != NULL)
+    {
+      cleanupFaceElement (faceElem->next);
+      //      delete faceElem->next;
+    }
 }
 
@@ -350 +416 @@
   if (groupCount != 0 && currentGroup->faceCount>0)
     {
-      Group* newGroup = new Group;
       //      finalizeGroup(currentGroup);
-      currentGroup->next = newGroup;
-      initGroup(newGroup);
-      currentGroup = newGroup; // must be after init see initGroup for more info
+      currentGroup = currentGroup->next = new Group;
+      initGroup(currentGroup);
     }
 
@@ -391 +455 @@
 
   FaceElement* tmpElem = currentGroup->currentFace->firstElem = new FaceElement;
-
+  tmpElem->next = NULL;
+  tmpElem->value = NULL;
   while(strcmp (faceString, "\0"))
     {
@@ -397 +462 @@
           tmpElem = tmpElem->next = new FaceElement;
       tmpElem->next = NULL;
+      tmpElem->value = NULL;
 
       char tmpValue [50];
@@ -647 +713 @@
   if (verbose >=3)
     printf ("importing grafical Element to openGL: %s\n", elementString);
-  char* vertex = elementString;
+  char vertex [100];
+  strcpy (vertex, elementString);
 
   char* texture;

orxonox/trunk/importer/object.h

@@ -93 +93 @@
   bool cleanupGroup(Group* group);
   bool cleanupFace(Face* face);
+  bool cleanupFaceElement(FaceElement* faceElem);
 
   ///// readin ///