Changeset 11030 for code/branches/presentationHS15

Timestamp:

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

Author:

landauf

Message:

fixed some compiler warnings (MSVC)

Location:

code/branches/presentationHS15/src

Files:

• modules/hover/FlagHUD.cc (modified) (1 diff)
• modules/hover/HoverFlag.cc (modified) (2 diffs)
• modules/hover/HoverWall.cc (modified) (2 diffs)
• orxonox/controllers/SectionController.cc (modified) (2 diffs)
• orxonox/controllers/WingmanController.cc (modified) (2 diffs)
• orxonox/weaponsystem/ReplenishingMunition.h (modified) (1 diff)

code/branches/presentationHS15/src/modules/hover/FlagHUD.cc

@@ -69 +69 @@
             this->panel_->_getRelativeHeight()
             );
-        this->panel_->setTiling(flagCount, 1.0f);
+        this->panel_->setTiling(flagCount*1.0f, 1.0f);
 
         this->flagCount_ = flagCount;

code/branches/presentationHS15/src/modules/hover/HoverFlag.cc

@@ -74 +74 @@
         model_->setMeshSource("ss_flag_eu.mesh");
         model_->setScale3D(Vector3(5, 5, 5));
-        model_->setPosition(Vector3(xCoordinate*100 + 50,10,yCoordinate*100 + 50));
+        model_->setPosition(Vector3(xCoordinate*100.0f + 50.0f,10.0f,yCoordinate*100.0f + 50.0f));
 
         this->attach(model_);
@@ -84 +84 @@
         cs_ = new BoxCollisionShape(context);
         cs_->setHalfExtents(Vector3(5, 5, 5));
-        cs_->setPosition(Vector3(xCoordinate*100 + 50,0,yCoordinate*100 + 50));
+        cs_->setPosition(Vector3(xCoordinate*100.0f + 50.0f,0.0f,yCoordinate*100.0f + 50.0f));
 
         this->attachCollisionShape(cs_);

code/branches/presentationHS15/src/modules/hover/HoverWall.cc

@@ -87 +87 @@
         model_ = new Model(context);
         model_->setMeshSource("CuboidBody.mesh");
-        model_->setScale3D(Vector3(xSize_, 30, zSize_));
-        model_->setPosition(Vector3(xPos_,0,zPos_));
+        model_->setScale3D(Vector3(xSize_*1.0f, 30.0f, zSize_*1.0f));
+        model_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
 
         this->attach(model_);
@@ -97 +97 @@
 
         cs_ = new BoxCollisionShape(context);
-        cs_->setHalfExtents(Vector3(xSize_, 30, zSize_));
-        cs_->setPosition(Vector3(xPos_,0,zPos_));
+        cs_->setHalfExtents(Vector3(xSize_*1.0f, 30.0f, zSize_*1.0f));
+        cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
 
         this->attachCollisionShape(cs_);

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;
                 }

code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h

@@ -57 +57 @@
             
             virtual float getProgress();
-            inline float getReplenishAmount() const
+            inline unsigned int getReplenishAmount() const
                 { return replenishAmount_; }
             inline float getReplenishInterval() const