Changeset 4238 in orxonox.OLD

Timestamp:

May 20, 2005, 2:16:21 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_model: little clean up and some load speed improvements

File:

• orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc (modified) (4 diffs)

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

@@ -574 +574 @@
   for(int i = 0; i < this->numFrames; ++i)
     {
-      /*
-      faster but evt. buggy
       frame = (sFrame*)(buffer + this->header->frameSize * i); 
       pVertex = this->pVertices + this->numVertices  * i;
       pNormals = this->pLightNormals + this->numVertices * 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)
@@ -591 +585 @@
           pVertex[j][2] = -1.0 * (frame->pVertices[j].v[1] * frame->scale[1]) + frame->translate[1];
           
-          //printf("pVertex %f, %f, %f\n", pVertex[j][0], pVertex[j][1], pVertex[j][2]);
-
           pNormals[j] = frame->pVertices[j].lightNormalIndex;
         }
@@ -625 +617 @@
   nextVec = &this->pVertices[this->numVertices * this->animationState.nextFrame];
 
-    for(int i = 0; i < this->numFrames; ++i)
-      //for(int i = 0; i < this->numVertices; ++i)
-      { 
-        /*
-        verticesList[i][0] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][0] * this->scaleFactor;
-        verticesList[i][1] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][1] * this->scaleFactor;
-        verticesList[i][2] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][2] * this->scaleFactor;
-        */
-
-
-        verticesList[i][0] = (currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0])) * this->scaleFactor;
-        verticesList[i][1] = (currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1])) * this->scaleFactor;
-        verticesList[i][2] = (currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2])) * this->scaleFactor;
-      }
+  for(int i = 0; i < this->numFrames; ++i)
+    {
+      verticesList[i][0] = (currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0])) * this->scaleFactor;
+      verticesList[i][1] = (currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1])) * this->scaleFactor;
+      verticesList[i][2] = (currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2])) * this->scaleFactor;
+    }
 }
 
@@ -738 +722 @@
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
-          /* for quake2 lighting */
-          //float l = shadeDots[this->pLightNormals[pCommands[2]]];
-          //glColor3f(l * lcolor[0], l * lcolor[1], l * lcolor[2]);
-
           glNormal3fv(anorms[this->pLightNormals[pCommands[2]]]);
           glTexCoord2f( ((float *)pCommands)[0], 1.0-((float *)pCommands)[1] );
-          //printf("pCommands %f, %f\n", ((float *)pCommands)[0], ((float *)pCommands)[1]);
           glVertex3fv(verticesList[pCommands[2]]);
-
-          //printf("draw vert: %f, %f, %f\n", verticesLit[pCommands[2]][0], verticesList[pCommands[2]][1], verticesList[pCommands[2]][2] );
         }
       glEnd();