Changeset 6091 in orxonox.OLD for branches/objectmanager

Timestamp:

Dec 13, 2005, 4:56:23 PM (19 years ago)

Author:

bensch

Message:

objectManager: super-debug

Location:

branches/objectmanager/src

Files:

• defs/debug.h (modified) (1 diff)
• util/object_manager.cc (modified) (6 diffs)
• util/object_manager.h (modified) (1 diff)

branches/objectmanager/src/defs/debug.h

@@ -110 +110 @@
 #endif
 #ifndef NO_SHELL
-#define PRINT_EXEC       printf //ShellBuffer::addBufferLineStatic
+#define PRINT_EXEC       ShellBuffer::addBufferLineStatic
 #else /* NO_SHELL */
 #define PRINT_EXEC       printf

branches/objectmanager/src/util/object_manager.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -21 +21 @@
 #include "world_entity.h"
 
+#include "shell_command.h"
 using namespace std;
-
+SHELL_COMMAND(debug, ObjectManager, debug)
+    ->defaultValues(2, NULL, 0);
 
 /**
@@ -63 +65 @@
   if (likely(omList != OM_INIT))
   {
-    this->objectList[omList].push_back(entity);
+    this->objectLists[omList].push_back(entity);
+    entity->getEntityIterator() = --this->objectLists[omList].end();
     entity->getOMListNumber() = omList;
   }
@@ -78 +81 @@
 void ObjectManager::toList (WorldEntity* entity, const char* omList)
 {
-  this->toList(entity, ObjectManager::StringToOMList( omList));
+  this->toList(entity, ObjectManager::StringToOMList(omList));
 }
 
@@ -103 +106 @@
 
 
+/**
+ * @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
+{
+  if (omList != OM_INIT)
+  {
+    PRINT(0)(" +ObjectManager-LIST: '%s'------\n", ObjectManager::OMListToString((OM_LIST) omList));
+    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());
+    }
+  }
+  else
+    PRINTF(2)("Invalid query. for OM_INIT-LIST\n");
+}
+
+
+/**
+ * @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)
+{
+  PRINT(0)("=ObjectManager-DEBUG=============\n");
+  if (listName == NULL || listName[0] == '\0')
+    for (unsigned int i = 0; i < OM_SIZE; ++i)
+      debug((OM_LIST) i);
+  else
+    debug(ObjectManager::StringToOMList(listName));
+  PRINT(0)("=========================== OM ==\n");
+}
 
 
@@ -111 +148 @@
  * @returns the String transformed from omList.
  */
-const char* ObjectManager::StringToOMList(OM_LIST omList)
+const char* ObjectManager::OMListToString(OM_LIST omList)
 {
   switch (omList)

branches/objectmanager/src/util/object_manager.h

@@ -83 +83 @@
   static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
 
+  void debug(OM_LIST omList) const;
+  void debug(const char* listName = NULL);
 
   static OM_LIST StringToOMList(const char* listName);
-  static const char* StringToOMList(OM_LIST omList);
+  static const char* OMListToString(OM_LIST omList);
 
  private: