[Orxonox-commit 6401] r11058 - in code/branches/cpp11_v3/src: modules/jump modules/mini4dgame modules/objects/triggers modules/towerdefense modules/weapons orxonox/controllers
landauf at orxonox.net
landauf at orxonox.net
Sun Jan 10 20:01:09 CET 2016
Author: landauf
Date: 2016-01-10 20:01:09 +0100 (Sun, 10 Jan 2016)
New Revision: 11058
Modified:
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h
code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc
code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h
code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc
code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
Log:
removed empty tick functions
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -52,11 +52,6 @@
}
- void JumpPlatformDisappear::tick(float dt)
- {
- SUPER(JumpPlatformDisappear, tick, dt);
- }
-
void JumpPlatformDisappear::setProperties(bool active)
{
active_ = active;
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -45,7 +45,6 @@
public:
JumpPlatformDisappear(Context* context);
virtual ~JumpPlatformDisappear();
- virtual void tick(float dt) override;
virtual void setProperties(bool active);
virtual bool isActive();
virtual void touchFigure() override;
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -48,10 +48,4 @@
{
}
-
- void JumpPlatformFake::tick(float dt)
- {
- SUPER(JumpPlatformFake, tick, dt);
- }
-
}
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -45,7 +45,6 @@
public:
JumpPlatformFake(Context* context);
virtual ~JumpPlatformFake();
- virtual void tick(float dt) override;
};
}
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -51,11 +51,6 @@
}
- void JumpPlatformStatic::tick(float dt)
- {
- SUPER(JumpPlatformStatic, tick, dt);
- }
-
void JumpPlatformStatic::touchFigure()
{
figure_->JumpFromPlatform(this);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -40,8 +40,6 @@
JumpPlatformStatic(Context* context);
virtual ~JumpPlatformStatic();
- virtual void tick(float dt) override;
-
virtual void touchFigure() override;
};
}
Modified: code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -111,16 +111,4 @@
}
return possibleMoves;
}
-
- /**
- @brief
- Is called each tick.
- Implements the behavior of the PongAI (i.e. its intelligence).
- @param dt
- The time that has elapsed since the last tick.
- */
- void Mini4DgameAI::tick(float dt)
- {
-
- }
}
Modified: code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h
===================================================================
--- code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -38,8 +38,6 @@
#include <list>
-#include "tools/interfaces/Tickable.h"
-
#include "controllers/Controller.h"
#include "Mini4DgameCenterpoint.h"
#include "Mini4Dgame.h"
@@ -54,7 +52,7 @@
@author
Oliver Richter
*/
- class _Mini4DgameExport Mini4DgameAI : public Controller, public Tickable
+ class _Mini4DgameExport Mini4DgameAI : public Controller
{
public:
Mini4DgameAI(Context* context); //!< Constructor. Registers and initializes the object.
@@ -72,9 +70,6 @@
*/
Vector4 makeMove(float timeout);
-
- virtual void tick(float dt);
-
void setCenterpoint(Mini4DgameCenterpoint* center)
{ this->center_ = center; }
Modified: code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -103,17 +103,6 @@
/**
@brief
- A method that is executed each tick.
- @param dt
- The duration of the last tick.
- */
- void TriggerBase::tick(float dt)
- {
- SUPER(TriggerBase, tick, dt);
- }
-
- /**
- @brief
Set the mode of the trigger.
@param modeName
The name of the mode as a string.
Modified: code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h
===================================================================
--- code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -77,7 +77,6 @@
virtual ~TriggerBase();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a TriggerBase object through XML.
- virtual void tick(float dt); //!< A method that is executed each tick.
/**
@brief Check whether the trigger is active. (i.e. triggered to the outside)
Modified: code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -37,13 +37,6 @@
}
- void TowerDefenseEnemy::tick(float dt)
- {
- //orxout() << "TDE tick1" << endl;
- SUPER(TowerDefenseEnemy, tick, dt);
- //orxout() << "TDE tick2" << endl;
- }
-
WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
{
if (game == nullptr)
Modified: code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -36,7 +36,6 @@
//health gibt es unter: health_
- virtual void tick(float dt) override;
virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
private:
Modified: code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -62,19 +62,6 @@
/**
@brief
- The controlling happens here. This method defines what the controller has to do each tick.
- @param dt
- The duration of the tick.
- */
- void IceGunFreezer::tick(float dt)
- {
- SUPER(IceGunFreezer, tick, dt);
-
-
- }
-
- /**
- @brief
Sets the freeze time variable to the passed value.
*/
void IceGunFreezer::setFreezeTime(float freezeTime)
Modified: code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -36,7 +36,6 @@
#include "weapons/WeaponsPrereqs.h"
-#include "tools/interfaces/Tickable.h"
#include "worldentities/StaticEntity.h"
#include "graphics/Model.h"
#include "tools/Timer.h"
@@ -49,12 +48,11 @@
This is the WorldEntity that gets attached to a victim hit by a IceGunProjectile. It slows down the hit SpaceShip by a defined amount and time.
@ingroup Weapons
*/
- class _WeaponsExport IceGunFreezer : public StaticEntity, public Tickable
+ class _WeaponsExport IceGunFreezer : public StaticEntity
{
public:
IceGunFreezer(Context* context);
virtual ~IceGunFreezer();
- virtual void tick(float dt) override;
virtual void startFreezing();
virtual void stopFreezing();
virtual void setFreezeTime(float freezeTime);
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -54,14 +54,6 @@
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
}
- void DivisionController::tick(float dt)
- {
- if (!this->isActive())
- return;
-
- SUPER(DivisionController, tick, dt);
-
- }
void DivisionController::action()
{
if (!this || !this->getControllableEntity() || !this->isActive())
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -49,10 +49,6 @@
virtual ~DivisionController();
//----[/language demanded functions]----
- //----[orxonox demanded functions]----
- virtual void tick(float dt);
- //----[orxonox demanded functions]----
-
//----[own functions]----
virtual bool setFollower(ActionpointController* newFollower);
virtual bool setWingman(ActionpointController* newWingman);
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -56,16 +56,6 @@
this->actionpoints_.clear();
}
- //----in tick, move (or look) and shoot----
- void SectionController::tick(float dt)
- {
- if (!this->isActive())
- return;
-
- SUPER(SectionController, tick, dt);
-
- }
-
void SectionController::action()
{
if (!this || !this->getControllableEntity() || !this->isActive())
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -48,10 +48,6 @@
virtual ~SectionController();
//----[/language demanded functions]----
- //----[orxonox demanded functions]----
- virtual void tick(float dt);
- //----[/orxonox demanded functions]----
-
//----[own functions]----
ActionpointController* findNewDivisionLeader();
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-10 19:01:09 UTC (rev 11058)
@@ -53,16 +53,6 @@
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
}
-
- //----in tick, move (or look) and shoot----
- void WingmanController::tick(float dt)
- {
- if (!this->isActive())
- return;
-
- SUPER(WingmanController, tick, dt);
-
- }
//----action for hard calculations----
void WingmanController::action()
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-10 18:50:23 UTC (rev 11057)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-10 19:01:09 UTC (rev 11058)
@@ -50,7 +50,6 @@
//----[/language demanded functions]----
//----[orxonox demanded functions]----
- virtual void tick(float dt);
virtual bool hasWingman()
{ return false; }
virtual bool hasFollower()
More information about the Orxonox-commit
mailing list