Changeset 5296 in orxonox.OLD

Timestamp:

Oct 7, 2005, 10:42:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: modiefied PNode to match Element2D's removal methods.
see destructor header for more detail

Location:

trunk

Files:

• configure (modified) (2 diffs)
• src/lib/coord/p_node.cc (modified) (2 diffs)
• src/story_entities/world.cc (modified) (2 diffs)

trunk/configure

@@ -7987 +7987 @@
 
 ## SDL-check
-#       SDL_CFLAGS=`sdl-config --cflags`
-#       SDL_LIBS=`sdl-config --libs`
-#       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-#       LIBS="$LIBS $SDL_LIBS"
+       SDL_CFLAGS=`sdl-config --cflags`
+       SDL_LIBS=`sdl-config --libs`
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+       LIBS="$LIBS $SDL_LIBS"
 
 for ac_header in SDL/SDL.h
@@ -8146 +8146 @@
 
    HAVE_SDL=yes
-   LIBS="$LIBS -framework SDL"
+#   LIBS="$LIBS -framework SDL"
 
 # checking for SDL-headers

trunk/src/lib/coord/p_node.cc

@@ -74 +74 @@
 
 /**
- *  standard deconstructor
-*/
+ * standard deconstructor
+ *
+ * There are two general ways to delete a PNode
+ * 1. delete instance;
+ *   -> result
+ *    delete this Node and all its children and children's children...
+ *    (danger if you still need the children's instance somewhere else!!)
+ *
+ * 2. instance->remove2D(); delete instance;
+ *   -> result:
+ *    moves its children to the NullParent
+ *    then deletes the Element.
+ */
 PNode::~PNode ()
 {
-  if (this->parent)
-    this->parent->removeChild(this);
-  else
-  {
-   tIterator<PNode>* iterator = this->children->getIterator();
-   PNode* pn = iterator->firstElement();
-   while( pn != NULL)
-     {
-       delete pn;
-       pn = iterator->nextElement();
-     }
-   delete iterator;
-   /* this deletes all children in the list */
+  // remove the Node, delete it's children.
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* child = iterator->firstElement();
+
+  while( child != NULL)
+  {
+    delete child;
+    child = iterator->nextElement();
+  }
+  delete iterator;
+
+  if (this->parent != NULL)
+  {
+    this->parent->children->remove(this);
+    this->parent = NULL;
   }
   delete this->children;
+
+  // remove all other allocated memory.
   if (this->toCoordinate != NULL)
     delete this->toCoordinate;
@@ -98 +113 @@
     delete this->toDirection;
 }
+
 
 /**

trunk/src/story_entities/world.cc

@@ -128 +128 @@
 
 
+  // delete all the initialized Engines.
   delete LightManager::getInstance();
   delete TrackManager::getInstance();
   delete ParticleEngine::getInstance();
-  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
+  delete AnimationPlayer::getInstance();
   delete PhysicsEngine::getInstance();
 
@@ -142 +143 @@
   // erease everything that is left.
   delete NullParent::getInstance();
-  delete NullParent::getInstance();
 
   // unload the resources !!
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-
-
-  EventHandler::getInstance()->debug();
-  ClassList::debug(CL_PARENT_NODE, 3);
-//  exit(-1);
 
   delete[] this->path;