Changeset 8372 in orxonox.OLD

Timestamp:

Jun 14, 2006, 11:28:29 AM (18 years ago)

Author:

patrick

Message:

bsp: started loading md3 mesh data, the last of the data structures

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• md3/md3_data.cc (modified) (5 diffs)
• md3/md3_data.h (modified) (1 diff)
• md3/md3_mesh.cc (modified) (1 diff)
• md3/md3_mesh.h (modified) (1 diff)
• md3/md3_tag.h (modified) (1 diff)
• md_model_structure.h (modified) (2 diffs)

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

@@ -19 +19 @@
 #include "md3_bone_frame.h"
 #include "md3_tag.h"
+#include "md3_mesh.h"
 
 
@@ -118 +119 @@
     }
 
-#if 0
-  this->fileName =fileName;
-  /* got the data: map it to locals */
-  this->numFrames = this->header->numFrames;
-  this->numVertices = this->header->numVertices;
-  this->numTriangles = this->header->numTriangles;
-  this->numGLCommands = this->header->numGlCommands;
-  this->numTexCoor = this->header->numTexCoords;
-  /* allocate memory for the data storage */
-  this->pVertices = new sVec3D[this->numVertices * this->numFrames];
-  this->pGLCommands = new int[this->numGLCommands];
-  this->pLightNormals = new int[this->numVertices * this->numFrames];
-  this->pTriangles = new sTriangle[this->numTriangles];
-  this->pTexCoor = new sTexCoor[this->numTexCoor];
-  buffer = new char[this->numFrames * this->header->frameSize];
-
-
-  /* read frame data from the file to a temp buffer */
-  fseek(pFile, this->header->offsetFrames, SEEK_SET);
-  fread(buffer, this->header->frameSize, this->numFrames, pFile);
-  /* read opengl commands */
-  fseek(pFile, this->header->offsetGlCommands, SEEK_SET);
-  fread(this->pGLCommands, sizeof(int), this->numGLCommands, pFile);
-  /* triangle list */
-  fseek(pFile, this->header->offsetTriangles, SEEK_SET);
-  fread(this->pTriangles, sizeof(sTriangle), this->numTriangles, pFile);
-  /*  read in texture coordinates */
-  fseek(pFile, this->header->offsetTexCoords, SEEK_SET);
-  fread(this->pTexCoor, sizeof(sTexCoor), this->numTexCoor, pFile);
-
-
-  for(int i = 0; i < this->numFrames; ++i)
-    {
-      frame = (sFrame*)(buffer + this->header->frameSize * i);
-      pVertex = this->pVertices + this->numVertices  * i;
-      pNormals = this->pLightNormals + this->numVertices * i;
-
-      for(int j = 0; j < this->numVertices; ++j)
-        {
-          /* SPEEDUP: *(pVerts + i + 0) = (*(frame->pVertices + i + 0)...  */
-           pVertex[j][0] = ((frame->pVertices[j].v[0] * frame->scale[0] ) + frame->translate[0] )* this->scaleFactor;
-           pVertex[j][1] = ((frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2]) * this->scaleFactor;
-           pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
-
-          //printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);
-
-          pNormals[j] = frame->pVertices[j].lightNormalIndex;
-        }
-    }
-    PRINTF(4)("Finished loading the md2 file\n");
-#endif
-
-  //delete [] buffer;
   fclose(pFile);
 
@@ -240 +188 @@
     MD3BoneFrameData* md = new MD3BoneFrameData;
     fread(md, 1, sizeof(MD3BoneFrameData), pFile);
+    this->boneFrames[i]->data = md;
   }
 
@@ -262 +211 @@
       MD3TagData* md = new MD3TagData;
       fread(md, 1, sizeof(MD3TagData), pFile);
+      this->boneFrames[i]->tags[j]->data = md;
     }
   }
@@ -274 +224 @@
 int MD3Data::readMeshes(FILE* pFile, int fileOffset)
 {
+  this->meshes = new MD3Mesh*[this->header->meshNum];
+
+  for( int i = 0; i < this->header->meshNum; i++)
+  {
+    this->meshes[i] = new MD3Mesh();
+
+  }
   return 0;
 }

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

@@ -110 +110 @@
 
   MD3BoneFrame**      boneFrames;        //!< array of bone frames, contains the metadata (bounding box, tags,...) for each frame
-  MD3Mesh*            meshes;            //!< array of meshes in the model. each containing the mesh for each of the animation
+  MD3Mesh**           meshes;            //!< array of meshes in the model. each containing the mesh for each of the animation
 
   int                 parentTagIndex;    //!< tag index

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

@@ -24 +24 @@
  *  md3 mesh constructor
  */
-MD3Mesh::MD3Mesh(FILE *pFile, int dataOffset)
+MD3Mesh::MD3Mesh()
 {
 }

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

@@ -23 +23 @@
 {
   public:
-    MD3Mesh(FILE *pFile, int dataOffset);
+    MD3Mesh();
     virtual ~MD3Mesh();
 

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

@@ -30 +30 @@
 
 
-  private:
+  public:
     std::string               name;                   //!< name of tag as its usualy called in the md3 file
     Vector                    position;               //!< the position of the tag reltive to the models containing that tag

branches/bsp_model/src/lib/graphics/importer/md_model_structure.h

@@ -2 +2 @@
  * @file md_model_structure.h
  */
+
+
+
+#ifndef _MD3_MODEL_STRUCTURE_H
+#define _MD3_MODEL_STRUCTURE_H
 
 
@@ -81 +86 @@
 } sAnimState;
 
+#endif /* _MD3_MODEL_STRUCTURE_H */