Merge pull request #7232 from CocosRobot/update_lua_bindings_1403857751

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/GLProgramState.lua

@@ -9,62 +9,90 @@
 --          
 -- overload function: setUniformTexture(string, cc.Texture2D)
 --          
+-- overload function: setUniformTexture(int, cc.Texture2D)
+--          
+-- overload function: setUniformTexture(int, unsigned int)
+--          
 -- @function [parent=#GLProgramState] setUniformTexture
 -- @param self
--- @param #string str
--- @param #cc.Texture2D texture2d
+-- @param #int int
+-- @param #unsigned int int
 
 --------------------------------
--- @function [parent=#GLProgramState] setUniformMat4 
+-- overload function: setUniformMat4(int, mat4_table)
+--          
+-- overload function: setUniformMat4(string, mat4_table)
+--          
+-- @function [parent=#GLProgramState] setUniformMat4
 -- @param self
 -- @param #string str
 -- @param #mat4_table mat4
-        
+
 --------------------------------
 -- @function [parent=#GLProgramState] getUniformCount 
 -- @param self
 -- @return long#long ret (return value: long)
         
 --------------------------------
--- @function [parent=#GLProgramState] setUniformFloat 
+-- overload function: setUniformFloat(int, float)
+--          
+-- overload function: setUniformFloat(string, float)
+--          
+-- @function [parent=#GLProgramState] setUniformFloat
 -- @param self
 -- @param #string str
 -- @param #float float
-        
+
 --------------------------------
--- @function [parent=#GLProgramState] setUniformVec3 
+-- overload function: setUniformVec3(int, vec3_table)
+--          
+-- overload function: setUniformVec3(string, vec3_table)
+--          
+-- @function [parent=#GLProgramState] setUniformVec3
 -- @param self
 -- @param #string str
 -- @param #vec3_table vec3
-        
+
 --------------------------------
 -- @function [parent=#GLProgramState] setGLProgram 
 -- @param self
 -- @param #cc.GLProgram glprogram
         
 --------------------------------
--- @function [parent=#GLProgramState] setUniformVec4 
+-- overload function: setUniformVec4(int, vec4_table)
+--          
+-- overload function: setUniformVec4(string, vec4_table)
+--          
+-- @function [parent=#GLProgramState] setUniformVec4
 -- @param self
 -- @param #string str
 -- @param #vec4_table vec4
-        
+
 --------------------------------
 -- @function [parent=#GLProgramState] getVertexAttribCount 
 -- @param self
 -- @return long#long ret (return value: long)
         
 --------------------------------
--- @function [parent=#GLProgramState] setUniformInt 
+-- overload function: setUniformInt(int, int)
+--          
+-- overload function: setUniformInt(string, int)
+--          
+-- @function [parent=#GLProgramState] setUniformInt
 -- @param self
 -- @param #string str
 -- @param #int int
-        
+
 --------------------------------
--- @function [parent=#GLProgramState] setUniformVec2 
+-- overload function: setUniformVec2(int, vec2_table)
+--          
+-- overload function: setUniformVec2(string, vec2_table)
+--          
+-- @function [parent=#GLProgramState] setUniformVec2
 -- @param self
 -- @param #string str
 -- @param #vec2_table vec2
-        
+
 --------------------------------
 -- @function [parent=#GLProgramState] getVertexAttribsFlags 
 -- @param self

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp

@@ -9783,6 +9783,36 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S)
         }
     }while(0);
     ok  = true;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
+
+            if (!ok) { break; }
+            cocos2d::Texture2D* arg1;
+            ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformTexture(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
+
+            if (!ok) { break; }
+            unsigned int arg1;
+            ok &= luaval_to_uint32(tolua_S, 3,&arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformTexture(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformTexture",argc, 2);
     return 0;
 
@@ -9798,40 +9828,52 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformMat4'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        cocos2d::Mat4 arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            cocos2d::Mat4 arg1;
+            ok &= luaval_to_mat4(tolua_S, 3, &arg1);
 
-        ok &= luaval_to_mat4(tolua_S, 3, &arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformMat4(arg0, arg1);
             return 0;
-        cobj->setUniformMat4(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            cocos2d::Mat4 arg1;
+            ok &= luaval_to_mat4(tolua_S, 3, &arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformMat4(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformMat4",argc, 2);
     return 0;
 
@@ -9891,40 +9933,52 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformFloat'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        double arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            double arg1;
+            ok &= luaval_to_number(tolua_S, 3,&arg1);
 
-        ok &= luaval_to_number(tolua_S, 3,&arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformFloat(arg0, arg1);
             return 0;
-        cobj->setUniformFloat(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            double arg1;
+            ok &= luaval_to_number(tolua_S, 3,&arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformFloat(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformFloat",argc, 2);
     return 0;
 
@@ -9940,40 +9994,52 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformVec3'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        cocos2d::Vec3 arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            cocos2d::Vec3 arg1;
+            ok &= luaval_to_vec3(tolua_S, 3, &arg1);
 
-        ok &= luaval_to_vec3(tolua_S, 3, &arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformVec3(arg0, arg1);
             return 0;
-        cobj->setUniformVec3(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            cocos2d::Vec3 arg1;
+            ok &= luaval_to_vec3(tolua_S, 3, &arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformVec3(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec3",argc, 2);
     return 0;
 
@@ -10035,40 +10101,52 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformVec4'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        cocos2d::Vec4 arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            cocos2d::Vec4 arg1;
+            ok &= luaval_to_vec4(tolua_S, 3, &arg1);
 
-        ok &= luaval_to_vec4(tolua_S, 3, &arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformVec4(arg0, arg1);
             return 0;
-        cobj->setUniformVec4(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            cocos2d::Vec4 arg1;
+            ok &= luaval_to_vec4(tolua_S, 3, &arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformVec4(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec4",argc, 2);
     return 0;
 
@@ -10128,40 +10206,52 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformInt'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        int arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            int arg1;
+            ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
 
-        ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformInt(arg0, arg1);
             return 0;
-        cobj->setUniformInt(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            int arg1;
+            ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformInt(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformInt",argc, 2);
     return 0;
 
@@ -10177,40 +10267,52 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S)
     int argc = 0;
     cocos2d::GLProgramState* cobj = nullptr;
     bool ok  = true;
-
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
 
-
 #if COCOS2D_DEBUG >= 1
     if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
 #endif
-
     cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
-
 #if COCOS2D_DEBUG >= 1
-    if (!cobj) 
+    if (!cobj)
     {
         tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setUniformVec2'", nullptr);
         return 0;
     }
 #endif
-
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 2) 
-    {
-        std::string arg0;
-        cocos2d::Vec2 arg1;
+    do{
+        if (argc == 2) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+            if (!ok) { break; }
+            cocos2d::Vec2 arg1;
+            ok &= luaval_to_vec2(tolua_S, 3, &arg1);
 
-        ok &= luaval_to_vec2(tolua_S, 3, &arg1);
-        if(!ok)
+            if (!ok) { break; }
+            cobj->setUniformVec2(arg0, arg1);
             return 0;
-        cobj->setUniformVec2(arg0, arg1);
-        return 0;
-    }
+        }
+    }while(0);
+    ok  = true;
+    do{
+        if (argc == 2) {
+            std::string arg0;
+            ok &= luaval_to_std_string(tolua_S, 2,&arg0);
+
+            if (!ok) { break; }
+            cocos2d::Vec2 arg1;
+            ok &= luaval_to_vec2(tolua_S, 3, &arg1);
+
+            if (!ok) { break; }
+            cobj->setUniformVec2(arg0, arg1);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
     CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec2",argc, 2);
     return 0;