Changeset 9142 in orxonox.OLD

Timestamp:

Jul 4, 2006, 3:20:20 PM (18 years ago)

Author:

patrick

Message:

md2 walk functions

Location:

branches/presentation/src

Files:

• lib/graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2/md2Model.h (modified) (2 diffs)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)

branches/presentation/src/lib/graphics/importer/md2/md2Model.cc

@@ -40 +40 @@
 
 //! list of all different animations a std md2model supports
-sAnim MD2Model::animationList[21] =
+sAnim MD2Model::animationList[22] =
   {
  // begin, end, fps, interruptable
@@ -64 +64 @@
     { 190, 197,  10, 0 },   //!< DEATH_FALLBACKSLOW
     { 198, 198,  5, 1 },   //!< BOOM
+    {  199, 204, 10, 1 },  //!< WALK (only for spectial models)
   };
 

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

@@ -92 +92 @@
     DEATH_FALLBACKSLOW,
     BOOM,
+    WALK,
 
     MAX_ANIMATIONS
@@ -180 +181 @@
   static sVec3D       anorms[NUM_VERTEX_NORMALS];       //!< the anormals
   static float        anormsDots[SHADEDOT_QUANT][256];  //!< the anormals dot products
-  static sAnim        animationList[21];                //!< the anomation list
+  static sAnim        animationList[22];                //!< the anomation list
    //! again one of these strange id software parts
   float*              shadeDots;

branches/presentation/src/world_entities/npcs/generic_npc.cc

@@ -217 +217 @@
       case Walk:
       {
-        if( this->getAnimation() != RUN)
-          this->setAnimation(RUN, MD2_ANIM_LOOP);
+        if( this->getAnimation() != WALK)
+          this->setAnimation(WALK, MD2_ANIM_LOOP);
 
         Vector dir = (currentAnimation.v - this->getAbsCoor());
@@ -289 +289 @@
       case Walk:
       {
-        if( this->getAnimation() != RUN)
-          this->setAnimation(RUN, MD2_ANIM_LOOP);
+        if( this->getAnimation() != WALK)
+          this->setAnimation(WALK, MD2_ANIM_LOOP);