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

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.h (modified) (5 diffs)

branches/objectmanager/src/util/object_manager.h

@@ -1 +1 @@
 /*!
  * @file object_manager.h
- * @brief Definition of the ... singleton Class
-*/
+ * @brief Definition of the ObjectManager.
+ */
 
 #ifndef _OBJECT_MANAGER_H
@@ -15 +15 @@
   OM_NULL             =  0,
   OM_DEAD,
+  OM_DEAD_TICK,
   OM_ENVIRON_NOTICK,
   OM_ENVIRON,
@@ -65 +66 @@
 class WorldEntity;
 
-//! A default singleton class.
+//! A powerfull handler for the Object (WorldEntities) in the World.
 class ObjectManager : public BaseObject {
 
  public:
-  virtual ~ObjectManager(void);
-  /** @returns a Pointer to the only object of this Class */
-  inline static ObjectManager* getInstance(void) { if (!ObjectManager::singletonRef) ObjectManager::singletonRef = new ObjectManager();  return ObjectManager::singletonRef; }
+   ObjectManager();
+   virtual ~ObjectManager();
 
   void flush();
@@ -84 +84 @@
   static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
 
-  void debug(OM_LIST omList) const;
-  void debug(const char* listName = NULL);
+  void debug(OM_LIST omList, unsigned int level = 0) const;
+  void debug(const char* listName = NULL, unsigned int level = 0);
 
   static OM_LIST StringToOMList(const char* listName);
@@ -91 +91 @@
 
  private:
-  ObjectManager(void);
-  static ObjectManager* singletonRef;
-
   const std::list<BaseObject>*            pNodeList;