Changeset 11005 for code/branches/cpp11_v2/src/orxonox/overlays

Timestamp:

Dec 30, 2015, 10:31:43 PM (9 years ago)

Author:

landauf

Message:

using strongly typed enum in various classes in orxonox-library

Location:

code/branches/cpp11_v2/src/orxonox/overlays

Files:

• OrxonoxOverlay.cc (modified) (2 diffs)
• OrxonoxOverlay.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -94 +94 @@
         this->angle_ = Degree(0.0);
         this->bCorrectAspect_ = false;
-        this->rotState_ = Horizontal;
+        this->rotState_ = RotationState::Horizontal;
         this->angleChanged(); // updates all other values as well
 
@@ -259 +259 @@
             {
                 tempAspect = 1.0f / this->windowAspectRatio_;
-                rotState_ = Vertical;
+                rotState_ = RotationState::Vertical;
             }
             else if (angle > 179 || angle < 1)
             {
                 tempAspect = this->windowAspectRatio_;
-                rotState_ = Horizontal;
+                rotState_ = RotationState::Horizontal;
             }
             else
             {
                 tempAspect = 1.0f;
-                rotState_ = Inbetween;
+                rotState_ = RotationState::Inbetween;
             }
 

code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h

@@ -79 +79 @@
             and in between is everything else.
         */
-        enum RotationState
+        enum class RotationState
         {
             Horizontal,