Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15118 from CocosRobot/update_lua_bindings_1456452560 

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
zilongshanren 2016-02-26 14:49:38 +08:00
parent 32d6762c72 78c99e33e9
commit 9af2f4e73a
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
View File

@ -3323,9 +3323,9 @@ tasktype
}, },
/** /**
* @method destoryInstance * @method destroyInstance
*/ */
destoryInstance : function ( destroyInstance : function (
) )
{ {
}, },

8
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

@ -7976,15 +7976,15 @@ bool js_cocos2dx_AsyncTaskPool_stopTasks(JSContext *cx, uint32_t argc, jsval *vp
JS_ReportError(cx, "js_cocos2dx_AsyncTaskPool_stopTasks : wrong number of arguments: %d, was expecting %d", argc, 1); JS_ReportError(cx, "js_cocos2dx_AsyncTaskPool_stopTasks : wrong number of arguments: %d, was expecting %d", argc, 1);
return false; return false;
} }
bool js_cocos2dx_AsyncTaskPool_destoryInstance(JSContext *cx, uint32_t argc, jsval *vp) bool js_cocos2dx_AsyncTaskPool_destroyInstance(JSContext *cx, uint32_t argc, jsval *vp)
{ {
JS::CallArgs args = JS::CallArgsFromVp(argc, vp); JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
if (argc == 0) { if (argc == 0) {
cocos2d::AsyncTaskPool::destoryInstance(); cocos2d::AsyncTaskPool::destroyInstance();
args.rval().setUndefined(); args.rval().setUndefined();
return true; return true;
} }
JS_ReportError(cx, "js_cocos2dx_AsyncTaskPool_destoryInstance : wrong number of arguments"); JS_ReportError(cx, "js_cocos2dx_AsyncTaskPool_destroyInstance : wrong number of arguments");
return false; return false;
} }
@ -8030,7 +8030,7 @@ void js_register_cocos2dx_AsyncTaskPool(JSContext *cx, JS::HandleObject global)
}; };
static JSFunctionSpec st_funcs[] = { static JSFunctionSpec st_funcs[] = {
JS_FN("destoryInstance", js_cocos2dx_AsyncTaskPool_destoryInstance, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("destroyInstance", js_cocos2dx_AsyncTaskPool_destroyInstance, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getInstance", js_cocos2dx_AsyncTaskPool_getInstance, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getInstance", js_cocos2dx_AsyncTaskPool_getInstance, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END JS_FS_END
}; };

2
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
View File

@ -424,7 +424,7 @@ void js_cocos2dx_AsyncTaskPool_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_AsyncTaskPool(JSContext *cx, JS::HandleObject global); void js_register_cocos2dx_AsyncTaskPool(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj); void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_AsyncTaskPool_stopTasks(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_AsyncTaskPool_stopTasks(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_AsyncTaskPool_destoryInstance(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_AsyncTaskPool_destroyInstance(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_AsyncTaskPool_getInstance(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_AsyncTaskPool_getInstance(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_Action_class; extern JSClass *jsb_cocos2d_Action_class;

2
cocos/scripting/lua-bindings/auto/api/AsyncTaskPool.lua
View File

@ -13,7 +13,7 @@
-------------------------------- --------------------------------
-- Destroys the async task pool. -- Destroys the async task pool.
-- @function [parent=#AsyncTaskPool] destoryInstance -- @function [parent=#AsyncTaskPool] destroyInstance
-- @param self -- @param self
-- @return AsyncTaskPool#AsyncTaskPool self (return value: cc.AsyncTaskPool) -- @return AsyncTaskPool#AsyncTaskPool self (return value: cc.AsyncTaskPool)

12
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -16446,7 +16446,7 @@ int lua_cocos2dx_AsyncTaskPool_stopTasks(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_AsyncTaskPool_destoryInstance(lua_State* tolua_S) int lua_cocos2dx_AsyncTaskPool_destroyInstance(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
bool ok = true; bool ok = true;
@ -16465,18 +16465,18 @@ int lua_cocos2dx_AsyncTaskPool_destoryInstance(lua_State* tolua_S)
{ {
if(!ok) if(!ok)
{ {
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AsyncTaskPool_destoryInstance'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AsyncTaskPool_destroyInstance'", nullptr);
return 0; return 0;
} }
cocos2d::AsyncTaskPool::destoryInstance(); cocos2d::AsyncTaskPool::destroyInstance();
lua_settop(tolua_S, 1); lua_settop(tolua_S, 1);
return 1; return 1;
} }
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AsyncTaskPool:destoryInstance",argc, 0); luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AsyncTaskPool:destroyInstance",argc, 0);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_AsyncTaskPool_destoryInstance'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_AsyncTaskPool_destroyInstance'.",&tolua_err);
#endif #endif
return 0; return 0;
} }
@ -16563,7 +16563,7 @@ int lua_register_cocos2dx_AsyncTaskPool(lua_State* tolua_S)
tolua_beginmodule(tolua_S,"AsyncTaskPool"); tolua_beginmodule(tolua_S,"AsyncTaskPool");
tolua_function(tolua_S,"new",lua_cocos2dx_AsyncTaskPool_constructor); tolua_function(tolua_S,"new",lua_cocos2dx_AsyncTaskPool_constructor);
tolua_function(tolua_S,"stopTasks",lua_cocos2dx_AsyncTaskPool_stopTasks); tolua_function(tolua_S,"stopTasks",lua_cocos2dx_AsyncTaskPool_stopTasks);
tolua_function(tolua_S,"destoryInstance", lua_cocos2dx_AsyncTaskPool_destoryInstance); tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_AsyncTaskPool_destroyInstance);
tolua_function(tolua_S,"getInstance", lua_cocos2dx_AsyncTaskPool_getInstance); tolua_function(tolua_S,"getInstance", lua_cocos2dx_AsyncTaskPool_getInstance);
tolua_endmodule(tolua_S); tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::AsyncTaskPool).name(); std::string typeName = typeid(cocos2d::AsyncTaskPool).name();