[ci skip][AUTO]: updating luabinding & jsbinding automatically

This commit is contained in:
CocosRobot 2015-12-03 21:34:13 +00:00
parent ef76c0ff01
commit 3edadc035b
8 changed files with 202 additions and 3 deletions

View File

@ -4879,6 +4879,18 @@ getElapsed : function (
*/
cc.Sequence = {
/**
* @method init
* @param {Array} arg0
* @return {bool}
*/
init : function (
array
)
{
return false;
},
/**
* @method initWithTwoActions
* @param {cc.FiniteTimeAction} arg0
@ -5033,6 +5045,18 @@ RepeatForever : function (
*/
cc.Spawn = {
/**
* @method init
* @param {Array} arg0
* @return {bool}
*/
init : function (
array
)
{
return false;
},
/**
* @method initWithTwoActions
* @param {cc.FiniteTimeAction} arg0

View File

@ -12386,6 +12386,28 @@ void js_register_cocos2dx_ActionInterval(JSContext *cx, JS::HandleObject global)
JSClass *jsb_cocos2d_Sequence_class;
JSObject *jsb_cocos2d_Sequence_prototype;
bool js_cocos2dx_Sequence_init(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
bool ok = true;
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::Sequence* cobj = (cocos2d::Sequence *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Sequence_init : Invalid Native Object");
if (argc == 1) {
cocos2d::Vector<cocos2d::FiniteTimeAction *> arg0;
ok &= jsval_to_ccvector(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Sequence_init : Error processing arguments");
bool ret = cobj->init(arg0);
jsval jsret = JSVAL_NULL;
jsret = BOOLEAN_TO_JSVAL(ret);
args.rval().set(jsret);
return true;
}
JS_ReportError(cx, "js_cocos2dx_Sequence_init : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Sequence_initWithTwoActions(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@ -12478,6 +12500,7 @@ void js_register_cocos2dx_Sequence(JSContext *cx, JS::HandleObject global) {
};
static JSFunctionSpec funcs[] = {
JS_FN("init", js_cocos2dx_Sequence_init, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("initWithTwoActions", js_cocos2dx_Sequence_initWithTwoActions, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("ctor", js_cocos2dx_Sequence_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END
@ -12909,6 +12932,28 @@ void js_register_cocos2dx_RepeatForever(JSContext *cx, JS::HandleObject global)
JSClass *jsb_cocos2d_Spawn_class;
JSObject *jsb_cocos2d_Spawn_prototype;
bool js_cocos2dx_Spawn_init(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
bool ok = true;
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::Spawn* cobj = (cocos2d::Spawn *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Spawn_init : Invalid Native Object");
if (argc == 1) {
cocos2d::Vector<cocos2d::FiniteTimeAction *> arg0;
ok &= jsval_to_ccvector(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Spawn_init : Error processing arguments");
bool ret = cobj->init(arg0);
jsval jsret = JSVAL_NULL;
jsret = BOOLEAN_TO_JSVAL(ret);
args.rval().set(jsret);
return true;
}
JS_ReportError(cx, "js_cocos2dx_Spawn_init : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Spawn_initWithTwoActions(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@ -13001,6 +13046,7 @@ void js_register_cocos2dx_Spawn(JSContext *cx, JS::HandleObject global) {
};
static JSFunctionSpec funcs[] = {
JS_FN("init", js_cocos2dx_Spawn_init, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("initWithTwoActions", js_cocos2dx_Spawn_initWithTwoActions, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("ctor", js_cocos2dx_Spawn_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END

View File

@ -646,6 +646,7 @@ bool js_cocos2dx_Sequence_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_Sequence_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_Sequence(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_Sequence_init(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Sequence_initWithTwoActions(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Sequence_Sequence(JSContext *cx, uint32_t argc, jsval *vp);
@ -682,6 +683,7 @@ bool js_cocos2dx_Spawn_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_Spawn_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_Spawn(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_Spawn_init(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Spawn_initWithTwoActions(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Spawn_Spawn(JSContext *cx, uint32_t argc, jsval *vp);

View File

@ -353,10 +353,12 @@
-- @return Scale9Sprite#Scale9Sprite self (return value: ccui.Scale9Sprite)
--------------------------------
--
-- @function [parent=#Scale9Sprite] setScaleY
-- / @} end of Children and Parent
-- @function [parent=#Scale9Sprite] draw
-- @param self
-- @param #float scaleY
-- @param #cc.Renderer renderer
-- @param #mat4_table transform
-- @param #unsigned int flags
-- @return Scale9Sprite#Scale9Sprite self (return value: ccui.Scale9Sprite)
--------------------------------
@ -386,6 +388,13 @@
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Scale9Sprite] setScaleY
-- @param self
-- @param #float scaleY
-- @return Scale9Sprite#Scale9Sprite self (return value: ccui.Scale9Sprite)
--------------------------------
-- @overload self, float, float
-- @overload self, float

View File

@ -4,6 +4,13 @@
-- @extend ActionInterval
-- @parent_module cc
--------------------------------
--
-- @function [parent=#Sequence] init
-- @param self
-- @param #array_table arrayOfActions
-- @return bool#bool ret (return value: bool)
--------------------------------
-- initializes the action
-- @function [parent=#Sequence] initWithTwoActions

View File

@ -4,6 +4,13 @@
-- @extend ActionInterval
-- @parent_module cc
--------------------------------
--
-- @function [parent=#Spawn] init
-- @param self
-- @param #array_table arrayOfActions
-- @return bool#bool ret (return value: bool)
--------------------------------
-- initializes the Spawn action with the 2 actions to spawn
-- @function [parent=#Spawn] initWithTwoActions

View File

@ -23736,6 +23736,56 @@ int lua_register_cocos2dx_ActionInterval(lua_State* tolua_S)
return 1;
}
int lua_cocos2dx_Sequence_init(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Sequence* 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.Sequence",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Sequence*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sequence_init'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::Vector<cocos2d::FiniteTimeAction *> arg0;
ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Sequence:init");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sequence_init'", nullptr);
return 0;
}
bool ret = cobj->init(arg0);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sequence:init",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sequence_init'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Sequence_initWithTwoActions(lua_State* tolua_S)
{
int argc = 0;
@ -23839,6 +23889,7 @@ int lua_register_cocos2dx_Sequence(lua_State* tolua_S)
tolua_beginmodule(tolua_S,"Sequence");
tolua_function(tolua_S,"new",lua_cocos2dx_Sequence_constructor);
tolua_function(tolua_S,"init",lua_cocos2dx_Sequence_init);
tolua_function(tolua_S,"initWithTwoActions",lua_cocos2dx_Sequence_initWithTwoActions);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Sequence).name();
@ -24340,6 +24391,56 @@ int lua_register_cocos2dx_RepeatForever(lua_State* tolua_S)
return 1;
}
int lua_cocos2dx_Spawn_init(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Spawn* 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.Spawn",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Spawn*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Spawn_init'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::Vector<cocos2d::FiniteTimeAction *> arg0;
ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Spawn:init");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Spawn_init'", nullptr);
return 0;
}
bool ret = cobj->init(arg0);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Spawn:init",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Spawn_init'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Spawn_initWithTwoActions(lua_State* tolua_S)
{
int argc = 0;
@ -24443,6 +24544,7 @@ int lua_register_cocos2dx_Spawn(lua_State* tolua_S)
tolua_beginmodule(tolua_S,"Spawn");
tolua_function(tolua_S,"new",lua_cocos2dx_Spawn_constructor);
tolua_function(tolua_S,"init",lua_cocos2dx_Spawn_init);
tolua_function(tolua_S,"initWithTwoActions",lua_cocos2dx_Spawn_initWithTwoActions);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Spawn).name();

View File

@ -2157,6 +2157,8 @@ int register_all_cocos2dx(lua_State* tolua_S);