Changeset 8685 in orxonox.OLD for branches/bsp_model/src
- Timestamp:
- Jun 21, 2006, 8:52:20 PM (19 years ago)
- Location:
- branches/bsp_model/src
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/bsp_model/src/defs/class_id.h
r8514 r8685 192 192 CL_SPECTATOR = 0x00000360, 193 193 CL_COLLISION_PROBE = 0x00000361, 194 CL_FPS_PLAYER = 0x00000362, 194 195 195 196 // Powerups -
branches/bsp_model/src/lib/event/key_mapper.cc
r7677 r8685 45 45 int KeyMapper::PEV_STRAFE_LEFT = EV_UNKNOWN; 46 46 int KeyMapper::PEV_STRAFE_RIGHT = EV_UNKNOWN; 47 int KeyMapper::PEV_JUMP = EV_UNKNOWN; 47 48 48 49 int KeyMapper::PEV_FIRE1 = EV_UNKNOWN; … … 83 84 {&KeyMapper::PEV_STRAFE_LEFT, "StrafeLeft", SDLK_q}, 84 85 {&KeyMapper::PEV_STRAFE_RIGHT, "StrafeRight", SDLK_e}, 86 {&KeyMapper::PEV_JUMP, "Jump", SDLK_SPACE}, 85 87 86 88 {&KeyMapper::PEV_FIRE1, CONFIG_NAME_PLAYER_FIRE, EV_MOUSE_BUTTON_LEFT}, -
branches/bsp_model/src/lib/event/key_mapper.h
r7661 r8685 55 55 static int PEV_STRAFE_RIGHT; //!< strafe right button 56 56 57 static int PEV_JUMP; //!< jump 58 57 59 static int PEV_FIRE1; //!< fire button 1 58 60 static int PEV_FIRE2; //!< fire button 2 -
branches/bsp_model/src/lib/graphics/importer/interactive_model.h
r8490 r8685 37 37 38 38 virtual void setAnimation(int animNum, int playbackMode = 0) = 0; 39 virtual int getAnimation() = 0; 39 40 }; 40 41 -
branches/bsp_model/src/lib/graphics/importer/md2/md2Model.h
r8490 r8685 159 159 virtual void setAnimation(int type, int animPlayback = MD2_ANIM_LOOP); 160 160 /** returns the current animation @returns animation type */ 161 inline int MD2Model::getAnim () { return this->animationState.type; }161 inline int MD2Model::getAnimation() { return this->animationState.type; } 162 162 /** scales the current model @param scaleFactor: the factor [0..1] to use for scaling */ 163 163 void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;} -
branches/bsp_model/src/lib/graphics/importer/md3/md3_model.h
r8656 r8685 45 45 46 46 virtual void setAnimation(int animNum, int playbackMode = 0) {} 47 virtual int getAnimation() { return 0;} 47 48 48 49 virtual void tick(float dt); -
branches/bsp_model/src/world_entities/WorldEntities.am
r8514 r8685 42 42 world_entities/space_ships/collision_probe.cc \ 43 43 world_entities/creatures/md2_creature.cc \ 44 world_entities/creatures/fps_player.cc \ 44 45 world_entities/spectator.cc \ 45 46 \ … … 98 99 space_ships/collision_probe.cc \ 99 100 creatures/md2_creature.h \ 101 creatures/fps_player.h \ 100 102 spectator.h \ 101 103 \ -
branches/bsp_model/src/world_entities/creatures/md2_creature.cc
r8524 r8685 262 262 else if( this->bFire && likely(this->getModel(0) != NULL)) 263 263 { 264 if( ((MD2Model*)this->getModel(0))->getAnim () != ATTACK)264 if( ((MD2Model*)this->getModel(0))->getAnimation() != ATTACK) 265 265 ((MD2Model*)this->getModel(0))->setAnimation(ATTACK); 266 266 } 267 267 else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL)) 268 268 { 269 if( ((MD2Model*)this->getModel(0))->getAnim () != RUN)269 if( ((MD2Model*)this->getModel(0))->getAnimation() != RUN) 270 270 ((MD2Model*)this->getModel(0))->setAnimation(RUN); 271 271 } 272 272 else if (likely(this->getModel(0) != NULL)) 273 273 { 274 if( ((MD2Model*)this->getModel(0))->getAnim () != STAND)274 if( ((MD2Model*)this->getModel(0))->getAnimation() != STAND) 275 275 ((MD2Model*)this->getModel(0))->setAnimation(STAND); 276 276 }
Note: See TracChangeset
for help on using the changeset viewer.