Changeset 4815 in orxonox.OLD

Timestamp:

Jul 7, 2005, 3:49:05 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now some other singletons get deleted at the end of the game. there is some classid problem with the collision detection framework: the stuff gets deleted, but the names remain in the list. bensch: you will have to adjust the class ids of the cd so it works, no idea how i could do this

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb.cc (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/class_list.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

orxonox/trunk/src/lib/collision_detection/obb.cc

@@ -47 +47 @@
   if( this->vertices && !this->bOrigVertices)
   {
-//     for(int i = 0; i < this->numOfVertices; i++)
-//       delete [] this->vertices[i];
     delete this->vertices;
     this->vertices = NULL;

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -90 +90 @@
     this->nodeRight = NULL;
   }
-  printf("deleting nr %i obbTreeNode\n", this->getIndex());
   if( this->bvElement)
     delete this->bvElement;

orxonox/trunk/src/lib/lang/base_object.cc

@@ -104 +104 @@
 {
   // if classID is a derivable object
-  if (likely(classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS))
+  if ( likely(classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS))
   {
     if( this->classID & classID)
       return true;
-  }
-  // if classID is a LOWLEVEL-class
+  } // if classID is a LOWLEVEL-class
   else
   {
-    if ((this->classID & CL_MASK_LOWLEVEL_CLASS) == classID)
+    if( (this->classID & CL_MASK_LOWLEVEL_CLASS) == classID)
       return true;
   }

orxonox/trunk/src/lib/lang/class_list.cc

@@ -105 +105 @@
       tmp->objectList->remove(objectPointer);
     }
-
     tmp = tmp->next;
   }

orxonox/trunk/src/orxonox.cc

@@ -41 +41 @@
 #include "text_engine.h"
 #include "event_handler.h"
+#include "garbage_collector.h"
 
 #include "state.h"
@@ -91 +92 @@
   delete EventHandler::getInstance();
   delete Factory::getFirst();
+  delete GameLoader::getInstance();
   delete SoundEngine::getInstance();
   delete State::getInstance();
+  delete CDEngine::getInstance();
+  delete GarbageCollector::getInstance();
 
   ClassList::debug(0);