Changeset 5087 in orxonox.OLD for trunk/src/lib/graphics/importer/md2Model.cc

Timestamp:

Aug 20, 2005, 5:39:13 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added some droids in the middle of the track to the left side. They die on shooting. Bensch: have some fun

File:

• trunk/src/lib/graphics/importer/md2Model.cc (modified) (8 diffs)

trunk/src/lib/graphics/importer/md2Model.cc

@@ -87 +87 @@
 
   this->scaleFactor = this->data->scaleFactor;
-  this->setAnim(BOOM);
+  this->setAnim(STAND);
 }
 
@@ -134 +134 @@
 {
   if( (type < 0) || (type > MAX_ANIMATIONS) )
-    type = 0;
+    type = STAND;
 
   this->animationState.startFrame = animationList[type].firstFrame;
@@ -142 +142 @@
   this->animationState.type = type;
 
-  this->animationState.interpolationState = 0.0;
-  this->animationState.localTime = 0.0;
-  this->animationState.lastTime = 0.0;
+  this->animationState.interpolationState = 0.0f;
+  this->animationState.localTime = 0.0f;
+  this->animationState.lastTime = 0.0f;
   this->animationState.currentFrame = animationList[type].firstFrame;
 }
@@ -169 +169 @@
   glPushMatrix();
 
-  this->renderFrameGLList();
-//  this->renderFrameTriangles();
+  this->renderFrame();
 
   glPopMatrix();
@@ -179 +178 @@
   \brief this is an internal function to render this special frame selected by animate()
 */
-void MD2Model::renderFrameGLList()
+void MD2Model::renderFrame()
 {
   static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
@@ -194 +193 @@
   this->data->material->select();
 
-  printf("=============================FRAME\n");
   /* draw the triangles */
   while( int i = *(pCommands++)) /* strange looking while loop for maximum performance */
@@ -218 +216 @@
 
     }
-  glDisable(GL_CULL_FACE);
-  glPopAttrib();
-}
-
-
-/**
- *  renders the frame using triangles
- */
-void MD2Model::renderFrameTriangles()
-{
-  static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
-  int* pCommands = this->data->pGLCommands;
-
-  /* some face culling stuff */
-  glPushAttrib(GL_POLYGON_BIT);
-  glFrontFace(GL_CW);
-  glEnable(GL_CULL_FACE);
-  glCullFace(GL_BACK);
-
-  this->processLighting();
-  this->interpolate(verticesList);
-  this->data->material->select();
-
-  /* draw the triangles */
-  glBegin(GL_TRIANGLES);
-
-  for( int i = 0, k = 0; i < this->data->numTriangles; ++i, k += 3)
-  {
-    printf("%i: (%f, %f)\n", i, (float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[2]].s, (float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[2]].t);
-
-    glTexCoord2f((float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[0]].s,
-                 (float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[0]].t);
-    //glNormal3f(Md2Model.normal[i].x, Md2Model.normal[i].y, Md2Model.normal[i].z);
-    glVertex3fv(verticesList[this->data->pTriangles[i].indexToVertices[0]]);
-
-    glTexCoord2f((float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[1]].s,
-                  (float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[1]].t);
-
-//    glNormal3f(Md2Model.normal[i].x, Md2Model.normal[i].y, Md2Model.normal[i].z);
-    glVertex3fv(verticesList[this->data->pTriangles[i].indexToVertices[1]]);
-
-    glTexCoord2f((float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[2]].s,
-                  (float)this->data->pTexCoor[this->data->pTriangles[i].indexToTexCoor[2]].t);
-//    glNormal3f(Md2Model.normal[i].x, Md2Model.normal[i].y, Md2Model.normal[i].z);
-    glVertex3fv(verticesList[this->data->pTriangles[i].indexToVertices[2]]);
-  }
-
-  glEnd();
-
-
   glDisable(GL_CULL_FACE);
   glPopAttrib();
@@ -431 +379 @@
   fseek(pFile, this->header->offsetTexCoords, SEEK_SET);
   fread(this->pTexCoor, sizeof(sTexCoor), this->numTexCoor, pFile);
-  for( int i = 0; i < this->numTexCoor; ++i)
-  {
-    printf("%i: (%i, %i)\n", i, this->pTexCoor[i].s, this->pTexCoor[i].t);
-  }
+
 
   for(int i = 0; i < this->numFrames; ++i)