Changeset 3662 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 30, 2005, 12:02:34 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk:make

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• garbage_collector.cc (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -58 +58 @@
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_WORLD              3
 #define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               4
+#define DEBUG_MODULE_LOAD               0
 
 #define DEBUG_MODULE_IMPORTER           0

orxonox/trunk/src/garbage_collector.cc

@@ -95 +95 @@
       if( entity->isFinalized())
         {
-          PRINTF(3)("Finalizing object in list - not yet done realy\n");
+          PRINTF(1)("Finalizing object in list - not yet done realy\n");
+          
           /* first remove out of entity list */
-          //list->remove(entity);
+          list->remove(entity);
           /* second remove out of pnode tree */
-          //llParent* np = NullParent::getInstance();
+          entity->remove();
+          //NullParent* np = NullParent::getInstance();
           //np->removeChild(np);
           

orxonox/trunk/src/lib/coord/p_node.cc

@@ -366 +366 @@
 void PNode::remove()
 {
-  NullParent* np = NullParent::getInstance();
+  NullParent* nullParent = NullParent::getInstance();
+
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
     { 
-      this->children->remove(pn);
-      np->addChild(pn, pn->getMode());
+      //this->children->remove(pn);
+      nullParent->addChild(pn, pn->getMode());
       pn = this->children->nextElement();
     }

orxonox/trunk/src/orxonox.cc

@@ -35 +35 @@
 
 #include <string.h>
-int verbose = 4;
+int verbose = 3;
 
 using namespace std;