Changeset 6121 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: packing the first entities into their lists

Location:

branches/objectmanager/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (3 diffs)
• util/object_manager.cc (modified) (7 diffs)
• util/object_manager.h (modified) (5 diffs)
• util/state.cc (modified) (1 diff)
• util/state.h (modified) (4 diffs)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (4 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/objectmanager/src/story_entities/world.cc

@@ -141 +141 @@
   SoundEngine::getInstance()->flushAllSources();
 
-  delete ObjectManager::getInstance();
+  if (State::getObjectManager() == &this->objectManager)
+    State::setObjectManager(NULL);
   // erease everything that is left.
   delete PNode::getNullParent();
@@ -214 +215 @@
 ErrorMessage World::preLoad()
 {
+  State::setObjectManager(&this->objectManager);
   State::setWorldEntityList(this->entities = new tList<WorldEntity>());
   this->cycle = 0;

branches/objectmanager/src/story_entities/world.h

@@ -11 +11 @@
 #include "story_entity.h"
 #include "p_node.h"
+#include "object_manager.h"
 
-class World;
+
 class WorldEntity;
 class Camera;
@@ -18 +19 @@
 class GLMenuImageScreen;
 class Terrain;
-class GarbageCollector;
-class Text;
 class TiXmlElement;
 
 class Shell;
 class OggPlayer;
+
 template<class T> class tList;
 
@@ -104 +104 @@
     bool bPause;                        //!< pause mode
 
+    ObjectManager      objectManager;   //!< The ObjectManager of this World.
+
     GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 

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",

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;
 

branches/objectmanager/src/util/state.cc

@@ -29 +29 @@
 const PNode* State::cameraTarget = NULL;
 
+ObjectManager* State::objectManager = NULL;
 tList<WorldEntity>* State::worldEntityList = NULL;
 

branches/objectmanager/src/util/state.h

@@ -11 +11 @@
 class WorldEntity;
 template<class T> class tList;
-//template<class T> class tStack;
+class ObjectManager;
 
 //! handles states about orxonox's most importatn objects
@@ -22 +22 @@
 
  public:
-  // CAMERA //
+   //////////////
+   /// CAMERA ///
+   //////////////
   /** @param camera the PNode to the Camera, @param cameraTarget the PNode to the Camera's target */
   static void setCamera(const PNode* camera, const PNode* cameraTarget);
@@ -30 +32 @@
   static inline const PNode* getCameraTarget() { return State::cameraTarget; };
 
-  // WORLD_ENTITY_LIST //
+  //////////////////////
+  /// OBJECT-MANAGER ///
+  //////////////////////
+  /** @param objectManager the new Current ObjectManager */
+  static inline void setObjectManager(ObjectManager* objectManager) { State::objectManager = objectManager; };
+  /** @returns the current ObjectManager. */
+  static inline ObjectManager* getObjectManager() { return State::objectManager; };
+
+  /////////////////////////
+  /// WORLD_ENTITY_LIST ///
+  /////////////////////////
   /** @param worldEntityList The World's List of WorldEntities */
   static inline void setWorldEntityList(tList<WorldEntity>* worldEntityList) { State::worldEntityList = worldEntityList; };
@@ -42 +54 @@
   static const PNode*           cameraTarget;       //!< A reference to the cameraTarget
   static PNode*                 nullParent;         //!< A reference to the Null-PNode.
+  static ObjectManager*         objectManager;      //!< A referenct to the current ObjectManager
 
   static tList<WorldEntity>*    worldEntityList;    //!< The List of the worldEntities

branches/objectmanager/src/world_entities/npcs/npc.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_NPC, "NPC");
-
+  this->toList(OM_GROUP_00);
 }
 

branches/objectmanager/src/world_entities/playable.cc

@@ -46 +46 @@
   PRINTF(4)("PLAYABLE INIT\n");
 
+  this->toList(OM_GROUP_01);
   this->weaponMan = new WeaponManager(this);
 

branches/objectmanager/src/world_entities/power_ups/power_up.cc

@@ -27 +27 @@
 {
   this->setClassID(CL_POWER_UP, "PowerUp");
+  this->toList(OM_COMMON);
 
 }

branches/objectmanager/src/world_entities/skybox.cc

@@ -65 +65 @@
 {
   this->setClassID(CL_SKYBOX, "SkyBox");
-
+  this->toList(OM_ENVIRON_NOTICK);
   this->size = 100.0;
 

branches/objectmanager/src/world_entities/world_entity.cc

@@ -57 +57 @@
   this->objectListIterator = NULL;
 
-  ObjectManager::getInstance()->toList(this, OM_NULL);
+  this->toList(OM_NULL);
 }
 
@@ -73 +73 @@
     this->setModel(NULL, i);
 
-  ObjectManager::getInstance()->toList(this, OM_INIT);
+  State::getObjectManager()->toList(this, OM_INIT);
 }
 
@@ -106 +106 @@
     if (strchr(fileName, '#') != NULL)
       {
-        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-        char* lodFile = new char[strlen(fileName)+1];
-        strcpy(lodFile, fileName);
-        char* depth = strchr(lodFile, '#');
-        for (unsigned int i = 0; i < 5; i++)
-          {
-            *depth = 48+(int)i;
-            printf("-------%s\n", lodFile);
-            if (ResourceManager::isInDataDir(lodFile))
-              this->loadModel(lodFile, scaling, i);
-          }
-        return;
+        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
+        char* lodFile = new char[strlen(fileName)+1];
+        strcpy(lodFile, fileName);
+        char* depth = strchr(lodFile, '#');
+        for (unsigned int i = 0; i < 5; i++)
+          {
+            *depth = 48+(int)i;
+            printf("-------%s\n", lodFile);
+            if (ResourceManager::isInDataDir(lodFile))
+              this->loadModel(lodFile, scaling, i);
+          }
+        return;
       }
 
@@ -181 +181 @@
   }
 }
+
+/**
+ * @brief moves this entity to the List OM_List
+ * @param list the list to set this Entity to.
+ *
+ * this is the same as a call to State::getObjectManager()->toList(entity , list);
+ * directly, but with an easier interface.
+ */
+void WorldEntity::toList(OM_LIST list)
+{
+  State::getObjectManager()->toList(this, list);
+}
+
 
 

branches/objectmanager/src/world_entities/world_entity.h

@@ -66 +66 @@
   //  CharacterAttributes* getCharacterAttributes();
 
+  void toList(OM_LIST list);
+
   /** @returns a Reference to the objectListNumber to set. */
   OM_LIST& getOMListNumber() { return this->objectListNumber; }