Changeset 11058 for code/branches/cpp11_v3
- Timestamp:
- Jan 10, 2016, 8:01:09 PM (9 years ago)
- Location:
- code/branches/cpp11_v3/src
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc
r11057 r11058 53 53 } 54 54 55 void JumpPlatformDisappear::tick(float dt)56 {57 SUPER(JumpPlatformDisappear, tick, dt);58 }59 60 55 void JumpPlatformDisappear::setProperties(bool active) 61 56 { -
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h
r11057 r11058 46 46 JumpPlatformDisappear(Context* context); 47 47 virtual ~JumpPlatformDisappear(); 48 virtual void tick(float dt) override;49 48 virtual void setProperties(bool active); 50 49 virtual bool isActive(); -
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc
r11057 r11058 49 49 50 50 } 51 52 void JumpPlatformFake::tick(float dt)53 {54 SUPER(JumpPlatformFake, tick, dt);55 }56 57 51 } -
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h
r11057 r11058 46 46 JumpPlatformFake(Context* context); 47 47 virtual ~JumpPlatformFake(); 48 virtual void tick(float dt) override;49 48 }; 50 49 } -
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc
r11057 r11058 52 52 } 53 53 54 void JumpPlatformStatic::tick(float dt)55 {56 SUPER(JumpPlatformStatic, tick, dt);57 }58 59 54 void JumpPlatformStatic::touchFigure() 60 55 { -
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h
r11057 r11058 41 41 virtual ~JumpPlatformStatic(); 42 42 43 virtual void tick(float dt) override;44 45 43 virtual void touchFigure() override; 46 44 }; -
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc
r11054 r11058 112 112 return possibleMoves; 113 113 } 114 115 /**116 @brief117 Is called each tick.118 Implements the behavior of the PongAI (i.e. its intelligence).119 @param dt120 The time that has elapsed since the last tick.121 */122 void Mini4DgameAI::tick(float dt)123 {124 125 }126 114 } -
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h
r11054 r11058 39 39 #include <list> 40 40 41 #include "tools/interfaces/Tickable.h"42 43 41 #include "controllers/Controller.h" 44 42 #include "Mini4DgameCenterpoint.h" … … 55 53 Oliver Richter 56 54 */ 57 class _Mini4DgameExport Mini4DgameAI : public Controller , public Tickable55 class _Mini4DgameExport Mini4DgameAI : public Controller 58 56 { 59 57 public: … … 72 70 */ 73 71 Vector4 makeMove(float timeout); 74 75 76 virtual void tick(float dt);77 72 78 73 void setCenterpoint(Mini4DgameCenterpoint* center) -
code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc
r11054 r11058 104 104 /** 105 105 @brief 106 A method that is executed each tick.107 @param dt108 The duration of the last tick.109 */110 void TriggerBase::tick(float dt)111 {112 SUPER(TriggerBase, tick, dt);113 }114 115 /**116 @brief117 106 Set the mode of the trigger. 118 107 @param modeName -
code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h
r9667 r11058 78 78 79 79 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a TriggerBase object through XML. 80 virtual void tick(float dt); //!< A method that is executed each tick.81 80 82 81 /** -
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc
r11054 r11058 38 38 } 39 39 40 void TowerDefenseEnemy::tick(float dt)41 {42 //orxout() << "TDE tick1" << endl;43 SUPER(TowerDefenseEnemy, tick, dt);44 //orxout() << "TDE tick2" << endl;45 }46 47 40 WeakPtr<TowerDefense> TowerDefenseEnemy::getGame() 48 41 { -
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h
r11054 r11058 37 37 //health gibt es unter: health_ 38 38 39 virtual void tick(float dt) override;40 39 virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override; 41 40 -
code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc
r11054 r11058 63 63 /** 64 64 @brief 65 The controlling happens here. This method defines what the controller has to do each tick.66 @param dt67 The duration of the tick.68 */69 void IceGunFreezer::tick(float dt)70 {71 SUPER(IceGunFreezer, tick, dt);72 73 74 }75 76 /**77 @brief78 65 Sets the freeze time variable to the passed value. 79 66 */ -
code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h
r11054 r11058 37 37 #include "weapons/WeaponsPrereqs.h" 38 38 39 #include "tools/interfaces/Tickable.h"40 39 #include "worldentities/StaticEntity.h" 41 40 #include "graphics/Model.h" … … 50 49 @ingroup Weapons 51 50 */ 52 class _WeaponsExport IceGunFreezer : public StaticEntity , public Tickable51 class _WeaponsExport IceGunFreezer : public StaticEntity 53 52 { 54 53 public: 55 54 IceGunFreezer(Context* context); 56 55 virtual ~IceGunFreezer(); 57 virtual void tick(float dt) override;58 56 virtual void startFreezing(); 59 57 virtual void stopFreezing(); -
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
r11057 r11058 55 55 this->actionpoints_.clear(); 56 56 } 57 void DivisionController::tick(float dt)58 {59 if (!this->isActive())60 return;61 62 SUPER(DivisionController, tick, dt);63 64 }65 57 void DivisionController::action() 66 58 { -
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
r11057 r11058 50 50 //----[/language demanded functions]---- 51 51 52 //----[orxonox demanded functions]----53 virtual void tick(float dt);54 //----[orxonox demanded functions]----55 56 52 //----[own functions]---- 57 53 virtual bool setFollower(ActionpointController* newFollower); -
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
r11057 r11058 55 55 this->parsedActionpoints_.clear(); 56 56 this->actionpoints_.clear(); 57 }58 59 //----in tick, move (or look) and shoot----60 void SectionController::tick(float dt)61 {62 if (!this->isActive())63 return;64 65 SUPER(SectionController, tick, dt);66 67 57 } 68 58 -
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
r11057 r11058 49 49 //----[/language demanded functions]---- 50 50 51 //----[orxonox demanded functions]----52 virtual void tick(float dt);53 //----[/orxonox demanded functions]----54 55 51 //----[own functions]---- 56 52 ActionpointController* findNewDivisionLeader(); -
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
r11057 r11058 53 53 this->parsedActionpoints_.clear(); 54 54 this->actionpoints_.clear(); 55 }56 57 //----in tick, move (or look) and shoot----58 void WingmanController::tick(float dt)59 {60 if (!this->isActive())61 return;62 63 SUPER(WingmanController, tick, dt);64 65 55 } 66 56 -
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
r11057 r11058 51 51 52 52 //----[orxonox demanded functions]---- 53 virtual void tick(float dt);54 53 virtual bool hasWingman() 55 54 { return false; }
Note: See TracChangeset
for help on using the changeset viewer.