Changeset 11000 for code/branches/cpp11_v2/src/orxonox

Timestamp:

Dec 30, 2015, 3:17:35 PM (9 years ago)

Author:

landauf

Message:

using strongly typed enum classes for RadarViewable::Shape

Location:

code/branches/cpp11_v2/src/orxonox

Files:

• Radar.cc (modified) (2 diffs)
• interfaces/RadarViewable.cc (modified) (1 diff)
• interfaces/RadarViewable.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/TeamBaseMatchBase.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/Radar.cc

@@ -55 +55 @@
         // 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;
@@ -113 +113 @@
         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];

code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc

@@ -49 +49 @@
         , wePtr_(wePtr)
         , radarObjectCamouflage_(0.0f)
-        , radarObjectShape_(Dot)
+        , radarObjectShape_(Shape::Dot)
         , radarObjectDescription_("staticObject")
         , scale_(1.0f)

code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h

@@ -49 +49 @@
     {
     public:
-        enum Shape
+        enum class Shape
         {
             Square,

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -94 +94 @@
 
         this->setRadarObjectColour(ColourValue::Red);
-        this->setRadarObjectShape(RadarViewable::Dot);
+        this->setRadarObjectShape(RadarViewable::Shape::Dot);
 
         this->registerVariables();

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -51 +51 @@
         }
 
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
     }