Changeset 6207 in orxonox.OLD for branches/christmas_branche/src/lib/graphics/importer

Timestamp:

Dec 21, 2005, 2:31:24 AM (19 years ago)

Author:

patrick

Message:

christmas: test_entity is now also loadable and heavily used in the christmas branche

Location:

branches/christmas_branche/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (9 diffs)
• md2Model.h (modified) (2 diffs)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -33 +33 @@
   #include "anormtab.h"
 };
-
-//! again one of these strange id software parts
-static float *shadeDots = MD2Model::anormsDots[0];
-
-
-static sVec3D verticesList[MD2_MAX_VERTICES];
 
 
@@ -90 +84 @@
   this->scaleFactor = this->data->scaleFactor;
 
+  shadeDots = MD2Model::anormsDots[0];
   /* set the animation stat mannualy */
   this->animationState.type = STAND;
@@ -111 +106 @@
 /**
  *  initializes an array of vert with the current frame scaled vertices
- * @param verticesList: the list of vertices to interpolate between
+ * @param this->verticesList: the list of vertices to interpolate between
 
    we won't use the pVertices array directly, since its much easier and we need
    saving of data anyway
 */
-void MD2Model::interpolate(/*sVec3D* verticesList*/)
+void MD2Model::interpolate(/*sVec3D* this->verticesList*/)
 {
   sVec3D* currVec;
@@ -126 +121 @@
   for( int i = 0; i < this->data->numVertices; ++i)
     {
-      verticesList[i][0] = currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0]);
-      verticesList[i][1] = currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1]);
-      verticesList[i][2] = currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2]);
+      this->verticesList[i][0] = currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0]);
+      this->verticesList[i][1] = currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1]);
+      this->verticesList[i][2] = currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2]);
     }
 }
@@ -172 +167 @@
   this->animate(time);
   this->processLighting();
-  this->interpolate(/*verticesList*/);
+  this->interpolate(/*this->verticesList*/);
 }
 
@@ -185 +180 @@
   glPushMatrix();
   this->renderFrame();
-//   renderFrameTriangles();
+  // renderFrameTriangles();
   glPopMatrix();
 }
@@ -222 +217 @@
           glTexCoord2f( ((float *)pCommands)[0], ((float *)pCommands)[1] );
           glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
-          glVertex3fv(verticesList[pCommands[2]]);
+          glVertex3fv(this->verticesList[pCommands[2]]);
         }
       glEnd();
@@ -234 +229 @@
 void MD2Model::renderFrameTriangles() const
 {
-  //static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
+  //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
   int* pCommands = this->data->pGLCommands;
   /* some face culling stuff */
@@ -243 +238 @@
 //
 //   this->processLighting();
-//   this->interpolate(/*verticesList*/);
+//   this->interpolate(/*this->verticesList*/);
   this->data->material->select();
 

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -241 +241 @@
   static float        anormsDots[SHADEDOT_QUANT][256];  //!< the anormals dot products
   static sAnim        animationList[21];                //!< the anomation list
+   //! again one of these strange id software parts
+  float*              shadeDots;
 
   MD2Data*            data;                             //!< the md2 data pointer
@@ -247 +249 @@
   float               scaleFactor;                      //!< the scale factor (individual)
   sAnimState          animationState;                   //!< animation state of the model
+  sVec3D              verticesList[MD2_MAX_VERTICES];   //!< place to temp sav the vert
 };