Changeset 4234 in orxonox.OLD for orxonox/branches

Timestamp:

May 20, 2005, 1:40:47 AM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: fixed the segfault bug: the glcommand list had some offset problems

Location:

orxonox/branches/md2_loader/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (1 diff)
• md2Model.cc (modified) (4 diffs)
• md2Model.h (modified) (1 diff)

orxonox/branches/md2_loader/src/lib/graphics/importer/abstract_model.h

@@ -68 +68 @@
   short indexToTexCoor[3];              //!< index to the texture coordinates
 } sTriangle;
+
+
+typedef struct
+{
+   float s, t;
+   int vertexIndex;
+} glCommandVertex;
 
 

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

@@ -562 +562 @@
   this->pVertices = new sVec3D[this->numVertices * this->numFrames];
   this->pGLCommands = new int[this->numGLCommands];
+  //this->pGLCommands2 = new int[this->numGLCommands];
   this->pLightNormals = new int[this->numVertices * this->numFrames];
   buffer = new char[this->numFrames * this->header->frameSize];
@@ -571 +572 @@
   fseek(pFile, this->header->offsetGlCommands, SEEK_SET);
   fread(this->pGLCommands, sizeof(int), this->numGLCommands, pFile);
+  //fread(this->pGLCommands2, sizeof(glCommandVertex), this->numGLCommands, pFile);
 
   for(int i = 0; i < this->numFrames; ++i)
@@ -629 +631 @@
   
   //printf("numFrames: %i\n", this->numFrames);
-  // printf("currentFrame: %i\n", this->animationState.currentFrame);
+  //printf("currentFrame: %i\n", this->animationState.currentFrame);
   
     //for(int i = 0; i < this->numFrames; ++i)
@@ -765 +767 @@
   while( int i = *(pCommands++)) /* strange looking while loop for maximum performance */
     {
-      int i;
       if( i < 0)
         {

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.h

@@ -243 +243 @@
   int* pGLCommands;
   int* pLightNormals;
+  glCommandVertex* pGLCommands2;
 
   unsigned int textureID;