Changeset 8638 in orxonox.OLD

Timestamp:

Jun 20, 2006, 5:04:15 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 more md3 animation stuff

Location:

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

Files:

• md3_bone_frame.h (modified) (2 diffs)
• md3_data.h (modified) (2 diffs)
• md3_model.cc (modified) (5 diffs)
• md3_model.h (modified) (4 diffs)

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

@@ -6 +6 @@
  */
 
-#ifndef _MD3_ANIMATION_H
-#define _MD3_ANIMATION_H
+#ifndef _MD3_BONE_FRAME_ANIMATION_H
+#define _MD3_BONE_FRAME_ANIMATION_H
 
 #include "vector.h"
@@ -51 +51 @@
 }
 
-#endif /* _MD3_ANIMATION_H */
+#endif /* _MD3_BONE_FRAME_ANIMATION_H */

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

@@ -40 +40 @@
   class MD3Mesh;
   class MD3Normal;
+  class MD3Animation;
 
   //! This holds the header information that is read in at the beginning of the file: id software definition
@@ -118 +119 @@
       float**                   tmpMatrix;         //!< a temporary matrix
 
+
+     /* the animation part */
+     MD3Animation*              animation;         //!< animation
+     int                        op;                //!< the current operation
+     int                        upperBound;        //!< the upper bound
+     bool                       bInterpolate;      //!< interpolate the frames
   };
 

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

@@ -21 +21 @@
 #include "md3_tag.h"
 #include "md3_bone_frame.h"
+#include "md3_animation.h"
 
 #include "md3_animation_cfg.h"
@@ -547 +548 @@
    * @param interpolate Should interpolation be done?
    */
-  void MD3Model::interpolate(MD3Data* data, MD3Animation* anim, int op, bool interpolate)
-  {
-
-// //     data->
-//     this.anim=anim;
-//     if( op == NEXT || op == PREVIOUS || op == REWIND)
-//       this.op=op;
-//
-//     this.interpolate=interpolate;
+  void MD3Model::interpolate(MD3Data* data, MD3Animation* anim, int op, bool bInterpolate)
+  {
+     data->animation = anim;
+     if( data->op == NEXT || data->op == PREVIOUS || data->op == REWIND)
+      data->op = op;
+
+     data->bInterpolate = bInterpolate;
   }
 
@@ -562 +561 @@
    * calc next frame number
    */
-  int MD3Model::next(int nr)
-  {
-#if 0
-    if( nr < (upperBound-1))
-      return nr+1;
+  int MD3Model::next(MD3Data* data, int nr)
+  {
+    if( nr < (data->upperBound - 1))
+      return nr + 1;
     else
     { //rewind needed
-      if( anim.num < 0)
-        return anim.first;
+      if( data->animation->numFrames < 0)
+        return data->animation->first;
       else {
-        nr = (anim.looping != 0)?(anim.num - anim.looping):0;
-        return anim.first + nr;
-      }
-    }
-#endif
+        nr = (data->animation->numLoopFrames != 0)?(data->animation->numFrames - data->animation->numLoopFrames):0;
+        return data->animation->first + nr;
+      }
+    }
   }
 
@@ -583 +580 @@
    * calc prev frame number
    */
-  int MD3Model::prev(int nr)
+  int MD3Model::prev(MD3Data* data, int nr)
   {
 #if 0
@@ -597 +594 @@
    * apply the specified operation to the animation state data members of the model
    * taking the specified animation into account
+   *
+   * @param data: the data of the model
    */
   void MD3Model::doOp(MD3Data* data)

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

@@ -13 +13 @@
 
 
+#define FRACTION 0.34f
+
+
 namespace md3
 {
@@ -25 +28 @@
 
 struct MD3Normal;
+
+
+typedef enum MD3FrameHandling {
+  NEXT = 0,          //!< swith to the next frame
+  PREVIOUS,          //!< swith to the previous frame
+  REWIND             //!< rewind the animation
+};
 
 
@@ -56 +66 @@
     float* interpolateTransformation(MD3Data* data, MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac, int i);
 
-    void interpolate(MD3Data* data, MD3Animation* anim, int op, bool interpolate);
-    int next(int nr);
-    int prev(int nr);
+    void interpolate(MD3Data* data, MD3Animation* anim, int op, bool bInterpolate);
+    int next(MD3Data* data, int nr);
+    int prev(MD3Data* data, int nr);
     void doOp(MD3Data* data);
 
@@ -70 +80 @@
     MD3AnimationCfg*    config;            //!< the config file parsed
 
+};
 
-};
 
 }