Changeset 8566 in orxonox.OLD

Timestamp:

Jun 17, 2006, 2:29:16 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 model drawing now works, but doesn't do anything

Location:

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

Files:

• md3_data.h (modified) (1 diff)
• md3_model.cc (modified) (4 diffs)

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

@@ -106 +106 @@
       std::string               loadFilename;      //!< filename of the actual file from which data was loaded
 
-      int                       boneFrameNum;      //!< number of anumation key fames in the models
-      int                       tagNum;            //!< number of tags
-      int                       meshNum;           //!< number of meshes
-
-      int                       maxTextureNum;     //!< maximum number of unique used in an md3 file
-      int                       boneFrameStart;    //!< starting position of bone frame data structures
-      int                       tagStart;          //!< starting position of tag-structures
-
-      int                       meshStart;         //!< starting position of mesh structures
-
-      int                       fileSize;          //!< file size
-
       MD3AnimationState         animationState;    //!< the animation state of this model
 

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

@@ -43 +43 @@
     this->tmpBoneFrame = new MD3BoneFrame();
 
-    this->tmpMesh = new sVec3D*[this->md3Data->meshNum];
-    for( int i = 0; i < this->md3Data->meshNum; i++)
+    this->tmpMesh = new sVec3D*[this->md3Data->header->meshNum];
+    for( int i = 0; i < this->md3Data->header->meshNum; i++)
       this->tmpMesh[i] = new sVec3D[this->md3Data->meshes[i]->header->vertexNum];
 
-    this->tmpNormal = new MD3Normal*[this->md3Data->meshNum];
-    for( int i = 0; i < this->md3Data->meshNum; i++)
+    this->tmpNormal = new MD3Normal*[this->md3Data->header->meshNum];
+    for( int i = 0; i < this->md3Data->header->meshNum; i++)
       this->tmpNormal[i] = new MD3Normal[this->md3Data->meshes[i]->header->vertexNum];
 
-    this->tmpMatrix = new float*[this->md3Data->tagNum];
-    for( int i = 0; i < this->md3Data->tagNum; i++)
+    this->tmpMatrix = new float*[this->md3Data->header->tagNum];
+    for( int i = 0; i < this->md3Data->header->tagNum; i++)
       this->tmpMatrix[i] = new float[16];
   }
@@ -92 +92 @@
 
     //draw all meshes of current frame of this model
-    for( int i = 0;  i < data->meshNum; i++)
+    for( int i = 0;  i < data->header->meshNum; i++)
     {
       MD3Mesh* mesh = data->meshes[i];
@@ -190 +190 @@
   void MD3Model::draw() const
   {
-    PRINTF(0)("draw\n");
-
     //draw current bone frame
     this->draw(this->md3Data);
@@ -221 +219 @@
 
     //draw all meshes of current frame of this model
-    for( int i = 0;  i < data->meshNum; i++)
+    for( int i = 0;  i < data->header->meshNum; i++)
     {
       MD3Mesh* mesh = data->meshes[i];