Changeset 8685 in orxonox.OLD

Timestamp:

Jun 21, 2006, 8:52:20 PM (18 years ago)

Author:

patrick

Message:

bsp: fps player added, woking on it

Location:

branches/bsp_model/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/event/key_mapper.h (modified) (1 diff)
• lib/graphics/importer/interactive_model.h (modified) (1 diff)
• lib/graphics/importer/md2/md2Model.h (modified) (1 diff)
• lib/graphics/importer/md3/md3_model.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (added)
• world_entities/creatures/fps_player.h (added)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)

branches/bsp_model/src/defs/class_id.h

@@ -192 +192 @@
   CL_SPECTATOR                  =    0x00000360,
   CL_COLLISION_PROBE            =    0x00000361,
+  CL_FPS_PLAYER                 =    0x00000362,
 
   // Powerups

branches/bsp_model/src/lib/event/key_mapper.cc

@@ -45 +45 @@
 int KeyMapper::PEV_STRAFE_LEFT       = EV_UNKNOWN;
 int KeyMapper::PEV_STRAFE_RIGHT      = EV_UNKNOWN;
+int KeyMapper::PEV_JUMP              = EV_UNKNOWN;
 
 int KeyMapper::PEV_FIRE1             = EV_UNKNOWN;
@@ -83 +84 @@
   {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft",                       SDLK_q},
   {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight",                      SDLK_e},
+  {&KeyMapper::PEV_JUMP,                 "Jump",                             SDLK_SPACE},
 
   {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE,            EV_MOUSE_BUTTON_LEFT},

branches/bsp_model/src/lib/event/key_mapper.h

@@ -55 +55 @@
   static int PEV_STRAFE_RIGHT;      //!< strafe right button
 
+  static int PEV_JUMP;              //!< jump
+
   static int PEV_FIRE1;             //!< fire button 1
   static int PEV_FIRE2;             //!< fire button 2

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

@@ -37 +37 @@
 
     virtual void setAnimation(int animNum, int playbackMode = 0) = 0;
+    virtual int getAnimation() = 0;
 };
 

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

@@ -159 +159 @@
   virtual void setAnimation(int type, int animPlayback = MD2_ANIM_LOOP);
   /**  returns the current animation @returns animation type */
-  inline int MD2Model::getAnim() { return this->animationState.type; }
+  inline int MD2Model::getAnimation() { 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/bsp_model/src/lib/graphics/importer/md3/md3_model.h

@@ -45 +45 @@
 
     virtual void setAnimation(int animNum, int playbackMode = 0) {}
+    virtual int getAnimation() { return 0;}
 
     virtual void tick(float dt);

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 world_entities/space_ships/collision_probe.cc \
                 world_entities/creatures/md2_creature.cc \
+                world_entities/creatures/fps_player.cc \
                 world_entities/spectator.cc \
                 \
@@ -98 +99 @@
                 space_ships/collision_probe.cc \
                 creatures/md2_creature.h \
+                creatures/fps_player.h \
                 spectator.h \
                 \

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

@@ -262 +262 @@
   else if( this->bFire && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != ATTACK)
       ((MD2Model*)this->getModel(0))->setAnimation(ATTACK);
   }
   else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != RUN)
       ((MD2Model*)this->getModel(0))->setAnimation(RUN);
   }
   else if (likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND)
+    if( ((MD2Model*)this->getModel(0))->getAnimation() != STAND)
       ((MD2Model*)this->getModel(0))->setAnimation(STAND);
   }