Changeset 6142 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/world_entities/world_entity.h (modified) (2 diffs)

trunk/src/world_entities/world_entity.h

@@ -11 +11 @@
 #include "model.h"
 
+#include "object_manager.h"
 #include "glincl.h"
 #include <vector>
@@ -65 +66 @@
   //  CharacterAttributes* getCharacterAttributes();
 
+  void toList(OM_LIST list);
 
+  /** @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.
+
 };