Changeset 8382 in orxonox.OLD

Timestamp:

Jun 14, 2006, 12:54:52 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 work flush

Location:

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

Files:

• md3_data.cc (modified) (2 diffs)
• md3_data.h (modified) (1 diff)
• md3_mesh.h (modified) (1 diff)

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

@@ -257 +257 @@
       if( localFileOffset == this->meshes[i]->header->triangleStart  && !bTriangles)
       {
-        localFileOffset += this->readMeshTriangles(pFile, localFileOffset);
+        localFileOffset += this->readMeshTriangles(pFile, localFileOffset, i);
         bTriangles = true;
       }
       else if( localFileOffset == this->meshes[i]->header->textureStart && !bTextures)
       {
-        fileOffset += this->readMeshTextures(pFile, localFileOffset);
+        fileOffset += this->readMeshTextures(pFile, localFileOffset, i);
         bTextures = true;
       }
       else if( localFileOffset == this->meshes[i]->header->texVecStart && !bTexVecs)
       {
-        localFileOffset += this->readMeshTexVecs(pFile, localFileOffset);
+        localFileOffset += this->readMeshTexVecs(pFile, localFileOffset, i);
         bTexVecs = true;
       }
       else if( fileOffset == this->meshes[i]->header->vertexStart && !bVertices)
       {
-        localFileOffset += this->readMeshVertices(pFile, localFileOffset);
+        localFileOffset += this->readMeshVertices(pFile, localFileOffset, i);
         bVertices = true;
       }
@@ -280 +280 @@
 }
 
-}
-
+
+
+int MD3Data::readMeshTriangles(FILE* pFile, int fileOffset, int mesh)
+{
+  this->meshes[mesh]->triangles = new int[this->meshes[mesh]->header->triangleNum][3];
+}
+
+int MD3Data::readMeshTextures(FILE* pFile, int fileOffset, int mesh)
+{}
+
+int MD3Data::readMeshTexVecs(FILE* pFile, int fileOffset, int mesh)
+{}
+
+int MD3Data::readMeshVertices(FILE* pFile, int fileOffset, int mesh)
+{}
+
+}
+
+
+
+
+
+
+

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

@@ -89 +89 @@
 
 
-   int readMeshTriangles(FILE* pFile, int fileOffset);
-   int readMeshTextures(FILE* pFile, int fileOffset);
-   int readMeshTexVecs(FILE* pFile, int fileOffset);
-   int readMeshVertices(FILE* pFile, int fileOffset);
+   int readMeshTriangles(FILE* pFile, int fileOffset, int mesh);
+   int readMeshTextures(FILE* pFile, int fileOffset, int mesh);
+   int readMeshTexVecs(FILE* pFile, int fileOffset, int mesh);
+   int readMeshVertices(FILE* pFile, int fileOffset, int mesh);
 
  public:

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

@@ -50 +50 @@
 
     //MD3Texture*      textures;                //!< array of textures of size textureNum
-    int*               triangles;               //!< indices into mesh frames and texture coord arrays
+    int**              triangles;               //!< indices into mesh frames and texture coord arrays
     float*             textureCoords;           //!< U/V textures coordinates of vertices
     Vector             meshFrames;              //!< mesh frames