Changeset 6909 in orxonox.OLD for branches/current_cd/src/world_entities/world_entity.h

Timestamp:

Jan 31, 2006, 6:02:16 PM (19 years ago)

Author:

patrick

Message:

current_cd: merged with the current version of the trunk

File:

• branches/current_cd/src/world_entities/world_entity.h (modified) (3 diffs)

branches/current_cd/src/world_entities/world_entity.h

@@ -60 +60 @@
   virtual void draw () const;
 
+
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
+
   void drawBVTree(unsigned int depth, int drawMode) const;
+  /** @returns a reference to the obb tree of this worldentity */
+  inline const BVTree* getOBBTree() const { return this->obbTree; };
+
 
 
@@ -78 +83 @@
   void toList(OM_LIST list);
 
+<<<<<<< .working
   /** @returns a Reference to the objectListNumber to set. */
   OM_LIST& getOMListNumber() { return this->objectListNumber; }
@@ -100 +106 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+=======
+ protected:
+  Model*                  model;            //!< The model that should be loaded for this entity.
+  const BVTree*           obbTree;          //!< this is the obb tree reference needed for collision detection
+>>>>>>> .merge-right.r6905
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: