Changeset 8657 in orxonox.OLD

Timestamp:

Jun 21, 2006, 3:02:27 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 mesh messing up during animation

Location:

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

Files:

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

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

@@ -197 +197 @@
     //some adjustements:
     if( anim->fps == 0)
-      anim->fps = 33;
+      anim->fps = 1;
 
     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

@@ -48 +48 @@
 
     // set the animation
-    this->interpolate(this->md3Data, this->config->getAnimation("Dead 3"), MD3_ANIM_NEXT, false);
+    this->interpolate(this->md3Data, this->config->getAnimation("Dead 1"), MD3_ANIM_NEXT, false);
   }
 
@@ -163 +163 @@
       MD3Mesh* mesh = data->meshes[i];
 
-      // get mesh frame, do interpolation if necessary
-      sVec3D* frame;
-      if( data->animationState.interpolationFraction != 0.0 &&
-          data->animationState.currentFrame != data->animationState.nextFrame)
-      {
+//       if( data->animationState.interpolationFraction != 0.0 &&
+//           data->animationState.currentFrame != data->animationState.nextFrame)
+//       {
         //interpolate mesh frame between the 2 current mesh frames
-//         frame = this->interpolateMeshFrame( data,
-//                                             data->meshes[data->animationState.currentFrame]->meshFrames,
-//                                             data->meshes[data->animationState.nextFrame]->meshFrames,
-//                                             data->animationState.interpolationFraction, mesh, i);
-        frame = this->interpolateMeshFrame( data,
-                                            &mesh->meshFrames[data->animationState.currentFrame],
-                                            &mesh->meshFrames[data->animationState.nextFrame],
-                                            data->animationState.interpolationFraction, mesh, i);
-      }
-      else
-      {
-        //no interpolation needed, just draw current frame
-        frame = &mesh->meshFrames[data->animationState.currentFrame];
-      }
-      data->tmpMesh[i] = frame;
+        this->interpolateMeshFrame( data,
+                                    &mesh->meshFrames[data->animationState.currentFrame],
+                                    &mesh->meshFrames[data->animationState.nextFrame],
+                                    data->animationState.interpolationFraction, mesh, i);
+//       }
+//       else
+//       {
+//         //no interpolation needed, just draw current frame
+//         frame = &mesh->meshFrames[data->animationState.currentFrame];
+//       }
 
 
@@ -293 +286 @@
     {
       MD3Mesh* mesh = data->meshes[i];
+      sVec3D* frame = data->tmpMesh[i];
 
       if( mesh->header->textureNum > 0 && &mesh->material[0] != NULL)
         mesh->material[0].select();
-
-      // get mesh frame, do interpolation if necessary
-      sVec3D* frame = data->tmpMesh[i];
 
       this->drawMesh(mesh, frame);