Changeset 6387 for code/branches/presentation2/src/orxonox/worldentities
- Timestamp:
- Dec 21, 2009, 1:18:36 PM (15 years ago)
- Location:
- code/branches/presentation2/src/orxonox/worldentities
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc
r6325 r6387 238 238 this->cameraPositionRootNode_->roll(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL); 239 239 } 240 240 241 241 void ControllableEntity::fire(unsigned int firemode) 242 242 { … … 250 250 } 251 251 } 252 252 253 253 void ControllableEntity::setTarget( WorldEntity* target ) 254 254 { … … 266 266 } 267 267 } 268 268 269 269 void ControllableEntity::setTargetInternal( uint32_t targetID ) 270 270 { -
code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h
r6325 r6387 145 145 inline void setController(Controller* val) 146 146 { this->controller_ = val; } 147 147 148 148 virtual void setTarget( WorldEntity* target ); 149 149 virtual WorldEntity* getTarget() -
code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc
r5781 r6387 42 42 { 43 43 RegisterObject(StaticEntity); 44 44 45 45 this->setPriority(Priority::VeryLow); 46 46 -
code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc
r6356 r6387 68 68 69 69 this->spawnparticleduration_ = 3.0f; 70 70 71 71 this->aimPosition_ = Vector3::ZERO; 72 72 -
code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h
r6295 r6387 116 116 117 117 virtual void startLocalHumanControl(); 118 118 119 119 void setAimPosition( Vector3 position ) 120 120 { this->aimPosition_ = position; } … … 153 153 inline void setWeaponSystem(WeaponSystem* weaponsystem) 154 154 { this->weaponSystem_ = weaponsystem; } 155 155 156 156 Vector3 aimPosition_; 157 157 };
Note: See TracChangeset
for help on using the changeset viewer.