[Orxonox-commit 6408] r11065 - in code/branches/cpp11_v3: src/modules/hover src/modules/overlays/hud src/modules/pickup/items src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox/controllers src/orxonox/weaponsystem src/orxonox/worldentities test/core_plugin
landauf at orxonox.net
landauf at orxonox.net
Sun Jan 17 13:59:01 CET 2016
Author: landauf
Date: 2016-01-17 13:59:00 +0100 (Sun, 17 Jan 2016)
New Revision: 11065
Modified:
code/branches/cpp11_v3/src/modules/hover/FlagHUD.cc
code/branches/cpp11_v3/src/modules/hover/FlagHUD.h
code/branches/cpp11_v3/src/modules/hover/Hover.cc
code/branches/cpp11_v3/src/modules/hover/Hover.h
code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc
code/branches/cpp11_v3/src/modules/hover/HoverFlag.h
code/branches/cpp11_v3/src/modules/hover/HoverOrigin.cc
code/branches/cpp11_v3/src/modules/hover/HoverOrigin.h
code/branches/cpp11_v3/src/modules/hover/HoverShip.h
code/branches/cpp11_v3/src/modules/hover/HoverWall.cc
code/branches/cpp11_v3/src/modules/hover/TimeHUD.cc
code/branches/cpp11_v3/src/modules/hover/TimeHUD.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h
code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc
code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.h
code/branches/cpp11_v3/src/modules/pickup/items/MunitionContainer.h
code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.cc
code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h
code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc
code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h
code/branches/cpp11_v3/src/modules/weapons/weaponmodes/MineGun.h
code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.cc
code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.h
code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc
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/FightingController.cc
code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h
code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.cc
code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.h
code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc
code/branches/cpp11_v3/src/orxonox/controllers/MasterController.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
code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc
code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h
code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h
code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc
code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h
code/branches/cpp11_v3/test/core_plugin/PluginTest.cc
Log:
added c++11 features to code that was added in presentationHS15
Modified: code/branches/cpp11_v3/src/modules/hover/FlagHUD.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/FlagHUD.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/FlagHUD.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -47,7 +47,7 @@
{
RegisterObject(FlagHUD);
- this->hoverGame_ = NULL;
+ this->hoverGame_ = nullptr;
this->panel_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
.createOverlayElement("Panel", "FlagHUD_Panel_" + getUniqueNumberString()));
this->panel_->setMaterialName("Hover/Flag");
@@ -100,7 +100,7 @@
}
else
{
- this->hoverGame_ = 0;
+ this->hoverGame_ = nullptr;
}
}
}
Modified: code/branches/cpp11_v3/src/modules/hover/FlagHUD.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/FlagHUD.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/FlagHUD.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -46,8 +46,8 @@
FlagHUD(Context* context);
virtual ~FlagHUD();
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
void setFlagCount(int flagCount);
Modified: code/branches/cpp11_v3/src/modules/hover/Hover.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/Hover.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/Hover.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -47,7 +47,7 @@
{
RegisterObject(Hover);
- this->origin_ = NULL;
+ this->origin_ = nullptr;
this->numberOfFlags_ = 1;
this->firstTick_ = true;
Modified: code/branches/cpp11_v3/src/modules/hover/Hover.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/Hover.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/Hover.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -49,7 +49,7 @@
public:
Hover(Context* context);
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
void setOrigin(HoverOrigin* origin)
{ this->origin_ = origin; }
Modified: code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -48,8 +48,8 @@
{
RegisterObject(HoverFlag);
- this->model_ = NULL;
- this->cs_ = NULL;
+ this->model_ = nullptr;
+ this->cs_ = nullptr;
this->collided_ = false;
this->enableCollisionCallback();
Modified: code/branches/cpp11_v3/src/modules/hover/HoverFlag.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverFlag.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverFlag.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -50,7 +50,7 @@
void init(int xCoordinate, int yCoordinate, int cellSize);
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
inline bool getCollided() const
{ return this->collided_; }
Modified: code/branches/cpp11_v3/src/modules/hover/HoverOrigin.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverOrigin.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverOrigin.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -57,7 +57,7 @@
void HoverOrigin::checkGametype()
{
- if (getGametype() != NULL && this->getGametype()->isA(Class(Hover)))
+ if (getGametype() != nullptr && this->getGametype()->isA(Class(Hover)))
{
Hover* hoverGametype = orxonox_cast<Hover*>(this->getGametype());
hoverGametype->setOrigin(this);
Modified: code/branches/cpp11_v3/src/modules/hover/HoverOrigin.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverOrigin.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverOrigin.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -107,8 +107,8 @@
{
public:
HoverOrigin(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Hover.
- virtual ~HoverOrigin() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a HoverOrigin through XML.
+ virtual ~HoverOrigin() = default;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a HoverOrigin through XML.
inline void setNumCells(int numCells)
{ this->numCells_ = numCells; }
Modified: code/branches/cpp11_v3/src/modules/hover/HoverShip.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverShip.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverShip.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -43,7 +43,7 @@
public:
HoverShip(Context* context);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/// sets this ships jumpBoost
inline void setJumpBoost(float jumpBoost)
@@ -52,21 +52,21 @@
inline float getJumpBoost() const
{ return this->jumpBoost_; }
- virtual void moveFrontBack(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value) override;
- virtual void moveRightLeft(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value) override;
- virtual void moveUpDown(const Vector2& value);
+ virtual void moveUpDown(const Vector2& value) override;
- virtual void rotateYaw(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value) override;
- virtual void rotatePitch(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value) override;
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value) override;
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
- virtual void boost(bool bBoost);
+ virtual void boost(bool bBoost) override;
private:
float jumpBoost_;
Modified: code/branches/cpp11_v3/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/HoverWall.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/HoverWall.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -45,8 +45,8 @@
{
RegisterObject(HoverWall);
- this->model_ = NULL;
- this->cs_ = NULL;
+ this->model_ = nullptr;
+ this->cs_ = nullptr;
this->enableCollisionCallback();
this->setCollisionResponse(true);
Modified: code/branches/cpp11_v3/src/modules/hover/TimeHUD.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/TimeHUD.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/TimeHUD.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -46,7 +46,7 @@
this->time_ = 0.0f;
this->running_ = false;
- this->hoverGame_ = 0;
+ this->hoverGame_ = nullptr;
setRunning(true);
}
@@ -97,7 +97,7 @@
}
else
{
- this->hoverGame_ = 0;
+ this->hoverGame_ = nullptr;
}
}
Modified: code/branches/cpp11_v3/src/modules/hover/TimeHUD.h
===================================================================
--- code/branches/cpp11_v3/src/modules/hover/TimeHUD.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/hover/TimeHUD.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -44,8 +44,8 @@
public:
TimeHUD(Context* context);
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
/// sets if the clock is running
inline void setRunning(bool running)
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -40,7 +40,7 @@
RegisterObject(HUDEnemyShieldBar);
this->setConfigValues();
- this->owner_ = NULL;
+ this->owner_ = nullptr;
}
HUDEnemyShieldBar::~HUDEnemyShieldBar()
@@ -61,7 +61,7 @@
void HUDEnemyShieldBar::updateTarget()
{
- Pawn* pawn = NULL;
+ Pawn* pawn = nullptr;
if (this->owner_ && this->useEnemyBar_)
{
// Get the owner's current target (target is usually a Model)
@@ -72,11 +72,11 @@
pawn = orxonox_cast<Pawn*>(target);
// Don't show the EnemyShieldBar if the pawn is invisible
if (pawn && !pawn->isVisible())
- pawn = NULL;
+ pawn = nullptr;
}
// Set the pawn as owner of the EnemyShieldBar
this->setShieldBarOwner(pawn);
- this->setVisible(pawn != NULL);
+ this->setVisible(pawn != nullptr);
}
void HUDEnemyShieldBar::changedOwner()
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -44,9 +44,9 @@
virtual ~HUDEnemyShieldBar();
void setConfigValues();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- void changedOwner();
+ virtual void changedOwner() override;
private:
void updateTarget();
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -39,7 +39,7 @@
{
RegisterObject(HUDRocketFuelBar);
- this->owner_ = NULL;
+ this->owner_ = nullptr;
}
HUDRocketFuelBar::~HUDRocketFuelBar()
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -48,8 +48,8 @@
HUDRocketFuelBar(Context* context);
virtual ~HUDRocketFuelBar();
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
private:
Rocket* owner_;
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -40,7 +40,7 @@
{
RegisterObject(HUDShieldBar);
- this->owner_ = NULL;
+ this->owner_ = nullptr;
}
HUDShieldBar::~HUDShieldBar()
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -48,8 +48,8 @@
HUDShieldBar(Context* context);
virtual ~HUDShieldBar();
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
inline void setShieldBarOwner(Pawn* owner)
{ this->owner_ = owner; }
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -75,7 +75,7 @@
if (!weapon_)
{
- // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is NULL)
+ // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is null)
}
}
@@ -113,10 +113,10 @@
bool visible = this->isVisible();
- for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
+ for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
{
- (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
- (*it)->setVisible(visible);
+ hudWeaponMode->changedVisibility(); //inform all Child Overlays that our visibility has changed
+ hudWeaponMode->setVisible(visible);
}
}
@@ -153,20 +153,20 @@
void HUDWeapon::createHUDChilds()
{
- if (weapon_ == NULL)
+ if (weapon_ == nullptr)
{
return;
}
int positionIndex = 0;
- for (std::multimap<unsigned int, WeaponMode*>::const_iterator it = weapon_->getAllWeaponmodes().begin(); it != weapon_->getAllWeaponmodes().end(); ++it)
+ for (const auto& mapEntry : weapon_->getAllWeaponmodes())
{
HUDWeaponMode* hudWeaponMode = new HUDWeaponMode(this->getContext());
hudWeaponMode->setOwner(owner_);
hudWeaponMode->setOverlayGroup(this->getOverlayGroup());
hudWeaponMode->setVisible(this->isVisible());
- hudWeaponMode->setWeaponMode(it->second);
+ hudWeaponMode->setWeaponMode(mapEntry.second);
hudWeaponMode->setWeaponIndex(this->weaponIndex_);
hudWeaponMode->setAspectCorrection(false);
hudWeaponMode->setPickPoint(Vector2(0.0f,0.0f));
@@ -181,12 +181,12 @@
{
int positionIndex = 0;
- for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
+ for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
{
- (*it)->setPositionOffset(this->positionOffset_);
- (*it)->setWeaponModeIndex(positionIndex);
- (*it)->setWeaponIndex(this->weaponIndex_);
- (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
+ hudWeaponMode->setPositionOffset(this->positionOffset_);
+ hudWeaponMode->setWeaponModeIndex(positionIndex);
+ hudWeaponMode->setWeaponIndex(this->weaponIndex_);
+ hudWeaponMode->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
++ positionIndex;
}
@@ -194,9 +194,9 @@
void HUDWeapon::destroyHUDChilds()
{
- for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
+ for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
{
- (*it)->destroy();
+ hudWeaponMode->destroy();
}
hudWeaponModes_.clear();
@@ -204,7 +204,7 @@
void HUDWeapon::updateSize()
{
- if (weapon_ != NULL)
+ if (weapon_ != nullptr)
{
this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weapon_->getAllWeaponmodes().size()));
updatePosition();
@@ -213,7 +213,7 @@
void HUDWeapon::updatePosition()
{
- if (weapon_ != NULL)
+ if (weapon_ != nullptr)
{
this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f) + this->positionOffset_);
}
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -54,14 +54,14 @@
HUDWeapon(Context* context);
virtual ~HUDWeapon();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
- virtual void changedOwner();
- virtual void changedOverlayGroup();
- virtual void changedVisibility();
- virtual void changedName();
- virtual void positionChanged();
- virtual void sizeChanged();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
+ virtual void changedOverlayGroup() override;
+ virtual void changedVisibility() override;
+ virtual void changedName() override;
+ virtual void positionChanged() override;
+ virtual void sizeChanged() override;
void setWeapon(Weapon* weapon);
@@ -93,7 +93,7 @@
WeakPtr<Pawn> owner_;
WeakPtr<Weapon> weapon_;
- std::vector<WeakPtr<HUDWeaponMode> > hudWeaponModes_;
+ std::vector<WeakPtr<HUDWeaponMode>> hudWeaponModes_;
Ogre::PanelOverlayElement* overlayElement_;
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -125,7 +125,7 @@
Munition* munition = this->weaponMode_->getMunition();
- if (munition != NULL)
+ if (munition != nullptr)
{
MunitionDeployment deployment = munition->getMunitionDeployment();
@@ -236,7 +236,7 @@
Munition* munition = this->weaponMode_->getMunition();
- if (munition != NULL)
+ if (munition != nullptr)
{
MunitionDeployment deployment = munition->getMunitionDeployment();
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -56,13 +56,13 @@
HUDWeaponMode(Context* context);
virtual ~HUDWeaponMode();
- virtual void tick(float dt);
- virtual void changedOwner();
- virtual void changedOverlayGroup();
- virtual void changedVisibility();
- virtual void changedName();
- virtual void positionChanged();
- virtual void sizeChanged();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
+ virtual void changedOverlayGroup() override;
+ virtual void changedVisibility() override;
+ virtual void changedName() override;
+ virtual void positionChanged() override;
+ virtual void sizeChanged() override;
void setWeaponMode(WeaponMode* weaponMode);
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -102,10 +102,10 @@
bool visible = this->isVisible();
- for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
+ for (HUDWeapon* hudWeapon : hudWeapons_)
{
- (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
- (*it)->setVisible(visible);
+ hudWeapon->changedVisibility(); //inform all Child Overlays that our visibility has changed
+ hudWeapon->setVisible(visible);
}
}
@@ -128,14 +128,12 @@
if (owner_->getWeaponSystem())
{
const std::vector<WeaponPack*>& weaponPacks = owner_->getWeaponSystem()->getAllWeaponPacks();
-
- for (std::vector<WeaponPack*>::const_iterator itPacks = weaponPacks.begin(); itPacks != weaponPacks.end(); ++itPacks)
+ for (WeaponPack* weaponPack : weaponPacks)
{
- const std::vector<Weapon*>& weapons = (*itPacks)->getAllWeapons();
-
- for (std::vector<Weapon*>::const_iterator itWeapons = weapons.begin(); itWeapons != weapons.end(); ++itWeapons)
+ const std::vector<Weapon*>& weapons = weaponPack->getAllWeapons();
+ for (Weapon* weapon : weapons)
{
- this->weapons_.push_back(*itWeapons);
+ this->weapons_.push_back(weapon);
}
}
@@ -148,13 +146,13 @@
{
int positionIndex = 0;
- for (std::vector<WeakPtr<Weapon> >::iterator it = weapons_.begin(); it != weapons_.end(); ++it)
+ for (Weapon* weapon : weapons_)
{
HUDWeapon* hudWeapon = new HUDWeapon(this->getContext());
hudWeapon->setOwner(owner_);
hudWeapon->setOverlayGroup(this->getOverlayGroup());
hudWeapon->setVisible(this->isVisible());
- hudWeapon->setWeapon(*it);
+ hudWeapon->setWeapon(weapon);
hudWeapon->setAspectCorrection(false);
hudWeapon->setPickPoint(Vector2(0.0f,0.0f));
@@ -169,11 +167,11 @@
int positionIndex = 0;
Vector2 offset = this->getPosition();
- for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
+ for (HUDWeapon* hudWeapon : hudWeapons_)
{
- (*it)->setPositionOffset(offset);
- (*it)->setWeaponIndex(positionIndex);
- (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
+ hudWeapon->setPositionOffset(offset);
+ hudWeapon->setWeaponIndex(positionIndex);
+ hudWeapon->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
++ positionIndex;
}
@@ -181,9 +179,9 @@
void HUDWeaponSystem::destroyHUDChilds()
{
- for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
+ for (HUDWeapon* hudWeapon : hudWeapons_)
{
- (*it)->destroy();
+ hudWeapon->destroy();
}
hudWeapons_.clear();
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -48,13 +48,13 @@
HUDWeaponSystem(Context* context);
virtual ~HUDWeaponSystem();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
- virtual void changedOverlayGroup();
- virtual void changedVisibility();
- virtual void changedName();
- virtual void positionChanged();
- virtual void sizeChanged();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
+ virtual void changedOverlayGroup() override;
+ virtual void changedVisibility() override;
+ virtual void changedName() override;
+ virtual void positionChanged() override;
+ virtual void sizeChanged() override;
protected:
inline void setWeaponModeHUDSize(Vector2 vector)
{ weaponModeHUDSize_ = vector;
@@ -70,8 +70,8 @@
WeakPtr<Pawn> owner_;
- std::vector<WeakPtr<Weapon> > weapons_;
- std::vector<WeakPtr<HUDWeapon> > hudWeapons_;
+ std::vector<WeakPtr<Weapon>> weapons_;
+ std::vector<WeakPtr<HUDWeapon>> hudWeapons_;
Vector2 weaponModeHUDSize_;
Vector2 weaponModeHUDActualSize_;
Modified: code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -105,7 +105,7 @@
SUPER(BoostPickup, changedUsed);
SpaceShip* ship = this->carrierToSpaceShipHelper();
- if(ship == NULL) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
+ if(ship == nullptr) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
this->Pickupable::destroy();
// If the pickup has transited to used.
@@ -127,14 +127,14 @@
@brief
Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
@return
- A pointer to the SpaceShip, or NULL if the conversion failed.
+ A pointer to the SpaceShip, or nullptr if the conversion failed.
*/
SpaceShip* BoostPickup::carrierToSpaceShipHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
- if(ship == NULL)
+ if(ship == nullptr)
{
orxout(internal_error, context::pickups) << "Invalid PickupCarrier in BoostPickup." << endl;
}
Modified: code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.h
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -51,9 +51,9 @@
BoostPickup(Context* context); //!< Constructor.
virtual ~BoostPickup(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a BoostPickup object through XML.
+ virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode) override; //!< Method for creating a BoostPickup object through XML.
- virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
+ virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
inline float getBoostRefill()
{ return this->boostRefill_; }
Modified: code/branches/cpp11_v3/src/modules/pickup/items/MunitionContainer.h
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/MunitionContainer.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/pickup/items/MunitionContainer.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -52,7 +52,7 @@
MunitionContainer(Context* context);
virtual ~MunitionContainer();
- virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode) override;
inline const std::string& getMunitionName() const
{ return this->munitionName_; }
Modified: code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -85,14 +85,14 @@
void MunitionPickup::addMunitionContainer(MunitionContainer* munitionContainer)
{
- OrxAssert(munitionContainer != NULL, "The munitionContainer cannot be NULL.");
+ OrxAssert(munitionContainer != nullptr, "The munitionContainer cannot be nullptr.");
this->munitionContainers_.push_back(munitionContainer);
}
MunitionContainer* MunitionPickup::getMunitionContainer(unsigned int index)
{
if(this->munitionContainers_.size() >= index)
- return NULL;
+ return nullptr;
else
return this->munitionContainers_[index];
}
@@ -107,24 +107,24 @@
Pawn* pawn = this->carrierToPawnHelper();
- if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+ if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
this->Pickupable::destroy();
// If the pickup has transited to used.
if(this->isUsed())
{
- for(std::vector<MunitionContainer*>::iterator it = this->munitionContainers_.begin(); it != this->munitionContainers_.end(); ++it)
+ for(MunitionContainer* container : this->munitionContainers_)
{
//Get pointer to the appropriate munition
- SubclassIdentifier<Munition> identifier = (*it)->getMunitionType();
+ SubclassIdentifier<Munition> identifier = container->getMunitionType();
Munition* munition = pawn->getMunition(&identifier);
if (munition)
{
// Add munition and magzines
- munition->addMunition((*it)->getMunitionAmount());
- munition->addMagazines((*it)->getMagazinesAmount());
+ munition->addMunition(container->getMunitionAmount());
+ munition->addMagazines(container->getMagazinesAmount());
}
- (*it)->destroy();
+ container->destroy();
}
// This will destroy the pickp
this->setUsed(false);
@@ -139,14 +139,14 @@
@brief
Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
@return
- A pointer to the Pawn, or NULL if the conversion failed.
+ A pointer to the Pawn, or nullptr if the conversion failed.
*/
Pawn* MunitionPickup::carrierToPawnHelper(void)
{
PickupCarrier* carrier = this->getCarrier();
Pawn* pawn = orxonox_cast<Pawn*>(carrier);
- if(pawn == NULL)
+ if(pawn == nullptr)
{
orxout(internal_error, context::pickups) << "Invalid PickupCarrier in MunitionPickup." << endl;
}
Modified: code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -58,9 +58,9 @@
MunitionPickup(Context* context); //!< Constructor.
virtual ~MunitionPickup(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a MunitionPickup object through XML.
+ virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode) override; //!< Method for creating a MunitionPickup object through XML.
- virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
+ virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
void addMunitionContainer(MunitionContainer* munitionContainer);
MunitionContainer* getMunitionContainer(unsigned int index);
Modified: code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -111,7 +111,7 @@
modelRing4_->setPosition(Vector3(0,0,0));
modelRing4_->yaw(Degree(270));
- emitter_ = NULL;
+ emitter_ = nullptr;
if (GameMode::isMaster())
{
@@ -216,12 +216,12 @@
if (GameMode::isMaster())
{
// Damage all pawns within the damage radius
- for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>().begin(); it; ++it)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
- Vector3 distanceVector = it->getWorldPosition()-this->getWorldPosition();
+ Vector3 distanceVector = pawn->getWorldPosition()-this->getWorldPosition();
if(distanceVector.length()< damageRadius_)
{
- it->hit(this->getShooter(), it->getWorldPosition(), NULL, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
+ pawn->hit(this->getShooter(), pawn->getWorldPosition(), nullptr, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
}
}
}
Modified: code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -56,7 +56,7 @@
MineProjectile(Context* context);
virtual ~MineProjectile();
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
void setTimeUntilActivation(float timeUntilActivation);
Modified: code/branches/cpp11_v3/src/modules/weapons/weaponmodes/MineGun.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/weaponmodes/MineGun.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/modules/weapons/weaponmodes/MineGun.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -58,8 +58,8 @@
MineGun(Context* context);
virtual ~MineGun();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void fire();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void fire() override;
inline float getMaxTimeUntilExplosion() const
{ return this->maxTimeUntilExplosion_; }
Modified: code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -338,7 +338,7 @@
}
inLoop = this->bInLoop_;
- Action::Value value;
+ Action value;
if ( actionName == "FIGHT" )
{ value = Action::FIGHT; }
@@ -370,10 +370,10 @@
if (index < this->actionpoints_.size())
return this->actionpoints_[index];
else
- return 0;
+ return nullptr;
}
//XML method
- Action::Value ActionpointController::getAction ()
+ Action ActionpointController::getAction ()
{
return this->action_;
}
@@ -400,12 +400,12 @@
}
}
//XML method
- void ActionpointController::setAction (Action::Value action)
+ void ActionpointController::setAction (Action action)
{
this->action_ = action;
}
//set action and target/protect
- void ActionpointController::setAction (Action::Value action, ControllableEntity* target)
+ void ActionpointController::setAction (Action action, ControllableEntity* target)
{
if (!this || !this->getControllableEntity())
return;
@@ -422,7 +422,7 @@
}
}
//set action and target position
- void ActionpointController::setAction (Action::Value action, const Vector3& target)
+ void ActionpointController::setAction (Action action, const Vector3& target)
{
if (!this || !this->getControllableEntity())
return;
@@ -433,7 +433,7 @@
}
}
//set action and target position and orientation
- void ActionpointController::setAction (Action::Value action, const Vector3& target, const Quaternion& orient )
+ void ActionpointController::setAction (Action action, const Vector3& target, const Quaternion& orient )
{
if (!this || !this->getControllableEntity())
return;
@@ -475,7 +475,7 @@
if (!this || !this->getControllableEntity())
return;
- this->setTarget(0);
+ this->setTarget(nullptr);
this->setTargetPosition(this->getControllableEntity()->getWorldPosition());
this->action_ = Action::NONE;
return;
@@ -505,13 +505,13 @@
std::string targetName = p.name;
if (targetName == "")
break;
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
if (!this || !this->getControllableEntity())
return;
- if (CommonController::getName(*itP) == targetName)
+ if (CommonController::getName(pawn) == targetName)
{
- this->setTarget (static_cast<ControllableEntity*>(*itP));
+ this->setTarget (static_cast<ControllableEntity*>(pawn));
}
}
break;
@@ -540,21 +540,21 @@
std::string protectName = p.name;
if (protectName == "reservedKeyword:human")
{
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
- if (orxonox_cast<ControllableEntity*>(*itP) && ((*itP)->getController()) && ((*itP)->getController()->getIdentifier()->getName() == "NewHumanController"))
+ if (orxonox_cast<ControllableEntity*>(pawn) && (pawn->getController()) && (pawn->getController()->getIdentifier()->getName() == "NewHumanController"))
{
- this->setProtect (static_cast<ControllableEntity*>(*itP));
+ this->setProtect (static_cast<ControllableEntity*>(pawn));
}
}
}
else
{
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
- if (CommonController::getName(*itP) == protectName)
+ if (CommonController::getName(pawn) == protectName)
{
- this->setProtect (static_cast<ControllableEntity*>(*itP));
+ this->setProtect (static_cast<ControllableEntity*>(pawn));
}
}
}
@@ -577,13 +577,13 @@
{
std::string targetName = p.name;
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
- if (CommonController::getName(*itP) == targetName)
+ if (CommonController::getName(pawn) == targetName)
{
if (!this || !this->getControllableEntity())
return;
- this->setTarget (static_cast<ControllableEntity*>(*itP));
+ this->setTarget (static_cast<ControllableEntity*>(pawn));
}
}
if (!this->hasTarget())
@@ -701,22 +701,22 @@
Pawn* ActionpointController::closestTarget()
{
if (!this || !this->getControllableEntity())
- return 0;
+ return nullptr;
- Pawn* closestTarget = 0;
+ Pawn* closestTarget = nullptr;
float minDistance = std::numeric_limits<float>::infinity();
Gametype* gt = this->getGametype();
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
if (!this || !this->getControllableEntity())
- return 0;
- if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(*itP), gt) )
+ return nullptr;
+ if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(pawn), gt) )
continue;
- float distance = CommonController::distance (*itP, this->getControllableEntity());
+ float distance = CommonController::distance (pawn, this->getControllableEntity());
if (distance < minDistance)
{
- closestTarget = *itP;
+ closestTarget = pawn;
minDistance = distance;
}
}
@@ -724,7 +724,7 @@
{
return closestTarget;
}
- return 0;
+ return nullptr;
}
//push action FIGHT to the stack and set target to the closest enemy
void ActionpointController::startAttackingEnemiesThatAreClose()
Modified: code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -64,28 +64,17 @@
ActionpointController will not work, if there is no MasterController in the level!
All the demos are in a file called AITest.oxw. In the menu look for New AI Testing Level.
*/
- namespace Action
+ enum class Action
{
- enum Value
- {
- NONE, FLY, FIGHT, PROTECT, FIGHTALL, ATTACK
- };
-
- }
+ NONE, FLY, FIGHT, PROTECT, FIGHTALL, ATTACK
+ };
struct Point {
- Action::Value action;
+ Action action;
std::string name;
Vector3 position;
bool inLoop;
- } ;
- namespace PickupType
- {
- enum Value
- {
- NONE, DAMAGE, HEALTH, SPEED, PORTAL
- };
- }
+ };
class _OrxonoxExport ActionpointController : public FightingController, public Tickable
{
@@ -93,14 +82,14 @@
ActionpointController(Context* context);
virtual ~ActionpointController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/**
@brief
tick is called every tick by Game (?).
In tick ship flies and fires.
*/
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
/**
@brief
XML method, example XML usage:
@@ -185,13 +174,13 @@
virtual void action(); //<! action() is called in regular intervals managing the bot's behaviour. Only gets called by MasterController
virtual void takeActionpoints (const std::vector<Point>& vector, const std::vector<Point>& loop, bool b);
- virtual Action::Value getAction ();
+ virtual Action getAction ();
virtual std::string getActionName();
- void setAction (Action::Value action);
- void setAction (Action::Value action, ControllableEntity* target);
- void setAction (Action::Value action, const Vector3& target);
- void setAction (Action::Value action, const Vector3& target, const Quaternion& orient );
+ void setAction (Action action);
+ void setAction (Action action, ControllableEntity* target);
+ void setAction (Action action, const Vector3& target);
+ void setAction (Action action, const Vector3& target, const Quaternion& orient );
virtual bool setWingman(ActionpointController* wingman)
{ return false; }
@@ -209,13 +198,13 @@
WeakPtr<ActionpointController> myFollower_;
WeakPtr<ActionpointController> myDivisionLeader_;
//----[Actionpoint information]----
- Action::Value action_;
+ Action action_;
std::string protectName_;
std::string targetName_;
- std::vector<WeakPtr<WorldEntity> > actionpoints_;
+ std::vector<WeakPtr<WorldEntity>> actionpoints_;
float squaredaccuracy_;
- std::vector<Point > parsedActionpoints_;//<! actionpoints as they are stored here after being parsed from XML
- std::vector<Point > loopActionpoints_; //<! actionpoints that are to be looped
+ std::vector<Point> parsedActionpoints_; //<! actionpoints as they are stored here after being parsed from XML
+ std::vector<Point> loopActionpoints_; //<! actionpoints that are to be looped
bool bInLoop_; //<! variable for addActionpoint method
bool bLoop_; //<! is state machine looping?
bool bEndLoop_; //<! variable for addActionpoint method
Modified: code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -82,7 +82,7 @@
int team1 = entity1->getTeam();
int team2 = entity2->getTeam();
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (entity1->getController())
controller = entity1->getController();
else
@@ -119,7 +119,7 @@
team2 = tdm->getTeam(entity2->getPlayer());
}
- TeamBaseMatchBase* base = 0;
+ TeamBaseMatchBase* base = nullptr;
base = orxonox_cast<TeamBaseMatchBase*>(entity1);
if (base)
{
@@ -153,7 +153,7 @@
}
}
- DroneController* droneController = 0;
+ DroneController* droneController = nullptr;
droneController = orxonox_cast<DroneController*>(entity1->getController());
if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity2)
return true;
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -39,17 +39,17 @@
{
RegisterObject(DivisionController);
this->setFormationMode(FormationMode::DIAMOND);
- this->target_ = 0;
- this->myFollower_ = 0;
- this->myWingman_ = 0;
+ this->target_ = nullptr;
+ this->myFollower_ = nullptr;
+ this->myWingman_ = nullptr;
}
DivisionController::~DivisionController()
{
- for (size_t i = 0; i < this->actionpoints_.size(); ++i)
+ for (WorldEntity* actionpoint : this->actionpoints_)
{
- if(this->actionpoints_[i])
- this->actionpoints_[i]->destroy();
+ if (actionpoint)
+ actionpoint->destroy();
}
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -50,17 +50,17 @@
//----[/language demanded functions]----
//----[own functions]----
- virtual bool setFollower(ActionpointController* newFollower);
- virtual bool setWingman(ActionpointController* newWingman);
- virtual bool hasWingman();
- virtual bool hasFollower();
+ virtual bool setFollower(ActionpointController* newFollower) override;
+ virtual bool setWingman(ActionpointController* newWingman) override;
+ virtual bool hasWingman() override;
+ virtual bool hasFollower() override;
//----[/own functions]----
- virtual void stayNearProtect();
+ virtual void stayNearProtect() override;
protected:
//----action must only be managed by this----
- virtual void action(); //<! action() is called in regular intervals managing the bot's behaviour.
+ virtual void action() override; //<! action() is called in regular intervals managing the bot's behaviour.
private:
//----private variables-----
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -237,20 +237,20 @@
Pawn* FightingController::closestTarget() const
{
if (!this || !this->getControllableEntity())
- return 0;
+ return nullptr;
- Pawn* closestTarget = 0;
+ Pawn* closestTarget = nullptr;
float minDistance = std::numeric_limits<float>::infinity();
Gametype* gt = this->getGametype();
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
- if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(*itP), gt) )
+ if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(pawn), gt) )
continue;
- float distance = CommonController::distance (*itP, this->getControllableEntity());
+ float distance = CommonController::distance (pawn, this->getControllableEntity());
if (distance < minDistance)
{
- closestTarget = *itP;
+ closestTarget = pawn;
minDistance = distance;
}
}
@@ -258,7 +258,7 @@
{
return closestTarget;
}
- return 0;
+ return nullptr;
}
//I checked it out, rockets DO NOT cause any problems! this->getControllableEntity() is always a SpaceShip
void FightingController::doFire()
@@ -334,10 +334,10 @@
if(pawn && pawn->isA(Class(SpaceShip))) //fix for First Person Mode: check for SpaceShip
{
this->weaponModes_.clear(); // reset previous weapon information
- WeaponSlot* wSlot = 0;
+ WeaponSlot* wSlot = nullptr;
for(int l=0; (wSlot = pawn->getWeaponSlot(l)) ; l++)
{
- WeaponMode* wMode = 0;
+ WeaponMode* wMode = nullptr;
for(int i=0; (wMode = wSlot->getWeapon()->getWeaponmode(i)) ; i++)
{
std::string wName = wMode->getIdentifier()->getName();
@@ -355,12 +355,12 @@
}
- int FightingController::getFiremode(std::string name)
+ int FightingController::getFiremode(const std::string& name)
{
- for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
+ for (const auto& mapEntry : this->weaponModes_)
{
- if (it->first == name)
- return it->second;
+ if (mapEntry.first == name)
+ return mapEntry.second;
}
return -1;
}
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -71,7 +71,6 @@
void dodge(const Vector3& thisPosition, float diffLength, Vector3& diffUnit); //<! choose a random Vector3 perpendicular to the difference vector between
//<! this and target_ plus or minus some amount in difference vector direction,
//<! depending on whether it is better to close up or survive.
- void dodgeTowards (Vector3& position); //fly towards position and awoid being hit
void doFire(); //<! choose weapon, set aim at target_ and fire
WeakPtr<ControllableEntity> target_;
void setClosestTarget();
@@ -96,7 +95,7 @@
//std::vector<int> projectiles_; //<! Displays amount of projectiles of each weapon. - managed by setupWeapons()
void setupWeapons(); //<! Defines which weapons are available for a bot. Is recalled whenever a bot was killed.
bool bSetupWorked; //<! If false, setupWeapons() is called.
- int getFiremode(std::string name);
+ int getFiremode(const std::string& name);
};
}
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -60,10 +60,10 @@
SUPER(FlyingController, XMLPort, xmlelement, mode);
}
- void FlyingController::setFormationModeXML(std::string val)
+ void FlyingController::setFormationModeXML(const std::string& val)
{
const std::string valUpper = getUppercase(val);
- FormationMode::Value value;
+ FormationMode value;
if (valUpper == "WALL")
value = FormationMode::WALL;
@@ -232,7 +232,7 @@
if (!this->getControllableEntity())
return;
SpaceShip* ship = orxonox_cast<SpaceShip*>(this->getControllableEntity());
- if(ship == NULL) return;
+ if(ship == nullptr) return;
if(ship->getBoostPower()*1.5f > ship->getInitialBoostPower()) //upper limit ->boost
{
this->getControllableEntity()->boost(true);
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -40,13 +40,10 @@
*/
//Formation mode for the divisions
- namespace FormationMode
+ enum class FormationMode
{
- enum Value
- {
- FINGER4, DIAMOND, WALL
- };
- }
+ FINGER4, DIAMOND, WALL
+ };
class _OrxonoxExport FlyingController : public CommonController
{
@@ -57,19 +54,19 @@
FlyingController(Context* context);
virtual ~FlyingController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setSpread (int spread) //<! spread is a multiplier for formation flight, should be bigger than 100
{ this->spread_ = spread; }
int getSpread () const
{ return this->spread_; }
- void setFormationModeXML(std::string val);
+ void setFormationModeXML(const std::string& val);
std::string getFormationModeXML() const;
- void setFormationMode(FormationMode::Value val)
+ void setFormationMode(FormationMode val)
{ this->formationMode_ = val; }
- FormationMode::Value getFormationMode() const
+ FormationMode getFormationMode() const
{ return this->formationMode_; }
bool bCopyOrientation_; //<! set to true by default, MasterController sets it in its tick(),
//<! if true, this will set its leader orientation as target orientation in action()
@@ -90,7 +87,7 @@
Vector3& targetRelativePosition); //<! preset targetPosition, so that
//<! this stays in a certain position relative to leader
- FormationMode::Value formationMode_;
+ FormationMode formationMode_;
float rotationProgress_; //<! for slerping
bool bHasTargetPosition_;
Modified: code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -57,12 +57,12 @@
if (this->ticks_ == 1)
{
//fill the vector in the first tick
- for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>().begin(); it; ++it)
+ for (ActionpointController* controller : ObjectList<ActionpointController>())
{
//----0ptr?----
- if (!it)
+ if (!controller)
continue;
- this->controllers_.push_back(*it);
+ this->controllers_.push_back(controller);
}
}
else
Modified: code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -60,14 +60,14 @@
//----[/language demanded functions]----
//----[orxonox demanded functions]----
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
//----[orxonox demanded functions]----
protected:
private:
- std::vector<WeakPtr<ActionpointController> > controllers_; //<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
+ std::vector<WeakPtr<ActionpointController>> controllers_;//<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
size_t indexOfCurrentController_; //<! index of current controller
unsigned int numberOfTicksPassedSinceLastActionCall_;
unsigned int ticks_; //<! local tick counter
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -39,18 +39,18 @@
RegisterObject(SectionController);
this->setFormationMode(FormationMode::FINGER4);
- this->myWingman_ = 0;
- this->myDivisionLeader_ = 0;
+ this->myWingman_ = nullptr;
+ this->myDivisionLeader_ = nullptr;
this->bFirstAction_ = true;
}
SectionController::~SectionController()
{
- for (size_t i = 0; i < this->actionpoints_.size(); ++i)
+ for (WorldEntity* actionpoint : this->actionpoints_)
{
- if(this->actionpoints_[i])
- this->actionpoints_[i]->destroy();
+ if (actionpoint)
+ actionpoint->destroy();
}
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
@@ -116,7 +116,7 @@
void SectionController::chooseTarget()
{
//----If division leader fights, cover him by fighting emenies close to his target----
- Action::Value action = this->myDivisionLeader_->getAction();
+ Action action = this->myDivisionLeader_->getAction();
if (action == Action::FIGHT || action == Action::FIGHTALL || action == Action::ATTACK)
{
@@ -132,17 +132,17 @@
//----new target should be close to division's target----
Vector3 divisionTargetPosition = this->myDivisionLeader_->getTarget()->getWorldPosition();
Gametype* gt = this->getGametype();
- for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>().begin(); itP; ++itP)
+ for (Pawn* pawn : ObjectList<Pawn>())
{
//----is enemy?----
- if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(*itP), gt) )
+ if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(pawn), gt) )
continue;
//----in range?----
- if (((*itP)->getWorldPosition() - divisionTargetPosition).length() < 3000 &&
- (*itP) != this->myDivisionLeader_->getTarget())
+ if ((pawn->getWorldPosition() - divisionTargetPosition).length() < 3000 &&
+ pawn != this->myDivisionLeader_->getTarget())
{
foundTarget = true;
- target = (*itP);
+ target = pawn;
break;
}
}
@@ -211,29 +211,29 @@
{
if (!this->getControllableEntity())
- return 0;
+ return nullptr;
- ActionpointController* closestLeader = 0;
+ ActionpointController* closestLeader = nullptr;
float minDistance = std::numeric_limits<float>::infinity();
//go through all pawns
- for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>().begin(); it; ++it)
+ for (ActionpointController* controller : ObjectList<ActionpointController>())
{
//0ptr or not DivisionController?
- if (!(it) || !((it)->getIdentifier()->getName() == "DivisionController") || !(it->getControllableEntity()))
+ if (!controller || !(controller->getIdentifier()->getName() == "DivisionController") || !(controller->getControllableEntity()))
continue;
//same team?
- if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()))
+ if ((this->getControllableEntity()->getTeam() != controller->getControllableEntity()->getTeam()))
continue;
//is equal to this?
- if (orxonox_cast<ControllableEntity*>(*it) == this->getControllableEntity())
+ if (orxonox_cast<ControllableEntity*>(controller) == this->getControllableEntity())
continue;
- float distance = CommonController::distance (it->getControllableEntity(), this->getControllableEntity());
+ float distance = CommonController::distance (controller->getControllableEntity(), this->getControllableEntity());
- if (distance < minDistance && !(it->hasFollower()))
+ if (distance < minDistance && !(controller->hasFollower()))
{
- closestLeader = *it;
+ closestLeader = controller;
minDistance = distance;
}
@@ -243,7 +243,7 @@
if (closestLeader->setFollower(this))
return closestLeader;
}
- return 0;
+ return nullptr;
}
bool SectionController::setWingman(ActionpointController* newWingman)
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -51,16 +51,16 @@
//----[own functions]----
ActionpointController* findNewDivisionLeader();
- virtual bool setWingman(ActionpointController* newWingman);
- virtual bool hasWingman();
- virtual bool hasFollower()
+ virtual bool setWingman(ActionpointController* newWingman) override;
+ virtual bool hasWingman() override;
+ virtual bool hasFollower() override
{ return false; }
void chooseTarget();
//----[/own functions]----
protected:
//----action must only be managed by this----
- virtual void action(); //<! action() is called in regular intervals by MasterController managing the bot's behaviour.
+ virtual void action() override; //<! action() is called in regular intervals by MasterController managing the bot's behaviour.
Vector3 getFormationPosition ();
void keepFormation();
private:
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -38,17 +38,17 @@
WingmanController::WingmanController(Context* context) : ActionpointController(context)
{
RegisterObject(WingmanController);
- this->myLeader_ = 0;
+ this->myLeader_ = nullptr;
this->bFirstAction_ = true;
}
WingmanController::~WingmanController()
{
- for (size_t i = 0; i < this->actionpoints_.size(); ++i)
+ for (WorldEntity* actionpoint : this->actionpoints_)
{
- if(this->actionpoints_[i])
- this->actionpoints_[i]->destroy();
+ if (actionpoint)
+ actionpoint->destroy();
}
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
@@ -169,30 +169,30 @@
{
if (!this->getControllableEntity())
- return 0;
+ return nullptr;
//----vars for finding the closest leader----
- ActionpointController* closestLeader = 0;
+ ActionpointController* closestLeader = nullptr;
float minDistance = std::numeric_limits<float>::infinity();
Gametype* gt = this->getGametype();
- for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>().begin(); it; ++it)
+ for (ActionpointController* controller : ObjectList<ActionpointController>())
{
//----0ptr or not a leader or dead?----
- if (!it ||
- (it->getIdentifier()->getName() != "SectionController" && it->getIdentifier()->getName() != "DivisionController") ||
- !(it->getControllableEntity()))
+ if (!controller ||
+ (controller->getIdentifier()->getName() != "SectionController" && controller->getIdentifier()->getName() != "DivisionController") ||
+ !(controller->getControllableEntity()))
continue;
//----same team?----
- if ( !CommonController::sameTeam (this->getControllableEntity(), (it)->getControllableEntity(), gt) )
+ if ( !CommonController::sameTeam (this->getControllableEntity(), controller->getControllableEntity(), gt) )
continue;
//----check distance----
- float distance = CommonController::distance (it->getControllableEntity(), this->getControllableEntity());
- if (distance < minDistance && !(it->hasWingman()))
+ float distance = CommonController::distance (controller->getControllableEntity(), this->getControllableEntity());
+ if (distance < minDistance && !(controller->hasWingman()))
{
- closestLeader = *it;
+ closestLeader = controller;
minDistance = distance;
}
}
@@ -206,7 +206,7 @@
return closestLeader;
}
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -50,9 +50,9 @@
//----[/language demanded functions]----
//----[orxonox demanded functions]----
- virtual bool hasWingman()
+ virtual bool hasWingman() override
{ return false; }
- virtual bool hasFollower()
+ virtual bool hasFollower() override
{ return false; }
//----[/orxonox demanded functions]----
@@ -62,7 +62,7 @@
protected:
//----action must only be managed by this----
- virtual void action(); //<! action() is called in regular intervals managing the bot's behaviour.
+ virtual void action() override; //<! action() is called in regular intervals managing the bot's behaviour.
Vector3 getFormationPosition ();
void keepFormation();
Modified: code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -344,7 +344,7 @@
{
std::map<WeaponMode*, Magazine*>::iterator it;
- // If the pointer to the weapon mode whose magazine got munition added to is NULL, then set the iterator to the beginning of the map
+ // If the pointer to the weapon mode whose magazine got munition added to is nullptr, then set the iterator to the beginning of the map
// Otherwise set it to the next weapon mode
if (lastFilledWeaponMode_ == nullptr)
{
Modified: code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -51,9 +51,9 @@
{
public:
ReplenishingMunition(Context* context);
- virtual ~ReplenishingMunition() {}
+ virtual ~ReplenishingMunition() = default;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
float getProgress();
inline unsigned int getReplenishAmount() const
Modified: code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -91,9 +91,9 @@
{
public:
Actionpoint(Context* context);
- virtual ~Actionpoint() {}
+ virtual ~Actionpoint() = default;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/** @brief Decides what AI will do. @param val action to execute */
void setActionXML(std::string val)
Modified: code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -46,8 +46,8 @@
this->effect1_ = "";
this->effect2_ = "";
this->model_= new Model(this->getContext());
- this->effect1Particle_= NULL;
- this->effect2Particle_= NULL;
+ this->effect1Particle_= nullptr;
+ this->effect2Particle_= nullptr;
this->explosionEntity_ = new MovableEntity(this->getContext());
this->posOffset_ = Vector3::ZERO;
Modified: code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h 2016-01-17 12:59:00 UTC (rev 11065)
@@ -50,7 +50,8 @@
public:
ExplosionPart(Context* context);
~ExplosionPart();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
void Explode();
void stop();
void ActuallyExplode();
Modified: code/branches/cpp11_v3/test/core_plugin/PluginTest.cc
===================================================================
--- code/branches/cpp11_v3/test/core_plugin/PluginTest.cc 2016-01-14 21:58:46 UTC (rev 11064)
+++ code/branches/cpp11_v3/test/core_plugin/PluginTest.cc 2016-01-17 12:59:00 UTC (rev 11065)
@@ -22,7 +22,7 @@
public:
PluginTest()
{
- this->plugin_ = NULL;
+ this->plugin_ = nullptr;
}
static void SetUpTestCase()
@@ -43,10 +43,10 @@
void unloadPlugin()
{
delete this->plugin_;
- this->plugin_ = NULL;
+ this->plugin_ = nullptr;
}
- virtual void TearDown()
+ virtual void TearDown() override
{
// make sure the plugin is unloaded
this->unloadPlugin();
@@ -76,28 +76,28 @@
TEST_F(PluginTest, LoadsIdentifier)
{
- EXPECT_TRUE(getIdentifier() == NULL);
+ EXPECT_TRUE(getIdentifier() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getIdentifier() != NULL);
+ EXPECT_TRUE(getIdentifier() != nullptr);
this->unloadPlugin();
}
TEST_F(PluginTest, UnloadsIdentifier)
{
this->loadPlugin();
- EXPECT_TRUE(getIdentifier() != NULL);
+ EXPECT_TRUE(getIdentifier() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getIdentifier() == NULL);
+ EXPECT_TRUE(getIdentifier() == nullptr);
}
TEST_F(PluginTest, ReloadsIdentifier)
{
this->loadPlugin();
- EXPECT_TRUE(getIdentifier() != NULL);
+ EXPECT_TRUE(getIdentifier() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getIdentifier() == NULL);
+ EXPECT_TRUE(getIdentifier() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getIdentifier() != NULL);
+ EXPECT_TRUE(getIdentifier() != nullptr);
this->unloadPlugin();
}
@@ -106,13 +106,13 @@
this->loadPlugin();
Identifier* identifier = getIdentifier();
- ASSERT_TRUE(identifier != NULL);
+ ASSERT_TRUE(identifier != nullptr);
- Identifiable* object = identifier->fabricate(NULL);
- ASSERT_TRUE(object != NULL);
+ Identifiable* object = identifier->fabricate(nullptr);
+ ASSERT_TRUE(object != nullptr);
Testclass* testclass = orxonox_cast<Testclass*>(object);
- ASSERT_TRUE(testclass != NULL);
+ ASSERT_TRUE(testclass != nullptr);
EXPECT_EQ(666, testclass->getValue());
@@ -130,9 +130,9 @@
{
std::vector<Testsingleton*> singletons;
- for (ObjectList<Listable>::iterator it = ObjectList<Listable>().begin(); it; ++it)
+ for (Listable* listable : ObjectList<Listable>())
{
- Testsingleton* singleton = dynamic_cast<Testsingleton*>(*it);
+ Testsingleton* singleton = dynamic_cast<Testsingleton*>(listable);
if (singleton)
singletons.push_back(singleton);
}
@@ -140,7 +140,7 @@
switch (singletons.size())
{
case 0:
- return NULL;
+ return nullptr;
case 1:
return singletons[0];
default:
@@ -150,28 +150,28 @@
TEST_F(PluginTest, LoadsSingleton)
{
- EXPECT_TRUE(getSingleton() == NULL);
+ EXPECT_TRUE(getSingleton() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getSingleton() != NULL);
+ EXPECT_TRUE(getSingleton() != nullptr);
this->unloadPlugin();
}
TEST_F(PluginTest, UnloadsSingleton)
{
this->loadPlugin();
- EXPECT_TRUE(getSingleton() != NULL);
+ EXPECT_TRUE(getSingleton() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getSingleton() == NULL);
+ EXPECT_TRUE(getSingleton() == nullptr);
}
TEST_F(PluginTest, ReloadsSingleton)
{
this->loadPlugin();
- EXPECT_TRUE(getSingleton() != NULL);
+ EXPECT_TRUE(getSingleton() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getSingleton() == NULL);
+ EXPECT_TRUE(getSingleton() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getSingleton() != NULL);
+ EXPECT_TRUE(getSingleton() != nullptr);
this->unloadPlugin();
}
@@ -180,7 +180,7 @@
this->loadPlugin();
Testsingleton* singleton = getSingleton();
- ASSERT_TRUE(singleton != NULL);
+ ASSERT_TRUE(singleton != nullptr);
EXPECT_EQ(999, singleton->getValue());
@@ -254,28 +254,28 @@
TEST_F(PluginTest, LoadsConsoleCommand)
{
- EXPECT_TRUE(getConsoleCommand() == NULL);
+ EXPECT_TRUE(getConsoleCommand() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getConsoleCommand() != NULL);
+ EXPECT_TRUE(getConsoleCommand() != nullptr);
this->unloadPlugin();
}
TEST_F(PluginTest, UnloadsConsoleCommand)
{
this->loadPlugin();
- EXPECT_TRUE(getConsoleCommand() != NULL);
+ EXPECT_TRUE(getConsoleCommand() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getConsoleCommand() == NULL);
+ EXPECT_TRUE(getConsoleCommand() == nullptr);
}
TEST_F(PluginTest, ReloadsConsoleCommand)
{
this->loadPlugin();
- EXPECT_TRUE(getConsoleCommand() != NULL);
+ EXPECT_TRUE(getConsoleCommand() != nullptr);
this->unloadPlugin();
- EXPECT_TRUE(getConsoleCommand() == NULL);
+ EXPECT_TRUE(getConsoleCommand() == nullptr);
this->loadPlugin();
- EXPECT_TRUE(getConsoleCommand() != NULL);
+ EXPECT_TRUE(getConsoleCommand() != nullptr);
this->unloadPlugin();
}
@@ -284,7 +284,7 @@
this->loadPlugin();
ConsoleCommand* command = getConsoleCommand();
- ASSERT_TRUE(command != NULL);
+ ASSERT_TRUE(command != nullptr);
EXPECT_EQ(999, (*command->getExecutor())(333, 666).get<int>());
More information about the Orxonox-commit
mailing list