Changeset 8894 in orxonox.OLD for trunk/src/lib/graphics/importer/md2

Timestamp:

Jun 29, 2006, 12:19:48 AM (19 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

Location:

trunk/src/lib/graphics/importer/md2

Files:

• md2Model.cc (modified) (3 diffs)
• md2Model.h (modified) (3 diffs)

trunk/src/lib/graphics/importer/md2/md2Model.cc

@@ -103 +103 @@
   this->pModelInfo.pTexCoor = (float*)this->data->pTexCoor;
 
+  this->animationSpeed = 1.0f;
+
   // triangle conversion
   this->pModelInfo.pTriangles = new sTriangleExt[this->data->numTriangles];
@@ -159 +161 @@
 
 /**
+ * sets the animation type
+ * @param firstFrame: index of the first frame
+ * @param lastFrame: index of the last frame
+ * @param fps: frames per second
+ * @param bStoppable: is 1 if so, 0 else
+ */
+void MD2Model::setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable, int animPlayback)
+{
+  this->animationState.startFrame = firstFrame;
+  this->animationState.endFrame = lastFrame;
+  this->animationState.nextFrame = firstFrame + 1;
+  this->animationState.fps = fps;
+  this->animationState.type = 0;
+  this->animationState.numPlays = 0;
+  this->animationState.animPlaybackMode = animPlayback;
+
+  this->animationState.interpolationState = 0.0f;
+  this->animationState.localTime = 0.0f;
+  this->animationState.lastTime = 0.0f;
+  this->animationState.currentFrame = firstFrame;
+}
+
+/**
   \brief sets the animation type
 * @param type: animation type
@@ -196 +221 @@
 void MD2Model::tick(float time)
 {
-  this->animate(time);
+  this->animate(time * this->animationSpeed);
   this->processLighting();
   this->interpolate(/*this->verticesList*/);

trunk/src/lib/graphics/importer/md2/md2Model.h

@@ -69 +69 @@
 
 //! animation names enumeration
-typedef enum animType
+typedef enum MD2animType
   {
     STAND,                       //0
@@ -156 +156 @@
   void renderFrameTriangles() const;
 
-
   virtual void setAnimation(int type, int animPlayback = MD2_ANIM_LOOP);
+  virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable, int animPlayback);
   /**  returns the current animation @returns animation type */
   inline int MD2Model::getAnimation() { return this->animationState.type; }
+  virtual void setAnimationSpeed(float speed) { this->animationSpeed = speed; }
   /**  scales the current model @param scaleFactor: the factor [0..1] to use for scaling */
   void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
@@ -186 +187 @@
  private:
   float               scaleFactor;                      //!< the scale factor (individual)
+  float               animationSpeed;                   //!< the speed of the animation (factor for the time)
   sAnimState          animationState;                   //!< animation state of the model
   sVec3D              verticesList[MD2_MAX_VERTICES];   //!< place to temp sav the vert