Changeset 6198 in orxonox.OLD

Timestamp:

Dec 20, 2005, 9:57:31 PM (18 years ago)

Author:

patrick

Message:

christmas: better control now

Location:

branches/christmas_branche/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (1 diff)
• lib/graphics/importer/md2Model.h (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (3 diffs)
• world_entities/creatures/md2_creature.h (modified) (1 diff)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -155 +155 @@
 
 
-
-
 /**
   \brief sets the time in seconds passed since the last tick

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -218 +218 @@
 
   void setAnim(int type);
-  /**
-   *  scales the current model
-   * @param scaleFactor: the factor [0..1] to use for scaling
-  */
+  /**  returns the current animation @returns animation type */
+  inline int MD2Model::getAnim() { return this->animationState.type; }
+  /**  scales the current model @param scaleFactor: the factor [0..1] to use for scaling */
   void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
 

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -137 +137 @@
   this->registerEvent(SDLK_a);
   this->registerEvent(SDLK_d);
+  this->registerEvent(SDLK_SPACE);
   this->registerEvent(SDLK_q);
   this->registerEvent(SDLK_e);
@@ -256 +257 @@
   Vector move = this->velocity * time;
   this->shiftCoor (move);
+
+  if( this->bJump)
+  {
+    if( ((MD2Model*)this->getModel(0))->getAnim() != JUMP) ((MD2Model*)this->getModel(0))->setAnim(JUMP);
+  }
+  else if( fabs(move.len()) > 0.0f)
+  {
+    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnim(RUN);
+  }
+  else
+  {
+    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);
+  }
 
   //orient the MD2Creature in direction of the mouse
@@ -349 +363 @@
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->getWeaponManager()->previousWeaponConfig();
-
   else if( event.type == SDLK_w)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);
   else if( event.type == SDLK_s)
     this->bDown = event.bPressed; //this->shiftCoor(0,-.1,0);
+  else if( event.type == SDLK_SPACE)
+    this->bJump = event.bPressed;
   else if( event.type == EV_MOUSE_MOTION)
   {

branches/christmas_branche/src/world_entities/creatures/md2_creature.h

@@ -60 +60 @@
     bool                  bStrafeL;           //!< strafe to the left side
     bool                  bStrafeR;           //!< strafe to the rith side
+    bool                  bJump;              //!< jump
 
     float                 xMouse;             //!< mouse moved in x-Direction