From 2f0eb6712d04909db91e92bb317bcf89c7f4f8a1 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Fri, 13 Mar 2015 07:15:34 +0000 Subject: [PATCH] [AUTO]: updating luabinding automatically --- .../lua-bindings/auto/api/CSLoader.lua | 8 ++-- .../auto/lua_cocos2dx_csloader_auto.cpp | 45 +++++++++++++------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/cocos/scripting/lua-bindings/auto/api/CSLoader.lua b/cocos/scripting/lua-bindings/auto/api/CSLoader.lua index 6c49ee089e..94879ba822 100644 --- a/cocos/scripting/lua-bindings/auto/api/CSLoader.lua +++ b/cocos/scripting/lua-bindings/auto/api/CSLoader.lua @@ -93,12 +93,14 @@ -- @return CSLoader#CSLoader self (return value: cc.CSLoader) -------------------------------- --- --- @function [parent=#CSLoader] createNode +-- @overload self, string, function +-- @overload self, string +-- @function [parent=#CSLoader] createNode -- @param self -- @param #string filename +-- @param #function callback -- @return Node#Node ret (return value: cc.Node) - + -------------------------------- -- -- @function [parent=#CSLoader] getInstance diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp index 6194dbe5f5..7df5575069 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp @@ -640,7 +640,6 @@ int lua_cocos2dx_csloader_CSLoader_createNode(lua_State* tolua_S) { int argc = 0; bool ok = true; - #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; #endif @@ -649,22 +648,42 @@ int lua_cocos2dx_csloader_CSLoader_createNode(lua_State* tolua_S) if (!tolua_isusertable(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; #endif - argc = lua_gettop(tolua_S) - 1; + argc = lua_gettop(tolua_S)-1; - if (argc == 1) + do { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNode"); - if(!ok) + if (argc == 2) { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_createNode'", nullptr); - return 0; + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNode"); + if (!ok) { break; } + std::function arg1; + do { + // Lambda binding for lua is not supported. + assert(false); + } while(0) + ; + if (!ok) { break; } + cocos2d::Node* ret = cocos2d::CSLoader::createNode(arg0, arg1); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; } - cocos2d::Node* ret = cocos2d::CSLoader::createNode(arg0); - object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); - return 1; - } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CSLoader:createNode",argc, 1); + } while (0); + ok = true; + do + { + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNode"); + if (!ok) { break; } + cocos2d::Node* ret = cocos2d::CSLoader::createNode(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + } while (0); + ok = true; + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d", "cc.CSLoader:createNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: