Changeset 6089 in orxonox.OLD for branches/objectmanager/src/world_entities

Timestamp:

Dec 13, 2005, 2:58:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: objectManager first implementation

Location:

branches/objectmanager/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (2 diffs)

branches/objectmanager/src/world_entities/world_entity.cc

@@ -53 +53 @@
 
   this->setVisibiliy(true);
+
+  this->objectListNumber = OM_INIT;
+  this->objectListIterator = NULL;
+
+  ObjectManager::getInstance()->toList(this, OM_NULL);
 }
 
@@ -67 +72 @@
   for (unsigned int i = 0; i < this->models.size(); i++)
     this->setModel(NULL, i);
+
+  ObjectManager::getInstance()->toList(this, OM_INIT);
 }
 
@@ -95 +102 @@
 {
   if (fileName != NULL)
-  { 
+  {
     // search for the special character # in the LoadParam
     if (strchr(fileName, '#') != NULL)

branches/objectmanager/src/world_entities/world_entity.h

@@ -11 +11 @@
 #include "model.h"
 
+#include "object_manager.h"
 #include "glincl.h"
 #include <vector>
@@ -65 +66 @@
   //  CharacterAttributes* getCharacterAttributes();
 
-
+  /** @returns a Reference to the objectListNumber to set. */
+  OM_LIST& getOMListNumber() { return this->objectListNumber; }
+  /** @returns a Reference to the Iterator */
+  std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 
  private:
-  std::vector<Model*>     models;            //!< The model that should be loaded for this entity.
-  BVTree*                 obbTree;          //!< this is the obb tree reference needed for collision detection
+  std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
+  BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection
 
-  bool                    bCollide;         //!< If it should be considered for the collisiontest.
-  bool                    bVisible;         //!< If it should be visible.
+  bool                    bCollide;           //!< If it should be considered for the collisiontest.
+  bool                    bVisible;           //!< If it should be visible.
+
+  OM_LIST                           objectListNumber;   //!< The ObjectList from ObjectManager this Entity is in.
+  std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
+
 };