Changeset 8878 in orxonox.OLD

Timestamp:

Jun 28, 2006, 5:46:39 PM (18 years ago)

Author:

patrick

Message:

altering md2 model for dynamic animations choosement

Location:

branches/single_player_map/src

Files:

• lib/graphics/importer/interactive_model.h (modified) (1 diff)
• lib/graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2/md2Model.h (modified) (2 diffs)
• world_entities/door.cc (modified) (3 diffs)

branches/single_player_map/src/lib/graphics/importer/interactive_model.h

@@ -37 +37 @@
 
     virtual void setAnimation(int animNum, int playbackMode = 0) = 0;
+    virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable) {}
     virtual int getAnimation() = 0;
+
+    virtual void setAnimationSpeed(float speed) {}
 };
 

branches/single_player_map/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];
@@ -196 +198 @@
 void MD2Model::tick(float time)
 {
-  this->animate(time);
+  this->animate(time * this->animationSpeed);
   this->processLighting();
   this->interpolate(/*this->verticesList*/);

branches/single_player_map/src/lib/graphics/importer/md2/md2Model.h

@@ -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);
   /**  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

branches/single_player_map/src/world_entities/door.cc

@@ -74 +74 @@
 
 
+/**
+ * sets the animatin of this entity
+ */
 void  Door::setAnimation(int animationIndex, int animPlaybackMode)
 {
@@ -81 +84 @@
 
 
+/**
+ * ticks the door
+ * @param time: time since last tick
+ */
 void Door::tick (float time)
 {
@@ -86 +93 @@
     ((InteractiveModel*)this->getModel(0))->tick(time);
 
-
+  this->checkOpen();
 }