Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10727 for code/trunk/src


Ignore:
Timestamp:
Oct 31, 2015, 11:06:37 AM (9 years ago)
Author:
landauf
Message:

fixed warnings with MSVC14

Location:
code/trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/tools/Shader.cc

    r9667 r10727  
    161161        @brief Defines a new integer value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
    162162    */
    163     void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, int value)
     163    void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value)
    164164    {
    165165        ParameterContainer container = {technique, pass, parameter, value};
     
    171171        @brief Defines a new float value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
    172172    */
    173     void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, float value)
     173    void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value)
    174174    {
    175175        ParameterContainer container = {technique, pass, parameter, value};
  • code/trunk/src/libraries/tools/Shader.h

    r9550 r10727  
    8989            virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
    9090
    91             void setParameter(size_t technique, size_t pass, const std::string& parameter, float value);
    92             void setParameter(size_t technique, size_t pass, const std::string& parameter, int value);
     91            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
     92            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
    9393
    9494            virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
     
    110110            struct ParameterContainer
    111111            {
    112                 size_t technique_;          ///< The ID of the technique
    113                 size_t pass_;               ///< The ID of the pass
     112                unsigned short technique_;  ///< The ID of the technique
     113                unsigned short pass_;       ///< The ID of the pass
    114114                std::string parameter_;     ///< The name of the parameter
    115115
  • code/trunk/src/modules/pong/PongAI.cc

    r9667 r10727  
    211211    {
    212212        // Calculate the exponent for the position-formula
    213         float exp = pow(10, 1 - 2*this->strength_); // strength: 0   -> exp = 10
    214                                                     // strength: 0.5 -> exp = 1
    215                                                     // strength: 1   -> exp = 0.1
     213        float exp = pow(10.0f, 1.0f - 2.0f*this->strength_); // strength: 0   -> exp = 10
     214                                                             // strength: 0.5 -> exp = 1
     215                                                             // strength: 1   -> exp = 0.1
    216216
    217217        // Calculate the relative position where to hit the ball with the bat
  • code/trunk/src/modules/towerdefense/TowerDefense.cc

    r10629 r10727  
    331331            timeSinceLastSpawn_ = 0.0;
    332332
    333             timeUntilNextWave_ = waveNumber_+20;
     333            timeUntilNextWave_ = waveNumber_+20.0f;
    334334            waveSize_ = waveNumber_+5;
    335335        }
  • code/trunk/src/modules/towerdefense/TowerDefenseTower.cc

    r10629 r10727  
    6363            float reloadrate = getReloadRate();
    6464            float reloadwaittime = getReloadWaitTime();
    65             this->setDamageMultiplier((upgrade+1)*2);
     65            this->setDamageMultiplier((upgrade+1)*2.0f);
    6666            //this->setRotationThrust(2*this->getRotationThrust());
    6767            reloadrate = 0.5f*reloadrate;
  • code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc

    r10629 r10727  
    134134            {
    135135                // Every child projectile should fly uniform in different directions -> Rotate the velocityOffset in every iteration
    136                 velocityOffset = Quaternion(Degree(360/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
     136                velocityOffset = Quaternion(Degree(360.0f/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
    137137                velocityOffset.normalise();
    138138
  • code/trunk/src/orxonox/Scene.cc

    r10624 r10727  
    8888
    8989        // No physics yet, XMLPort will do that.
    90         const int defaultMaxWorldSize = 100000;
     90        const float defaultMaxWorldSize = 100000.0f;
    9191        this->negativeWorldRange_ = Vector3::UNIT_SCALE * -defaultMaxWorldSize;
    9292        this->positiveWorldRange_ = Vector3::UNIT_SCALE *  defaultMaxWorldSize;
Note: See TracChangeset for help on using the changeset viewer.