Changeset 6191 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

christmas: the texture gets loaded now and is loadable

Location:

branches/christmas_branche/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (6 diffs)
• lib/graphics/importer/md2Model.h (modified) (1 diff)
• subprojects/importer/importer.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -121 +121 @@
   currVec = &this->data->pVertices[this->data->numVertices * this->animationState.currentFrame];
   nextVec = &this->data->pVertices[this->data->numVertices * this->animationState.nextFrame];
-  PRINTF(0)("current frame nr %i, next frame nr %i\n", this->animationState.currentFrame, this->animationState.nextFrame);
-
 
   for( int i = 0; i < this->data->numVertices; ++i)
@@ -215 +213 @@
         }
 
-
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
@@ -242 +239 @@
 //   glEnable(GL_CULL_FACE);
 //   glCullFace(GL_BACK);
-
+//
 //   this->processLighting();
 //   this->interpolate(/*verticesList*/);
@@ -352 +349 @@
   this->numTexCoor = 0;
 
-  this->scaleFactor = 1.0f;
-//   this->scaleFactor = 0.2f;
+//   this->scaleFactor = 1.0f;
+  this->scaleFactor = 0.2f;
 
   this->fileName = NULL;
@@ -448 +445 @@
   for(int i = 0; i < this->numFrames; ++i)
     {
-      printf("==============vertex loading for frame %i/%i========\n", i, this->numFrames);
       frame = (sFrame*)(buffer + this->header->frameSize * i);
       pVertex = this->pVertices + this->numVertices  * i;
@@ -460 +456 @@
            pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
 
-//            pVertex[j][0] = ((frame->pVertices[j].v[0] /** frame->scale[0]*/ )/* + frame->translate[0]*/ );
-//            pVertex[j][2] = (-1.0f * (frame->pVertices[j].v[2] /** frame->scale[2]*/) /*+ frame->translate[2]*/);
-//            pVertex[j][1] = ((frame->pVertices[j].v[1] /** frame->scale[1]*/ /*+ frame->translate[1]*/));
-
-
-          printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);
+          //printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);
 
           pNormals[j] = frame->pVertices[j].lightNormalIndex;

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -69 +69 @@
 typedef struct
 {
-  unsigned char             v[3];                 //!< the vector of the vertex
+  unsigned char    v[3];                 //!< the vector of the vertex
   unsigned char    lightNormalIndex;     //!< the index of the light normal
 } sVertex;

branches/christmas_branche/src/subprojects/importer/importer.cc

@@ -45 +45 @@
       obj = new OBJModel (argv[1], atof(argv[2]));
     else if( strstr(argv[1], ".md2") != NULL)
+    {
       obj = new MD2Model(argv[1], argv[2]);
+      ((MD2Model*)obj)->tick(0.1f);
+    }
   }
   else if (argc>=2)
@@ -51 +54 @@
     if( strstr(argv[1], ".obj") != NULL)
       obj = new OBJModel(argv[1]);
-    else if( strstr(argv[1], ".md2") != NULL)
+    else if( strstr(argv[1], ".md2") != NULL) {
       obj = new MD2Model(argv[1], "fake_texture.bad");
+      obj = new MD2Model(argv[1], argv[2]);
+      ((MD2Model*)obj)->tick(0.1f);
+    }
   }
   else

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