Changeset 10727 for code/trunk/src/libraries/tools

Timestamp:

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

Author:

landauf

Message:

fixed warnings with MSVC14

Location:

code/trunk/src/libraries/tools

Files:

• Shader.cc (modified) (2 diffs)
• Shader.h (modified) (2 diffs)

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