Changeset 8660 in orxonox.OLD

Timestamp:

Jun 21, 2006, 4:00:49 AM (18 years ago)

Author:

patrick

Message:

bsp: found the interpolation bug, tracing

Location:

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

Files:

• md3_data.cc (modified) (1 diff)
• md3_model.cc (modified) (12 diffs)

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

@@ -47 +47 @@
 
   this->animation = NULL;
+  this->bInterpolate = false;
+  this->upperBound = 0;
 
   this->loadModel(modelFileName);

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

@@ -48 +48 @@
 
     // set the animation
-    this->interpolate(this->md3Data, this->config->getAnimation("Dead 1"), MD3_ANIM_NEXT, false);
+    this->interpolate(this->md3Data, this->config->getAnimation("Dead 1"), MD3_ANIM_NEXT, true);
   }
 
@@ -125 +125 @@
   void MD3Model::tick(float time)
   {
+    PRINTF(0)("tick\n");
     if(this->md3Data == NULL)
       return;
@@ -131 +132 @@
 
     this->tick(time, this->md3Data);
+    PRINTF(0)("tick finished\n");
   }
 
@@ -139 +141 @@
   void MD3Model::tick(float time, MD3Data* data)
   {
-    // draw the bones if needed
+    // draw the bones if needed#
     if( this->bDrawBones)
     {
@@ -163 +165 @@
       MD3Mesh* mesh = data->meshes[i];
 
-//       if( data->animationState.interpolationFraction != 0.0 &&
-//           data->animationState.currentFrame != data->animationState.nextFrame)
-//       {
+
         //interpolate mesh frame between the 2 current mesh frames
+      PRINTF(0)(" interpolate from %i, to %i\n", data->animationState.currentFrame, data->animationState.nextFrame);
       if( data->header->boneFrameNum > 1)
         this->interpolateMeshFrame( data,
@@ -177 +178 @@
                                     mesh->meshFrames[data->animationState.currentFrame],
                                     0.0f, mesh, i);
-//       }
-//       else
-//       {
-//         //no interpolation needed, just draw current frame
-//         frame = &mesh->meshFrames[data->animationState.currentFrame];
-//       }
+
 
 
@@ -219 +215 @@
       {
         //we need to interpolate
-        MD3Tag* nextFrameTag = data->boneFrames[data->animationState.nextFrame]->tags[child->parentTagIndex];
-        this->interpolateTransformation(child, currFrameTag, nextFrameTag, data->animationState.interpolationFraction, i);
+//         MD3Tag* nextFrameTag = data->boneFrames[data->animationState.nextFrame]->tags[child->parentTagIndex];
+//         this->interpolateTransformation(child, currFrameTag, nextFrameTag, data->animationState.interpolationFraction, i);
       }
       else
@@ -260 +256 @@
   void MD3Model::draw() const
   {
+    PRINTF(0)("draw\n");
     //draw current bone frame
     this->draw(this->md3Data);
+    PRINTF(0)("draw finished\n");
   }
 
@@ -483 +481 @@
     int vertexNum = mesh->header->vertexNum;
 
-    // calc interpolated vertices
-    for( int t = 0; t < vertexNum; t++)
-    {
-      data->tmpMesh[i][t][0]  = (1.0f - frac)   * currMeshFrame[t][0]  + frac * nextMeshFrame[t][0];
-      data->tmpMesh[i][t][1]  = (1.0f - frac)   * currMeshFrame[t][1]  + frac * nextMeshFrame[t][1];
-      data->tmpMesh[i][t][2]  = (1.0f - frac)   * currMeshFrame[t][2]  + frac * nextMeshFrame[t][2];
+    if( /*frac == 0.0f*/ true)
+    {
+      // just copy the vertices
+      for( int t = 0; t < vertexNum; t++)
+      {
+        data->tmpMesh[i][t][0]  = currMeshFrame[t][0];
+        data->tmpMesh[i][t][1]  = currMeshFrame[t][1];
+        data->tmpMesh[i][t][2]  = currMeshFrame[t][2];
+      }
+    }
+    else
+    {
+      // calc interpolated vertices
+      for( int t = 0; t < vertexNum; t++)
+      {
+        data->tmpMesh[i][t][0]  = (1.0f - frac)   * currMeshFrame[t][0]  + frac * nextMeshFrame[t][0];
+        data->tmpMesh[i][t][1]  = (1.0f - frac)   * currMeshFrame[t][1]  + frac * nextMeshFrame[t][1];
+        data->tmpMesh[i][t][2]  = (1.0f - frac)   * currMeshFrame[t][2]  + frac * nextMeshFrame[t][2];
+      }
     }
 
@@ -654 +665 @@
         data->upperBound = data->header->boneFrameNum;
       else
-        data->upperBound = (data->animation->first +
-            data->animation->numFrames);
-    }
-
-
-//     PRINTF(0)("anim op: %i\n", data->op);
+        data->upperBound = (data->animation->first + data->animation->numFrames);
+    }
+
+
+     PRINTF(0)("anim op: %i\n", data->op);
     switch( data->op) {
 
@@ -665 +675 @@
         if( data->bInterpolate)
         {
-          data->animationState.interpolationFraction += time / data->animation->fps;
-          PRINTF(0)("anim state: +=%f, =%f\n", time / data->animation->fps, data->animationState.interpolationFraction);
+          // keyframe interpolation animation
+          data->animationState.interpolationFraction += time * data->animation->fps;
+
           if( data->animationState.interpolationFraction >= 1.0f)
           {
@@ -674 +685 @@
           }
         }
-        else {
+        else
+        {
+          // only keyframe animation
           this->time += time * data->animation->fps;
-          if(this->time > 1.0f)
+          if( this->time > 1.0f)
           {
-          data->animationState.currentFrame = data->animationState.nextFrame;
-          data->animationState.nextFrame = next(data, data->animationState.nextFrame);
-          this->time = 0.0f;
+            data->animationState.currentFrame = data->animationState.nextFrame;
+            data->animationState.nextFrame = next(data, data->animationState.nextFrame);
+            this->time = 0.0f;
           }
         }