Changeset 4281 in orxonox.OLD

Timestamp:

May 24, 2005, 6:21:17 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: seperated the data from the model: now MD2Data represents the vertex/skin data of a model and can be shared between multiple MD2Models.

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

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

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

@@ -195 +195 @@
   sVec3D* nextVec;
 
-  currVec = &this->pVertices[this->numVertices * this->animationState.currentFrame];
-  nextVec = &this->pVertices[this->numVertices * this->animationState.nextFrame];
-
-  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;
+  currVec = &this->data->pVertices[this->data->numVertices * this->animationState.currentFrame];
+  nextVec = &this->data->pVertices[this->data->numVertices * this->animationState.nextFrame];
+
+  for(int i = 0; i < this->data->numFrames; ++i)
+    {
+      verticesList[i][0] = (currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0])) * this->data->scaleFactor;
+      verticesList[i][1] = (currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1])) * this->data->scaleFactor;
+      verticesList[i][2] = (currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2])) * this->data->scaleFactor;
     }
 }
@@ -247 +247 @@
 {
   static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
-  int* pCommands = this->pGLCommands;
+  int* pCommands = this->data->pGLCommands;
 
   /* some face culling stuff */
@@ -257 +257 @@
   this->processLighting();
   this->interpolate(verticesList);
-  this->material->select();
+  this->data->material->select();
 
   /* draw the triangles */
@@ -274 +274 @@
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
-          glNormal3fv(anorms[this->pLightNormals[pCommands[2]]]);
+          glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
           glTexCoord2f( ((float *)pCommands)[0], 1.0-((float *)pCommands)[1] );
           glVertex3fv(verticesList[pCommands[2]]);
@@ -297 +297 @@
     }
 
-  if( this->animationState.currentFrame > (this->numFrames - 1) )
+  if( this->animationState.currentFrame > (this->data->numFrames - 1) )
     this->animationState.currentFrame = 0;
-  if( this->animationState.nextFrame > (this->numFrames - 1) )
+  if( this->animationState.nextFrame > (this->data->numFrames - 1) )
     this->animationState.nextFrame = 0;
 
@@ -317 +317 @@
 {
   PRINT(0)("==========================| MD2Model::debug() |===\n");
-  PRINT(0)("=  Model FileName:\t%s\n", this->fileName);
-  PRINT(0)("=  Skin FileName:\t%s\n", this->skinFileName);
-  PRINT(0)("=  Size in Memory:\t%i Bytes\n", this->header->frameSize * this->header->numFrames + 64); // 64bytes is the header size
-  PRINT(0)("=  Number of Vertices:\t%i\n", this->header->numVertices);
-  PRINT(0)("=  Number of Frames: \t%i\n", this->header->numFrames);
-  PRINT(0)("=  Height, Width\t\t%i, %i\n", this->header->skinHeight, this->header->skinWidth);
+  PRINT(0)("=  Model FileName:\t%s\n", this->data->fileName);
+  PRINT(0)("=  Skin FileName:\t%s\n", this->data->skinFileName);
+  PRINT(0)("=  Size in Memory:\t%i Bytes\n", this->data->header->frameSize * this->data->header->numFrames + 64); // 64bytes is the header size
+  PRINT(0)("=  Number of Vertices:\t%i\n", this->data->header->numVertices);
+  PRINT(0)("=  Number of Frames: \t%i\n", this->data->header->numFrames);
+  PRINT(0)("=  Height, Width\t\t%i, %i\n", this->data->header->skinHeight, this->data->header->skinWidth);
   PRINT(0)("===================================================\n\n");
 }
@@ -422 +422 @@
   this->skinFileName = new char[strlen(fileName)+1];
   strcpy(this->skinFileName, fileName);
+
   this->material = new Material("md2ModelTest");
   this->material->setDiffuseMap(fileName);

orxonox/trunk/src/lib/graphics/importer/md2Model.h

@@ -164 +164 @@
  private:
   MD2Data* data;
-
+  
   int numFrames;
   int numVertices;
@@ -177 +177 @@
   int* pLightNormals;
   glCommandVertex* pGLCommands2;
+  
 
   Material* material;