Changeset 8557 in orxonox.OLD

Timestamp:

Jun 17, 2006, 11:39:34 AM (18 years ago)

Author:

patrick

Message:

bsp: mesh interpolation finished

Location:

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

Files:

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

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

@@ -39 +39 @@
 
     this->tmpBoneFrame = new MD3BoneFrame();
+    this->tmpMesh = new sVec3D[2048];          //!< the temporary mesh, hopefully newer bigger than 2048 vertices
   }
 
@@ -46 +47 @@
   {
     delete this->tmpBoneFrame;
+    delete [] this->tmpMesh;
   }
 
@@ -101 +103 @@
           data->animationState.currentFrame != data->animationState.nextFrame) {
         //interpolate mesh frame between the 2 current mesh frames
-        frame = this->interpolateMeshFrame(mesh, data->animationState.currentFrame, data->animationState.nextFrame,
-                                           data->animationState.interpolationFraction);
+//         frame = this->interpolateMeshFrame(mesh, data->animationState.currentFrame, data->animationState.nextFrame,
+//                                            data->animationState.interpolationFraction);
+        frame = this->interpolateMeshFrame( data->meshes[data->animationState.currentFrame]->meshFrames,
+                                            data->meshes[data->animationState.nextFrame]->meshFrames,
+                                            data->animationState.interpolationFraction, mesh);
       }
       else {
@@ -194 +199 @@
 
   /**
+   * draw bone frame
+   */
+  void MD3Model::drawBoneFrame(MD3BoneFrame* frame)
+  {}
+
+
+  /**
    *  interpolate bone frame
    * @param currBoneFrame Start bone frame.
@@ -212 +224 @@
 
     return this->tmpBoneFrame;
-
-  }
-
-
-  /**
-   * draw bone frame
-   */
-  void MD3Model::drawBoneFrame(MD3BoneFrame* frame)
-  {}
+  }
 
 
@@ -226 +230 @@
    * interpolate mesh frame
    */
-  sVec3D* MD3Model::interpolateMeshFrame(MD3Mesh* mesh, int startFrame, int nextMeshFrame, float frac)
-  {}
+  sVec3D* MD3Model::interpolateMeshFrame(sVec3D* currMeshFrame, sVec3D* nextMeshFrame, float frac, MD3Mesh* mesh)
+  {
+    int vertexNum = mesh->header->vertexNum;
+
+    // calc interpolated vertices
+    for( int t = 0; t < vertexNum * 3.0f; t++)
+    {
+      this->tmpMesh[t][0]  = (1.0f - frac)   * currMeshFrame[t][0]  + frac * nextMeshFrame[t][0];
+      this->tmpMesh[t][1]  = (1.0f - frac)   * currMeshFrame[t][1]  + frac * nextMeshFrame[t][1];
+      this->tmpMesh[t][2]  = (1.0f - frac)   * currMeshFrame[t][2]  + frac * nextMeshFrame[t][2];
+    }
+
+    return this->tmpMesh;
+  }
 
 

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

@@ -49 +49 @@
     void drawBoneFrame(MD3BoneFrame* frame);
 
-    sVec3D* interpolateMeshFrame(MD3Mesh* mesh, int startFrame, int nextMeshFrame, float frac);
+    sVec3D* interpolateMeshFrame(sVec3D* currMeshFrame, sVec3D* nextMeshFrame, float frac, MD3Mesh* mesh);
     MD3Normal* interpolateVertexNormals(MD3Normal* curNormals, MD3Normal* nextNormals, float frac);
     float* interpolateTransformation(MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac);
@@ -60 +60 @@
 
     MD3BoneFrame*       tmpBoneFrame;      //!< a temporary bone frame
+    sVec3D*             tmpMesh;           //!< a temportary mesh frame
 };