Changeset 8656 in orxonox.OLD

Timestamp:

Jun 21, 2006, 2:44:45 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 interpolation less animations working focus

Location:

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

Files:

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

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

@@ -195 +195 @@
     anim->first = atoi(tokens.back().c_str()); tokens.pop_back();
 
+    //some adjustements:
+    if( anim->fps == 0)
+      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

@@ -45 +45 @@
     this->bDrawNormals = false;
 
+    this->time = 0.0f;
+
     // set the animation
-    this->interpolate(this->md3Data, this->config->getAnimation("Dead 3"), MD3_ANIM_NEXT, true);
+    this->interpolate(this->md3Data, this->config->getAnimation("Dead 3"), MD3_ANIM_NEXT, false);
   }
 
@@ -126 +128 @@
       return;
 
-    this->visit(this->md3Data);
+    this->visit(this->md3Data, time);
+
     this->tick(time, this->md3Data);
   }
@@ -154 +157 @@
     }
 
+
     //draw all meshes of current frame of this model
     for( int i = 0;  i < data->header->meshNum; i++)
@@ -165 +169 @@
       {
         //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,
+//         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);
       }
@@ -175 +184 @@
       }
       data->tmpMesh[i] = frame;
+
 
       // draw vertex normals if needed
@@ -184 +194 @@
         {
           //interpolate vertex normals
-          this->interpolateVertexNormals(data, &mesh->normals[data->animationState.currentFrame],
+          this->interpolateVertexNormals(data,
+                                         &mesh->normals[data->animationState.currentFrame],
                                          &mesh->normals[data->animationState.nextFrame],
                                          data->animationState.interpolationFraction, mesh, i);
         }
       }
+
+
     }
 
@@ -546 +559 @@
    * visit the model
    */
-  void MD3Model::visit(MD3Data* data)
+  void MD3Model::visit(MD3Data* data, float time)
   {
     if ( (data->filename.find("lower") == std::string::npos &&
@@ -556 +569 @@
           data->animation->type == ALL // the animation is allways applicable
        )
-      this->doOp(data);
+      this->doOp(data, time);
 
     // visit children
@@ -624 +637 @@
    * @param data: the data of the model
    */
-  void MD3Model::doOp(MD3Data* data)
+  void MD3Model::doOp(MD3Data* data, float time)
   {
     // animation to be applied could have illegal data with respect to this model,
@@ -655 +668 @@
         if( data->bInterpolate)
         {
-          data->animationState.interpolationFraction += FRACTION;
+          data->animationState.interpolationFraction += time / data->animation->fps;
+          PRINTF(0)("anim state: +=%f, =%f\n", time / data->animation->fps, data->animationState.interpolationFraction);
           if( data->animationState.interpolationFraction >= 1.0f)
           {
@@ -664 +678 @@
         }
         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)
+          {
           data->animationState.currentFrame = data->animationState.nextFrame;
           data->animationState.nextFrame = next(data, data->animationState.nextFrame);
+          this->time = 0.0f;
+          }
         }
-        PRINTF(0)("interpolate fraction: %f, curr frame: %i\n", data->animationState.interpolationFraction, data->animationState.currentFrame);
+        PRINTF(0)("interpolate fraction: %f, curr frame: %i, fps: %i, time: %f\n", data->animationState.interpolationFraction, data->animationState.currentFrame, data->animation->fps, time);
         break;
 
@@ -673 +693 @@
         if( data->bInterpolate)
         {
-          data->animationState.interpolationFraction -= FRACTION;
+          data->animationState.interpolationFraction -= time / data->animation->fps;
           if( data->animationState.interpolationFraction < 0.0f)
           {

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

@@ -71 +71 @@
     void interpolate(MD3Data* data, MD3Animation* anim, int op, bool bInterpolate);
 
-    void visit(MD3Data* data);
+    void visit(MD3Data* data, float time);
     int next(MD3Data* data, int nr);
     int prev(MD3Data* data, int nr);
-    void doOp(MD3Data* data);
+    void doOp(MD3Data* data, float time);
 
 
@@ -85 +85 @@
     MD3AnimationCfg*    config;            //!< the config file parsed
 
+    float               time;
+
 };