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

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/world_entity.h (modified) (3 diffs)

trunk/src/world_entities/world_entity.h

@@ -37 +37 @@
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
+  inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
+
   bool buildObbTree(unsigned int depth);
   /** @returns a reference to the obb tree of this worldentity */
@@ -72 +74 @@
   /** @returns a Reference to the Iterator */
   std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
+
+
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
@@ -77 +81 @@
  private:
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
+  const char*             md2TextureFileName; //!< the file name of the md2 model texture, only if this
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection