Changeset 10727

Timestamp:

Oct 31, 2015, 11:06:37 AM (9 years ago)

Author:

landauf

Message:

fixed warnings with MSVC14

Location:

code/trunk/src

Files:

• libraries/tools/Shader.cc (modified) (2 diffs)
• libraries/tools/Shader.h (modified) (2 diffs)
• modules/pong/PongAI.cc (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseTower.cc (modified) (1 diff)
• modules/weapons/projectiles/SplitGunProjectile.cc (modified) (1 diff)
• orxonox/Scene.cc (modified) (1 diff)

code/trunk/src/libraries/tools/Shader.cc

@@ -161 +161 @@
         @brief Defines a new integer value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
     */
-    void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, int value)
+    void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value)
     {
         ParameterContainer container = {technique, pass, parameter, value};
@@ -171 +171 @@
         @brief Defines a new float value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
     */
-    void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, float value)
+    void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value)
     {
         ParameterContainer container = {technique, pass, parameter, value};

code/trunk/src/libraries/tools/Shader.h

@@ -89 +89 @@
             virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
 
-            void setParameter(size_t technique, size_t pass, const std::string& parameter, float value);
-            void setParameter(size_t technique, size_t pass, const std::string& parameter, int value);
+            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
+            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
 
             virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
@@ -110 +110 @@
             struct ParameterContainer
             {
-                size_t technique_;          ///< The ID of the technique
-                size_t pass_;               ///< The ID of the pass
+                unsigned short technique_;  ///< The ID of the technique
+                unsigned short pass_;       ///< The ID of the pass
                 std::string parameter_;     ///< The name of the parameter
 

code/trunk/src/modules/pong/PongAI.cc

@@ -211 +211 @@
     {
         // Calculate the exponent for the position-formula
-        float exp = pow(10, 1 - 2*this->strength_); // strength: 0   -> exp = 10
-                                                    // strength: 0.5 -> exp = 1
-                                                    // strength: 1   -> exp = 0.1
+        float exp = pow(10.0f, 1.0f - 2.0f*this->strength_); // strength: 0   -> exp = 10
+                                                             // strength: 0.5 -> exp = 1
+                                                             // strength: 1   -> exp = 0.1
 
         // Calculate the relative position where to hit the ball with the bat

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -331 +331 @@
             timeSinceLastSpawn_ = 0.0;
 
-            timeUntilNextWave_ = waveNumber_+20;
+            timeUntilNextWave_ = waveNumber_+20.0f;
             waveSize_ = waveNumber_+5;
         }

code/trunk/src/modules/towerdefense/TowerDefenseTower.cc

@@ -63 +63 @@
             float reloadrate = getReloadRate();
             float reloadwaittime = getReloadWaitTime();
-            this->setDamageMultiplier((upgrade+1)*2);
+            this->setDamageMultiplier((upgrade+1)*2.0f);
             //this->setRotationThrust(2*this->getRotationThrust());
             reloadrate = 0.5f*reloadrate;

code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc

@@ -134 +134 @@
             {
                 // Every child projectile should fly uniform in different directions -> Rotate the velocityOffset in every iteration
-                velocityOffset = Quaternion(Degree(360/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
+                velocityOffset = Quaternion(Degree(360.0f/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
                 velocityOffset.normalise();
 

code/trunk/src/orxonox/Scene.cc

@@ -88 +88 @@
 
         // No physics yet, XMLPort will do that.
-        const int defaultMaxWorldSize = 100000;
+        const float defaultMaxWorldSize = 100000.0f;
         this->negativeWorldRange_ = Vector3::UNIT_SCALE * -defaultMaxWorldSize;
         this->positiveWorldRange_ = Vector3::UNIT_SCALE *  defaultMaxWorldSize;