Changeset 8354 in orxonox.OLD

Timestamp:

Jun 14, 2006, 1:41:58 AM (18 years ago)

Author:

patrick

Message:

bsp: outputting the file informations and checking for valid header informations

Location:

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

Files:

• md3_data.cc (modified) (5 diffs)
• md3_data.h (modified) (2 diffs)
• md3_model.cc (modified) (2 diffs)
• md3_model.h (modified) (2 diffs)

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

@@ -47 +47 @@
   this->fileName = "";
   this->skinFileName = "";
+
+
   this->loadModel(modelFileName);
-  this->loadSkin(skinFileName);
+//   this->loadSkin(skinFileName);
 }
 
@@ -78 +80 @@
   FILE *pFile;                            //file stream
 //  char* buffer;                           //buffer for frame data
+  int fileOffset = 0;                     // file data offset
 
 
@@ -85 +88 @@
     return false;
 
+  PRINTF(0)("opening file: %s\n", fileName.c_str());
   pFile = fopen(fileName.c_str(), "rb");
   if( unlikely(!pFile))
@@ -93 +97 @@
   this->header = new MD3Header;
   fread(this->header, 1, sizeof(MD3Header), pFile);
+  fileOffset += sizeof(MD3Header);
   /* check for the header version: make sure its a md2 file :) */
-  if( unlikely(this->header->version != MD2_VERSION) && unlikely(this->header->ident != MD2_IDENT))
+  if( unlikely(this->header->version != MD3_VERSION) && unlikely(this->header->ident != MD3_IDENT))
     {
       PRINTF(1)("Couldn't load file %s: invalid file format: stop loading\n", fileName.c_str());
@@ -100 +105 @@
     }
 
-
+    //header debug:
+    PRINTF(0)("MD3 Header debug section======================================\n");
+    printf("ident: %i\n", this->header->ident);
+    printf("version: %i\n", this->header->version);
+    printf("filename: %s\n", this->header->filename);
+    printf("boneFrameNum: %i\n", this->header->boneFrameNum);
+    printf("tag number: %i\n", this->header->tagNum);
+    printf("mesh number: %i\n", this->header->meshNum);
+    printf("max tex num: %i\n", this->header->maxTexNum);
+    printf("bone frame start: %i\n", this->header->boneFrameStart);
+    printf("tag start: %i\n", this->header->tagStart);
+    printf("mesh start: %i\n", this->header->meshStart);
+    printf("fileSize: %i\n", this->header->fileSize);
+
+
+    // check if the filesize is correct
+    if( this->header->fileSize > this->header->tagStart &&
+        this->header->fileSize >= this->header->meshStart)
+    {
+      bool bBoneFrames, bTags, bMeshes;
+      bBoneFrames = ( this->header->boneFrameNum == 0);
+      bTags = ( this->header->tagNum == 0);
+      bMeshes = ( this->header->meshNum == 0);
+
+      // read different parts of the model in correct order
+      while( !(bBoneFrames && bTags && bMeshes))
+      {
+        if( fileOffset == this->header->boneFrameStart && !bBoneFrames)
+        {}
+        else if( fileOffset == this->header->tagStart && !bTags)
+        {}
+        else if( fileOffset == this->header->meshStart && !bMeshes)
+        {}
+      }
+
+    }
 
 #if 0

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 MD2_IDENT                       (('2'<<24) + ('P'<<16) + ('D'<<8) + 'I') //!< the md2 identifier tag in the bin file
-#define MD2_VERSION                     8                                        //!< the md2 version in the header
+#define MD3_IDENT                       (('4'<<24) + ('P'<<16) + ('D'<<8) + 'I') //!< the md2 identifier tag in the bin file
+#define MD3_VERSION                     15                                       //!< the md2 version in the header
 #define MD2_MAX_TRIANGLES               4096                                     //!< maximal triangles count
 #define MD2_MAX_VERTICES                2048                                     //!< maximal vertices count
@@ -58 +58 @@
    int meshNum;                         //!< number of mesh
    int maxTexNum;                       //!< number of texture
+
    int boneFrameStart;                  //!< start of bone frames
    int tagStart;                        //!< start of the tag
    int meshStart;                       //!< mesh start
+
    int fileSize;                        //!< file size
 };

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

@@ -17 +17 @@
 #include "md3_model.h"
 
+#include "md3_data.h"
 
 
@@ -27 +28 @@
   MD3Model::MD3Model(std::string filename, float scaling)
   {
-
+    this->md3Data = new MD3Data(filename, filename, scaling);
   }
 

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

@@ -13 +13 @@
 
 
-class MD3BoneFrame;
-class MD3Mesh;
-
-
 namespace md3
 {
+
+  class MD3BoneFrame;
+  class MD3Mesh;
+  class MD3Data;
 
 class MD3Model : public Model
@@ -30 +30 @@
 
   private:
+    MD3Data*            md3Data;           //!< reference to the md3 model data
+
     std::string         filename;          //!< the name of the file as recorded in the .md3 file
     std::string         loadFilename;      //!< filename of the actual file from which data was loaded