Changeset 11028 for code/branches

Timestamp:

Jan 3, 2016, 8:47:51 PM (9 years ago)

Author:

landauf

Message:

fixed compiler error (MSVC): static members with non-integral type must be initialized in the .cc file
using upper-case letters for constants.

Location:

code/branches/presentationHS15/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (1 diff)
• CommonController.cc (modified) (1 diff)
• CommonController.h (modified) (1 diff)
• FightingController.cc (modified) (1 diff)
• FlyingController.cc (modified) (1 diff)
• FlyingController.h (modified) (1 diff)

code/branches/presentationHS15/src/orxonox/controllers/ArtificialController.cc

@@ -94 +94 @@
             return;
 
-        static const float hardcoded_projectile_speed = 750;
-
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
+        static const float HARDCODED_PROJECTILE_SPEED = 750;
+
+        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), HARDCODED_PROJECTILE_SPEED, this->target_->getWorldPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
 

code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc

@@ -38 +38 @@
 namespace orxonox
 {
+    const float CommonController::HARDCODED_PROJECTILE_SPEED = 750;
 
     RegisterClass(CommonController);

code/branches/presentationHS15/src/orxonox/controllers/CommonController.h

@@ -45 +45 @@
 
         public:
-            static const float hardcoded_projectile_speed = 750;        //<! FightingController uses it to predict enemy position
+            static const float HARDCODED_PROJECTILE_SPEED; //<! FightingController uses it to predict enemy position
 
             CommonController(Context* context);

code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc

@@ -206 +206 @@
             return false;
         Vector3 newPositionOfTarget = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), 
-                                                           hardcoded_projectile_speed, this->target_->getWorldPosition(), 
+                                                           HARDCODED_PROJECTILE_SPEED, this->target_->getWorldPosition(),
                                                            this->target_->getVelocity());
         if (!this->target_ || !this->getControllableEntity())

code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc

@@ -37 +37 @@
 namespace orxonox
 {    
+    const float FlyingController::SPEED = 0.9f/0.02f;
+    const float FlyingController::ROTATEFACTOR = 0.6f/0.02f;
+
     RegisterClass (FlyingController);
     

code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h

@@ -53 +53 @@
 
         public:
-            static const float SPEED = 0.9f/0.02f;              //<! ship's speed
-            static const float ROTATEFACTOR = 0.6f/0.02f;       //<! ship's rotation factor
+            static const float SPEED;              //<! ship's speed
+            static const float ROTATEFACTOR;       //<! ship's rotation factor
  
             FlyingController(Context* context);