Changeset 11004 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc

Timestamp:

Dec 30, 2015, 10:07:09 PM (8 years ago)

Author:

landauf

Message:

using strongly typed enum class in WorldEntity

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (3 diffs)

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

@@ -79 +79 @@
         // FpsPlayer is always a physical object per default
         // Be aware of this call: The collision type legality check will not reach derived classes!
-        this->setCollisionType(WorldEntity::Dynamic);
+        this->setCollisionType(WorldEntity::CollisionType::Dynamic);
         // Get notification about collisions
         this->enableCollisionCallback();
@@ -130 +130 @@
     bool FpsPlayer::isCollisionTypeLegal(WorldEntity::CollisionType type) const
     {
-        if (type != WorldEntity::Dynamic)
+        if (type != WorldEntity::CollisionType::Dynamic)
         {
             orxout(internal_warning) << "Cannot tell a FpsPlayer not to be dynamic! Ignoring." << endl;
@@ -168 +168 @@
             if (!this->isInMouseLook())
             {
-                this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()), WorldEntity::Parent);
+                this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()), WorldEntity::TransformSpace::Parent);
 
                 Radian pitch = this->cameraPositionRootNode_->getOrientation().getPitch();