Changeset 11030 for code/branches/presentationHS15/src/orxonox/controllers

Timestamp:

Jan 3, 2016, 9:28:44 PM (9 years ago)

Author:

landauf

Message:

fixed some compiler warnings (MSVC)

Location:

code/branches/presentationHS15/src/orxonox/controllers

Files:

• SectionController.cc (modified) (2 diffs)
• WingmanController.cc (modified) (2 diffs)

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

@@ -192 +192 @@
             case FormationMode::WALL:
             {
-                targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0);   
+                targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 0);   
                 break;
             }
             case FormationMode::FINGER4: 
             {
-                targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);   
+                targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 1.0f*this->spread_);   
                 break;
             }
@@ -203 +203 @@
             case FormationMode::DIAMOND: 
             {
-                targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);                   
+                targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 1.0f*this->spread_);
                 break;
             }

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

@@ -132 +132 @@
                 case FormationMode::WALL:
                 {
-                    targetRelativePosition = new Vector3 (2*this->spread_, 0, 0 - this->tolerance_);  
+                    targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, 0 - 1.0f*this->tolerance_);
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_ - this->tolerance_);  
+                    targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_ - this->tolerance_);                  
+                    targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
                     break;
                 }
@@ -152 +152 @@
                 case FormationMode::WALL:
                 {
-                    targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0 - this->tolerance_);  
+                    targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 0 - 1.0f*this->tolerance_);
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_ - this->tolerance_);  
+                    targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePosition = new Vector3 (2*this->spread_, -this->spread_, 0 - this->tolerance_);                  
+                    targetRelativePosition = new Vector3 (2.0f*this->spread_, -1.0f*this->spread_, 0 - 1.0f*this->tolerance_);
                     break;
                 }