Changeset 8659 in orxonox.OLD

Timestamp:

Jun 21, 2006, 3:25:47 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 interkeyframe animation works now

Location:

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

Files:

• md3_animation_cfg.cc (modified) (1 diff)
• md3_model.cc (modified) (2 diffs)

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

@@ -197 +197 @@
     //some adjustements:
     if( anim->fps == 0)
-      anim->fps = 1;
+      anim->fps = 33;
 
     PRINTF(0)("Animation: first frame: %i, num frames: %i, num loops: %i, fps: %i\n", anim->first, anim->numFrames, anim->numLoopFrames, anim->fps);

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

@@ -167 +167 @@
 //       {
         //interpolate mesh frame between the 2 current mesh frames
+      if( data->header->boneFrameNum > 1)
         this->interpolateMeshFrame( data,
                                     mesh->meshFrames[data->animationState.currentFrame],
                                     mesh->meshFrames[data->animationState.nextFrame],
                                     data->animationState.interpolationFraction, mesh, i);
+      else
+        this->interpolateMeshFrame( data,
+                                    mesh->meshFrames[data->animationState.currentFrame],
+                                    mesh->meshFrames[data->animationState.currentFrame],
+                                    0.0f, mesh, i);
 //       }
 //       else
@@ -670 +676 @@
         else {
           this->time += time * data->animation->fps;
-          PRINTF(0)("anim state: +=%f, =%f\n", time * data->animation->fps, this->time);
           if(this->time > 1.0f)
           {