Changeset 8432 in orxonox.OLD for branches

Timestamp:

Jun 15, 2006, 12:55:56 AM (18 years ago)

Author:

patrick

Message:

bsp: fixed a bad md3 reading bug, forgot to read one character and the chaos started…

Location:

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

Files:

• md3_data.cc (modified) (6 diffs)
• md3_tag.h (modified) (1 diff)

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

@@ -207 +207 @@
 {
   PRINTF(0)("Reading Tags\n");
-//  this->boneFrames = new MD3BoneFrame*[this->header->boneFrameNum];
 
   for( int i = 0; i < this->header->boneFrameNum; i++)
@@ -233 +232 @@
   PRINTF(0)("Reading Mesh Data\n");
 
-  int    localFileOffset = 0;                                      //!< local file offset
+  fileOffset = 0;
 
   this->meshes = new MD3Mesh*[this->header->meshNum];
@@ -241 +240 @@
     this->meshes[i] = new MD3Mesh();
 
-    localFileOffset = 0;
+    int localFileOffset = 0;
     bool   bTriangles, bTexVecs, bVertices, bTextures;            //!< the parts that have been read so far
 
@@ -249 +248 @@
     this->meshes[i]->header = md;
     localFileOffset += sizeof(MD3MeshHeader);
-
-    if( unlikely(this->meshes[i]->header->id != MD3_IDENT))
-    {
-      PRINTF(1)("Wrong MD3 mesh file tag, file %s could be corrupt\n", this->filename.c_str());
-      return false;
-    }
 
     PRINTF(0)("MD3 Mesh Header debug section\n");
@@ -268 +261 @@
     printf("vertexStart: %i\n", md->vertexStart);
     printf("fileSize: %i\n", md->meshSize);
+
+    if( unlikely(this->meshes[i]->header->id != MD3_IDENT))
+    {
+      PRINTF(1)("Wrong MD3 mesh file tag, file %s could be corrupt\n", this->filename.c_str());
+      return false;
+    }
 
     // check which parts to be loaded
@@ -300 +299 @@
       }
     }
+    fileOffset += localFileOffset;
+    PRINTF(0)("finished reading mesh %i, got %i of %i byes\n", i, localFileOffset, md->meshSize);
   }
-  return localFileOffset;
+  return fileOffset;
 }
 

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

@@ -18 +18 @@
 typedef struct MD3TagData
 {
-  sVec3D     position;
-  float      matrix[3][3];
+  char       name[64];                                //!< name of the tag
+  sVec3D     position;                                //!< position of the tag
+  float      matrix[3][3];                            //!< matrix of the rotation
 };