[Orxonox-commit 6343] r11000 - in code/branches/cpp11_v2/src: modules/gametypes modules/objects/triggers modules/overlays/hud modules/portals modules/weapons/projectiles orxonox orxonox/interfaces orxonox/worldentities/pawns
landauf at orxonox.net
landauf at orxonox.net
Wed Dec 30 15:17:35 CET 2015
Author: landauf
Date: 2015-12-30 15:17:35 +0100 (Wed, 30 Dec 2015)
New Revision: 11000
Modified:
code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc
code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc
code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/cpp11_v2/src/orxonox/Radar.cc
code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc
code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
Log:
using strongly typed enum classes for RadarViewable::Shape
Modified: code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -48,7 +48,7 @@
this->bTimeLimit_ = 0;
this->setRadarObjectColour(ColourValue::Blue);
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
this->setRadarVisibility(false);
}
Modified: code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -52,7 +52,7 @@
this->setSimultaneousTriggerers(100);
this->setRadarObjectColour(ColourValue::Blue);
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
this->setRadarVisibility(false);
this->settingsChanged();
Modified: code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -55,7 +55,7 @@
this->bIsDestination_ = false;
this->setRadarObjectColour(ColourValue::Green);
- this->setRadarObjectShape(RadarViewable::Dot);
+ this->setRadarObjectShape(RadarViewable::Shape::Dot);
this->setRadarVisibility(false);
this->notifyMaskUpdate();
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -64,9 +64,9 @@
this->setMaximumDotSize(0.1f);
this->setMaximumDotSize3D(0.07f);
- this->shapeMaterials_[RadarViewable::Dot] = "RadarDot.png";
- this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
- this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.png";
+ this->shapeMaterials_[RadarViewable::Shape::Dot] = "RadarDot.png";
+ this->shapeMaterials_[RadarViewable::Shape::Triangle] = "RadarTriangle.png";
+ this->shapeMaterials_[RadarViewable::Shape::Square] = "RadarSquare.png";
this->owner_ = nullptr;
this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
Modified: code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -56,7 +56,7 @@
this->attach(this->trigger_);
this->setRadarObjectColour(ColourValue::White);
- this->setRadarObjectShape(RadarViewable::Dot);
+ this->setRadarObjectShape(RadarViewable::Shape::Dot);
this->setRadarVisibility(true);
if( GameMode::isMaster() )
{
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -40,7 +40,7 @@
//Make the Field visible on Radar and minimap.
this->setRadarObjectColour(ColourValue(1.0, 0.0, 0.2,1)); // Red
- this->setRadarObjectShape(RadarViewable::Dot);
+ this->setRadarObjectShape(RadarViewable::Shape::Dot);
this->setRadarObjectScale(1.0f);
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -127,7 +127,7 @@
this->addCameraPosition(camPosition);
this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
this->setRadarObjectScale(0.5f);
}
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -127,7 +127,7 @@
this->addCameraPosition(camPosition);
this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
this->setRadarObjectScale(0.5f);
}
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -100,7 +100,7 @@
}
this->setRadarObjectColour(ColourValue(1.0, 1.0, 0.0)); // yellow
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
this->setRadarObjectScale(0.5f);
}
Modified: code/branches/cpp11_v2/src/orxonox/Radar.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Radar.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/orxonox/Radar.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -54,9 +54,9 @@
{
// TODO: make this mapping configurable. Maybe there's a possibility with self configured
// configValues..
- this->objectTypes_["Asteroid"] = RadarViewable::Dot;
- this->objectTypes_["SpaceShip"] = RadarViewable::Square;
- this->objectTypes_["AsdfQwerty"] = RadarViewable::Triangle;
+ this->objectTypes_["Asteroid"] = RadarViewable::Shape::Dot;
+ this->objectTypes_["SpaceShip"] = RadarViewable::Shape::Square;
+ this->objectTypes_["AsdfQwerty"] = RadarViewable::Shape::Triangle;
/*WorldEntity* object;
object = new WorldEntity();
@@ -112,7 +112,7 @@
{
std::map<std::string, RadarViewable::Shape>::iterator it = this->objectTypes_.find(name);
if (it == this->objectTypes_.end())
- return this->objectTypes_[name] = RadarViewable::Square; // default, configure!!
+ return this->objectTypes_[name] = RadarViewable::Shape::Square; // default, configure!!
else
return this->objectTypes_[name];
}
Modified: code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -48,7 +48,7 @@
, bInitialized_(false)
, wePtr_(wePtr)
, radarObjectCamouflage_(0.0f)
- , radarObjectShape_(Dot)
+ , radarObjectShape_(Shape::Dot)
, radarObjectDescription_("staticObject")
, scale_(1.0f)
{
Modified: code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h 2015-12-30 14:17:35 UTC (rev 11000)
@@ -48,7 +48,7 @@
class _OrxonoxExport RadarViewable : virtual public OrxonoxInterface
{
public:
- enum Shape
+ enum class Shape
{
Square,
Dot,
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -93,7 +93,7 @@
this->weaponSystem_ = nullptr;
this->setRadarObjectColour(ColourValue::Red);
- this->setRadarObjectShape(RadarViewable::Dot);
+ this->setRadarObjectShape(RadarViewable::Shape::Dot);
this->registerVariables();
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc 2015-12-30 13:31:14 UTC (rev 10999)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc 2015-12-30 14:17:35 UTC (rev 11000)
@@ -50,7 +50,7 @@
gametype->addBase(this);
}
- this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectShape(RadarViewable::Shape::Triangle);
}
void TeamBaseMatchBase::changeTeamColour()
More information about the Orxonox-commit
mailing list