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

Timestamp:

May 18, 2006, 11:44:21 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the cd branche back to trunk

File:

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

trunk/src/world_entities/world_entity.h

@@ -2 +2 @@
  * @file world_entity.h
  * Definition of the basic WorldEntity
-*/
+ */
 
 #ifndef _WORLD_ENTITY_H
@@ -35 +35 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
+  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
   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) */
@@ -57 +53 @@
 
   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(); }
@@ -77 +74 @@
 
   void toList(OM_LIST list);
+
 
   /** @returns a Reference to the objectListNumber to set. */
@@ -101 +99 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: