Changeset 7365 in orxonox.OLD for branches/cd/src/world_entities/world_entity.h

Timestamp:

Apr 25, 2006, 3:17:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/cd: merged the new collision-detection back.
merged and collissions resolved.

File:

• branches/cd/src/world_entities/world_entity.h (modified) (5 diffs)

branches/cd/src/world_entities/world_entity.h

@@ -2 +2 @@
  * @file world_entity.h
  * Definition of the basic WorldEntity
-*/
+ */
 
 #ifndef _WORLD_ENTITY_H
@@ -42 +42 @@
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
 
-  bool buildObbTree(unsigned int depth);
-  /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() const { return this->obbTree; };
-
   /** @param visibility if the Entity should be visible (been draw) */
   void setVisibiliy (bool visibility) { this->bVisible = visibility; };
@@ -58 +54 @@
 
   virtual void tick (float time);
-
   virtual void draw () const;
 
+  bool buildObbTree(int depth);
   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 BVTree* getOBBTree() const { return this->obbTree; };
+  void drawBVTree(int depth, int drawMode) const;
 
   void debugWE() { this->debugEntity(); }
@@ -78 +75 @@
 
   void toList(OM_LIST list);
+
 
   /** @returns a Reference to the objectListNumber to set. */
@@ -102 +100 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: