Changeset 6191 in orxonox.OLD for branches/christmas_branche/src/world_entities

Timestamp:

Dec 20, 2005, 3:24:14 PM (19 years ago)

Author:

patrick

Message:

christmas: the texture gets loaded now and is loadable

Location:

branches/christmas_branche/src/world_entities

Files:

• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (2 diffs)

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -85 +85 @@
   static_cast<PNode*>(this)->loadParams(root);
 
+  LoadParam(root, "md2texture", this, WorldEntity, loadMD2Texture)
+      .describe("the fileName of the texture, that should be loaded onto this world-entity. (must be relative to the data-dir)")
+      .defaultValues(1, NULL);
+
   // Model Loading
   LoadParam(root, "model", this, WorldEntity, loadModel)
       .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)")
       .defaultValues(3, NULL, 1.0f, 0);
-
-}
+}
+
 
 /**
@@ -135 +139 @@
       PRINTF(4)("fetching MD2 file: %s\n", fileName);
 //         MD2Model* m = (MD2Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN);
-      Model* m = new MD2Model(fileName, "md2_fake_texture.bad");
+      Model* m = new MD2Model(fileName, this->md2TextureFileName);
         //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
       this->setModel(m, 0);

branches/christmas_branche/src/world_entities/world_entity.h

@@ -36 +36 @@
   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 char* fileName) { this->md2TextureFileName = fileName; }
 
   bool buildObbTree(unsigned int depth);
@@ -79 +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