Changeset 8564 in orxonox.OLD

Timestamp:

Jun 17, 2006, 1:58:03 PM (18 years ago)

Author:

patrick

Message:

trying to break down the draw function into cont functions

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

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

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

@@ -48 +48 @@
 
     this->tmpNormal = new MD3Normal[2048];                    //!< the temporary normals
+
+    this->tmpMatrix = new float*[this->md3Data->tagNum];
+    for( int i = 0; i < this->md3Data->tagNum; i++)
+      this->tmpMatrix[i] = new float[16];
   }
 
@@ -55 +59 @@
   {
     delete this->tmpBoneFrame;
-    delete [] this->tmpMesh;
+//     delete [] this->tmpMesh;
+
+    ///TODO deleting mesh
+    ///TODO deleting matrices
   }
 
@@ -124 +131 @@
     // draw all models linked to this model
     std::map<int, MD3Data*>::iterator it = data->sortedMap.begin();
+    int i = 0;
     while( it != data->sortedMap.end())
     {
@@ -137 +145 @@
         //we need to interpolate
         MD3Tag* nextFrameTag = data->boneFrames[data->animationState.nextFrame]->tags[child->parentTagIndex];
-        m = this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction);
+        m = this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction, i);
           }
           else {
@@ -168 +176 @@
 
           glPopMatrix();
+          i++;
     }
   }
@@ -232 +241 @@
       }
 
+
       // draw vertex normals if needed
       if( this->bDrawNormals) {
@@ -261 +271 @@
         //we need to interpolate
         MD3Tag* nextFrameTag = data->boneFrames[data->animationState.nextFrame]->tags[child->parentTagIndex];
-        m = this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction);
+//         m = this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction);
       }
       else {
@@ -464 +474 @@
    * interpolate transformation
    */
-  float* MD3Model::interpolateTransformation(MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac)
+  float* MD3Model::interpolateTransformation(MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac, int i)
   {
     // interpolate position
@@ -481 +491 @@
 
     // quaternion code is column based, so use transposed matrix when spitting out to gl
-    this->tmpMatrix[0] = interpolatedMatrix[0][0];
-    this->tmpMatrix[4] = interpolatedMatrix[1][0];
-    this->tmpMatrix[8] = interpolatedMatrix[2][0];
-    this->tmpMatrix[12] = interpolatedPosition.x;
-    this->tmpMatrix[1] = interpolatedMatrix[0][1];
-    this->tmpMatrix[5] = interpolatedMatrix[1][1];
-    this->tmpMatrix[9] = interpolatedMatrix[2][1];
-    this->tmpMatrix[13] = interpolatedPosition.y;
-    this->tmpMatrix[2] = interpolatedMatrix[0][2];
-    this->tmpMatrix[6] = interpolatedMatrix[1][2];
-    this->tmpMatrix[10]= interpolatedMatrix[2][2];
-    this->tmpMatrix[14] = interpolatedPosition.z;
-    this->tmpMatrix[3] = 0.0f;
-    this->tmpMatrix[7] = 0.0f;
-    this->tmpMatrix[11]= 0.0f;
-    this->tmpMatrix[15] = 1.0f;
-
-    return this->tmpMatrix;
+    this->tmpMatrix[i][0] = interpolatedMatrix[0][0];
+    this->tmpMatrix[i][4] = interpolatedMatrix[1][0];
+    this->tmpMatrix[i][8] = interpolatedMatrix[2][0];
+    this->tmpMatrix[i][12] = interpolatedPosition.x;
+    this->tmpMatrix[i][1] = interpolatedMatrix[0][1];
+    this->tmpMatrix[i][5] = interpolatedMatrix[1][1];
+    this->tmpMatrix[i][9] = interpolatedMatrix[2][1];
+    this->tmpMatrix[i][13] = interpolatedPosition.y;
+    this->tmpMatrix[i][2] = interpolatedMatrix[0][2];
+    this->tmpMatrix[i][6] = interpolatedMatrix[1][2];
+    this->tmpMatrix[i][10]= interpolatedMatrix[2][2];
+    this->tmpMatrix[i][14] = interpolatedPosition.z;
+    this->tmpMatrix[i][3] = 0.0f;
+    this->tmpMatrix[i][7] = 0.0f;
+    this->tmpMatrix[i][11]= 0.0f;
+    this->tmpMatrix[i][15] = 1.0f;
+
+    return this->tmpMatrix[i];
 
   }

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.h

@@ -49 +49 @@
     sVec3D* interpolateMeshFrame(sVec3D* currMeshFrame, sVec3D* nextMeshFrame, float frac, MD3Mesh* mesh, int i);
     MD3Normal* interpolateVertexNormals(MD3Normal* curNormals, MD3Normal* nextNormals, float frac, MD3Mesh* mesh);
-    float* interpolateTransformation(MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac);
+    float* interpolateTransformation(MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac, int i);
 
   private:
@@ -60 +60 @@
     sVec3D**            tmpMesh;           //!< a temporary mesh frame
     MD3Normal*          tmpNormal;         //!< a temporary normals frame
-    float               tmpMatrix[16];     //!< a temporary matrix
+    float**             tmpMatrix;         //!< a temporary matrix
     Vector              tmpVec1;
     Vector              tmpVec2;