Changeset 8436 in orxonox.OLD

Timestamp:

Jun 15, 2006, 1:24:23 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 data gets loaded correctly as it seems

File:

• branches/bsp_model/src/lib/graphics/importer/md3/md3_data.cc (modified) (1 diff)

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

@@ -369 +369 @@
   this->meshes[mesh]->normals = new MD3Normal[this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum];
 
-  // read out the compressed data
-  MD3VertexCompressed* vc = new MD3VertexCompressed[this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum];
-  fread(vc, 1, sizeof(MD3VertexCompressed) * this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum, pFile);
-
-  int index;
-
-  for( int i = 0; i < this->meshes[mesh]->header->meshFrameNum; i++)
+  for( int i = 0; i < this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum; i++)
   {
-    for( int j = 0; j < this->meshes[mesh]->header->vertexNum; j++)
-    {
-      index = i * this->meshes[mesh]->header->meshFrameNum + j;
-      this->meshes[mesh]->meshFrames[index][0] = (float)vc[index].vector[0] / 64.0f;
-      this->meshes[mesh]->meshFrames[index][1] = (float)vc[index].vector[1] / 64.0f;
-      this->meshes[mesh]->meshFrames[index][2] = (float)vc[index].vector[2] / 64.0f;
-
-      this->meshes[mesh]->normals[index].vertexNormal[0] = vc[index].vertexNormal[0];
-      this->meshes[mesh]->normals[index].vertexNormal[1] = vc[index].vertexNormal[1];
-    }
+    // read out the compressed data
+    MD3VertexCompressed* vc = new MD3VertexCompressed;
+    fread(vc, 1, sizeof(MD3VertexCompressed), pFile);
+
+    this->meshes[mesh]->meshFrames[i][0] = (float)vc->vector[0] / 64.0f;
+    this->meshes[mesh]->meshFrames[i][1] = (float)vc->vector[1] / 64.0f;
+    this->meshes[mesh]->meshFrames[i][2] = (float)vc->vector[2] / 64.0f;
+
+    this->meshes[mesh]->normals[i].vertexNormal[0] = vc->vertexNormal[0];
+    this->meshes[mesh]->normals[i].vertexNormal[1] = vc->vertexNormal[1];
   }
 
   // delete the temp memory again
-  delete [] vc;
+//   delete vc;
 
   return this->meshes[mesh]->header->meshFrameNum * this->meshes[mesh]->header->vertexNum * sizeof(MD3VertexCompressed);