Changeset 8426 in orxonox.OLD for branches

Timestamp:

Jun 15, 2006, 12:20:38 AM (18 years ago)

Author:

patrick

Message:

bsp: fixed some bugs in the data reading. there is still one in the texture reading func

Location:

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

Files:

• md3_data.cc (modified) (13 diffs)
• md3_data.h (modified) (1 diff)

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

@@ -101 +101 @@
       while( !(bBoneFrames && bTags && bMeshes))
       {
-        printf("while\n");
+        printf("while, fileOffset = %i\n", fileOffset);
         if( fileOffset == this->header->boneFrameStart && !bBoneFrames)
         {
@@ -156 +156 @@
 int MD3Data::readHeader(FILE* pFile, int fileOffset)
 {
+  PRINTF(0)("Reading Header\n");
+
   this->header = new MD3Header;
   fread(this->header, 1, sizeof(MD3Header), pFile);
@@ -182 +184 @@
 int MD3Data::readBoneFrames(FILE* pFile, int fileOffset)
 {
+  PRINTF(0)("Reading Bone Frames\n");
+
   this->boneFrames = new MD3BoneFrame*[this->header->boneFrameNum];
 
@@ -202 +206 @@
 int MD3Data::readTags(FILE* pFile, int fileOffset)
 {
+  PRINTF(0)("Reading Tags\n");
 //  this->boneFrames = new MD3BoneFrame*[this->header->boneFrameNum];
 
@@ -226 +231 @@
 int MD3Data::readMeshes(FILE* pFile, int fileOffset)
 {
-  int    localFileOffset = fileOffset;                          //!< local file offset
+  PRINTF(0)("Reading Mesh Data\n");
+
+  int    localFileOffset = 0;                                      //!< local file offset
 
   this->meshes = new MD3Mesh*[this->header->meshNum];
@@ -234 +241 @@
     this->meshes[i] = new MD3Mesh();
 
+    localFileOffset = 0;
     bool   bTriangles, bTexVecs, bVertices, bTextures;            //!< the parts that have been read so far
 
@@ -248 +256 @@
     }
 
+    PRINTF(0)("MD3 Mesh Header debug section\n");
+    printf("ident: %i\n", md->id);
+    printf("filename: %s\n", md->name);
+    printf("meshFrameNum: %i\n", md->meshFrameNum);
+    printf("textureNum: %i\n", md->textureNum);
+    printf("vertexNum: %i \n", md->vertexNum);
+    printf("triangleNum: %i\n", md->triangleNum);
+    printf("triangleStart: %i\n", md->triangleStart);
+    printf("textureStart: %i\n", md->textureStart);
+    printf("texVecStart: %i\n", md->texVecStart);
+    printf("vertexStart: %i\n", md->vertexStart);
+    printf("fileSize: %i\n", md->meshSize);
+
     // check which parts to be loaded
     bTriangles = ( this->meshes[i]->header->triangleNum == 0);
@@ -257 +278 @@
     while( !(bTriangles && bTexVecs && bVertices && bTextures))
     {
+      PRINTF(0)("while2: localOffset = %i\n", localFileOffset);
       if( localFileOffset == this->meshes[i]->header->triangleStart  && !bTriangles)
       {
@@ -279 +301 @@
     }
   }
-  return localFileOffset - fileOffset;
+  return localFileOffset;
 }
 
@@ -289 +311 @@
 int MD3Data::readMeshTriangles(FILE* pFile, int fileOffset, int mesh)
 {
+  PRINTF(0)("Reading Mesh Triangles\n");
   // create the memomry to save the triangles
   this->meshes[mesh]->triangles = new MD3Triangle[this->meshes[mesh]->header->triangleNum];
@@ -302 +325 @@
 int MD3Data::readMeshTextures(FILE* pFile, int fileOffset, int mesh)
 {
+  PRINTF(0)("Reading Mesh Textures\n");
+
   // create the textures
   this->meshes[mesh]->material = new Material[this->meshes[mesh]->header->textureNum];
@@ -323 +348 @@
 int MD3Data::readMeshTexVecs(FILE* pFile, int fileOffset, int mesh)
 {
+  PRINTF(0)("Reading Mesh TexVecs\n");
   this->meshes[mesh]->texVecs = new MD3TexVecs[this->meshes[mesh]->header->vertexNum];
   fread(this->meshes[mesh]->texVecs, 1, sizeof(MD3TexVecs), pFile);
@@ -335 +361 @@
 int MD3Data::readMeshVertices(FILE* pFile, int fileOffset, int mesh)
 {
+  PRINTF(0)("Reading Mesh Vertices\n");
+
   // reserver memory for the vertex informations
   this->meshes[mesh]->meshFrames = new sVec3D[this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum];

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

@@ -27 +27 @@
 
 //! These are the needed defines for the max values when loading .MD2 files
-#define MD3_IDENT                       (('4'<<24) + ('P'<<16) + ('D'<<8) + 'I') //!< the md2 identifier tag in the bin file
+#define MD3_IDENT                       (('3'<<24) + ('P'<<16) + ('D'<<8) + 'I') //!< the md3 identifier tag in the bin file
 #define MD3_VERSION                     15                                       //!< the md2 version in the header
 #define MD2_MAX_TRIANGLES               4096                                     //!< maximal triangles count