Changeset 8418 in orxonox.OLD

Timestamp:

Jun 14, 2006, 6:35:58 PM (18 years ago)

Author:

patrick

Message:

bsp: reading the material/texture informations

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

• md3_data.cc (modified) (2 diffs)
• md3_mesh.h (modified) (3 diffs)

branches/bsp_model/src/lib/graphics/importer/md3/md3_data.cc

@@ -20 +20 @@
 #include "md3_tag.h"
 #include "md3_mesh.h"
+
+#include "material.h"
 
 
@@ -282 +284 @@
 
 
+/**
+ * reading in the mesh triangles
+ */
 int MD3Data::readMeshTriangles(FILE* pFile, int fileOffset, int mesh)
 {
   // create the memomry to save the triangles
-  MD3Triangle* tri = new MD3Triangle[this->meshes[mesh]->header->triangleNum];
-  fread(tri, 1, sizeof(MD3Triangle), pFile);
+  this->meshes[mesh]->triangles = new MD3Triangle[this->meshes[mesh]->header->triangleNum];
+  fread(this->meshes[mesh]->triangles, 1, sizeof(MD3Triangle), pFile);
 
   return this->meshes[mesh]->header->triangleNum * sizeof(MD3Triangle);
 }
 
+
+/**
+ * reading in the mesh textures
+ */
 int MD3Data::readMeshTextures(FILE* pFile, int fileOffset, int mesh)
 {
+  // create the textures
+  this->meshes[mesh]->material = new Material[this->meshes[mesh]->header->textureNum];
+
+  MD3Texture* tex = new MD3Texture[this->meshes[mesh]->header->textureNum];
+  fread(this->meshes[mesh]->material, 1, sizeof(MD3Texture), pFile);
+
+  for( int i = 0; i < this->meshes[mesh]->header->textureNum; i++) {
+    PRINTF(0)(" texture file: %s\n", tex[i].fileName);
+    this->meshes[mesh]->material[i].setDiffuseMap(tex[i].fileName);
+    this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
+  }
+
+  return this->meshes[mesh]->header->textureNum * sizeof(MD3Texture);
+}
+
+
+/**
+ * reading in the mesh tex vecs
+ */
+int MD3Data::readMeshTexVecs(FILE* pFile, int fileOffset, int mesh)
+{
   return 0;
 }
 
-int MD3Data::readMeshTexVecs(FILE* pFile, int fileOffset, int mesh)
+
+/**
+ * reading in the mesh vertices
+ */
+int MD3Data::readMeshVertices(FILE* pFile, int fileOffset, int mesh)
 {
   return 0;
 }
 
-int MD3Data::readMeshVertices(FILE* pFile, int fileOffset, int mesh)
-{
-  return 0;
-}
-
-}
-
-
-
-
-
-
-
+}
+
+
+
+
+
+
+

branches/bsp_model/src/lib/graphics/importer/md3/md3_mesh.h

@@ -16 +16 @@
 #include "vector.h"
 
+class Material;
+
 
 namespace md3
 {
-
 
   typedef struct MD3MeshHeader {
@@ -41 +42 @@
 
   typedef struct MD3Triangle  {
-    int  vertexOffset[3];
+    int  vertexOffset[3];                   //!< the vertex offsets of the triangles in the vertex array
+  };
+
+  typedef struct MD3Texture {
+    char fileName[68];                      //!< the filename of the texture. path relativly to the model file
   };
 
@@ -55 +60 @@
     MD3MeshHeader*     header;                  //!< the header of the mesh
 
-    //MD3Texture*      textures;                //!< array of textures of size textureNum
+    Material*          material;                //!< the material/textures of the models
     MD3Triangle*       triangles;               //!< indices into mesh frames and texture coord arrays
+
     float*             textureCoords;           //!< U/V textures coordinates of vertices
     Vector             meshFrames;              //!< mesh frames