Skip to content

Commit

Permalink
Merge pull request cocos2d#14427 from CocosRobot/update_lua_bindings_…
Browse files Browse the repository at this point in the history
…1447902515

[ci skip][AUTO]: updating luabinding & jsbinding automatically
  • Loading branch information
pandamicro committed Nov 19, 2015
2 parents 7ea90c2 + d5b07e5 commit b8ebd51
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 0 deletions.
28 changes: 28 additions & 0 deletions cocos/scripting/lua-bindings/auto/api/RichElementNewLine.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

--------------------------------
-- @module RichElementNewLine
-- @extend RichElement
-- @parent_module ccui

--------------------------------
-- brief Create a RichElementNewLine with various arguments.<br>
-- param tag A integer tag value.<br>
-- param color A color in Color3B.<br>
-- param opacity A opacity in GLubyte.<br>
-- return A RichElementNewLine instance.
-- @function [parent=#RichElementNewLine] create
-- @param self
-- @param #int tag
-- @param #color3b_table color
-- @param #unsigned char opacity
-- @return RichElementNewLine#RichElementNewLine ret (return value: ccui.RichElementNewLine)

--------------------------------
-- brief Default constructor.<br>
-- js ctor<br>
-- lua new
-- @function [parent=#RichElementNewLine] RichElementNewLine
-- @param self
-- @return RichElementNewLine#RichElementNewLine self (return value: ccui.RichElementNewLine)

return nil
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@
-- @field [parent=#ccui] RichElementCustomNode#RichElementCustomNode RichElementCustomNode preloaded module


--------------------------------------------------------
-- the ccui RichElementNewLine
-- @field [parent=#ccui] RichElementNewLine#RichElementNewLine RichElementNewLine preloaded module


--------------------------------------------------------
-- the ccui RichText
-- @field [parent=#ccui] RichText#RichText RichText preloaded module
Expand Down
99 changes: 99 additions & 0 deletions cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23393,6 +23393,104 @@ int lua_register_cocos2dx_ui_RichElementCustomNode(lua_State* tolua_S)
return 1;
}

int lua_cocos2dx_ui_RichElementNewLine_create(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;

#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif

#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"ccui.RichElementNewLine",0,&tolua_err)) goto tolua_lerror;
#endif

argc = lua_gettop(tolua_S) - 1;

if (argc == 3)
{
int arg0;
cocos2d::Color3B arg1;
uint16_t arg2;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementNewLine:create");
ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementNewLine:create");
ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementNewLine:create");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementNewLine_create'", nullptr);
return 0;
}
cocos2d::ui::RichElementNewLine* ret = cocos2d::ui::RichElementNewLine::create(arg0, arg1, arg2);
object_to_luaval<cocos2d::ui::RichElementNewLine>(tolua_S, "ccui.RichElementNewLine",(cocos2d::ui::RichElementNewLine*)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementNewLine:create",argc, 3);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichElementNewLine_create'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_RichElementNewLine_constructor(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::RichElementNewLine* cobj = nullptr;
bool ok = true;

#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif



argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementNewLine_constructor'", nullptr);
return 0;
}
cobj = new cocos2d::ui::RichElementNewLine();
cobj->autorelease();
int ID = (int)cobj->_ID ;
int* luaID = &cobj->_luaID ;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementNewLine");
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementNewLine:RichElementNewLine",argc, 0);
return 0;

#if COCOS2D_DEBUG >= 1
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichElementNewLine_constructor'.",&tolua_err);
#endif

return 0;
}

static int lua_cocos2dx_ui_RichElementNewLine_finalize(lua_State* tolua_S)
{
printf("luabindings: finalizing LUA object (RichElementNewLine)");
return 0;
}

int lua_register_cocos2dx_ui_RichElementNewLine(lua_State* tolua_S)
{
tolua_usertype(tolua_S,"ccui.RichElementNewLine");
tolua_cclass(tolua_S,"RichElementNewLine","ccui.RichElementNewLine","ccui.RichElement",nullptr);

tolua_beginmodule(tolua_S,"RichElementNewLine");
tolua_function(tolua_S,"new",lua_cocos2dx_ui_RichElementNewLine_constructor);
tolua_function(tolua_S,"create", lua_cocos2dx_ui_RichElementNewLine_create);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::ui::RichElementNewLine).name();
g_luaType[typeName] = "ccui.RichElementNewLine";
g_typeCast["RichElementNewLine"] = "ccui.RichElementNewLine";
return 1;
}

int lua_cocos2dx_ui_RichText_insertElement(lua_State* tolua_S)
{
int argc = 0;
Expand Down Expand Up @@ -30494,6 +30592,7 @@ TOLUA_API int register_all_cocos2dx_ui(lua_State* tolua_S)
lua_register_cocos2dx_ui_RadioButtonGroup(tolua_S);
lua_register_cocos2dx_ui_ScrollView(tolua_S);
lua_register_cocos2dx_ui_ListView(tolua_S);
lua_register_cocos2dx_ui_RichElementNewLine(tolua_S);
lua_register_cocos2dx_ui_LayoutComponent(tolua_S);
lua_register_cocos2dx_ui_Button(tolua_S);
lua_register_cocos2dx_ui_LayoutParameter(tolua_S);
Expand Down
3 changes: 3 additions & 0 deletions cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,9 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);









Expand Down

0 comments on commit b8ebd51

Please sign in to comment.