Changeset 6121 in orxonox.OLD for branches/objectmanager/src/util/object_manager.cc

Timestamp:

Dec 15, 2005, 1:34:32 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: packing the first entities into their lists

File:

• branches/objectmanager/src/util/object_manager.cc (modified) (7 diffs)

branches/objectmanager/src/util/object_manager.cc

@@ -22 +22 @@
 
 #include "shell_command.h"
+
+#include <assert.h>
+
 using namespace std;
 SHELL_COMMAND(debug, ObjectManager, debug)
@@ -37 +40 @@
 }
 
-/**
- *  the singleton reference to this class
- */
-ObjectManager* ObjectManager::singletonRef = NULL;
 
 /**
@@ -50 +49 @@
 {
   this->flush();
-  ObjectManager::singletonRef = NULL;
 }
 
@@ -78 +76 @@
 void ObjectManager::toList (WorldEntity* entity, OM_LIST omList)
 {
+  assert (omList != OM_SIZE);
+
   if (likely(entity->getOMListNumber() != OM_INIT))
     this->objectLists[entity->getOMListNumber()].erase(entity->getEntityIterator());
@@ -127 +127 @@
  * @brief print out nice debug information about Elements in the list OM_LIST
  * @param omList the List to debug.
- */
-void ObjectManager::debug(OM_LIST omList) const
+ * @param level: level 0: only show list info; level 1: also show entities and their names.
+ */
+void ObjectManager::debug(OM_LIST omList, unsigned int level) const
 {
   if (omList != OM_INIT || omList == OM_SIZE)
   {
     PRINT(0)(" +ObjectManager-LIST: '%s'-size='%d'-----\n", ObjectManager::OMListToString((OM_LIST) omList), this->objectLists[omList].size());
-    std::list<WorldEntity*>::const_iterator entity;
-    for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++)
+    if (level > 1)
     {
-      PRINT(0)(" | %s::%s\n",(*entity)->getClassName(), (*entity)->getName());
+      std::list<WorldEntity*>::const_iterator entity;
+      for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++)
+      {
+        PRINT(0)(" | %s::%s\n",(*entity)->getClassName(), (*entity)->getName());
+      }
     }
   }
@@ -147 +151 @@
  * @brief prints out very nice debug information
  * @param listName the Name of the list to get Debug information from
- */
-void ObjectManager::debug(const char* listName)
-{
+ * @param level: level 0: only show list info; level 1: also show entities and their names.
+ */
+void ObjectManager::debug(const char* listName, unsigned int level)
+{
+  PRINT(0)("=================================\n");
   PRINT(0)("=ObjectManager-DEBUG=============\n");
+  PRINT(0)("=================================\n");
   if (listName == NULL || listName[0] == '\0')
     for (unsigned int i = 0; i < OM_SIZE; ++i)
-      debug((OM_LIST) i);
+      debug((OM_LIST) i, level);
   else
     debug(ObjectManager::StringToOMList(listName));
@@ -198 +205 @@
     "null",
     "dead",
+    "dead-tick"
     "environ-notick",
     "environ",