From 698a75e17fd6840af68e01b764f6b2e0174b58a9 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Mon, 13 Apr 2015 05:44:29 +0000 Subject: [PATCH] [AUTO]: updating luabinding automatically --- .../lua-bindings/auto/api/AlphaFrame.lua | 7 - .../lua-bindings/auto/api/BlendFuncFrame.lua | 38 +++ .../lua-bindings/auto/api/ColorFrame.lua | 7 - .../scripting/lua-bindings/auto/api/Frame.lua | 13 + .../lua-bindings/auto/api/PositionFrame.lua | 7 - .../lua-bindings/auto/api/RotationFrame.lua | 7 - .../auto/api/RotationSkewFrame.lua | 7 - .../lua-bindings/auto/api/ScaleFrame.lua | 7 - .../lua-bindings/auto/api/SkewFrame.lua | 7 - .../auto/api/lua_cocos2dx_studio_auto_api.lua | 5 + .../auto/lua_cocos2dx_studio_auto.cpp | 291 ++++++++++++++++++ .../auto/lua_cocos2dx_studio_auto.hpp | 7 + 12 files changed, 354 insertions(+), 49 deletions(-) create mode 100644 cocos/scripting/lua-bindings/auto/api/BlendFuncFrame.lua diff --git a/cocos/scripting/lua-bindings/auto/api/AlphaFrame.lua b/cocos/scripting/lua-bindings/auto/api/AlphaFrame.lua index 14b2720e8f..06f6f808e6 100644 --- a/cocos/scripting/lua-bindings/auto/api/AlphaFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/AlphaFrame.lua @@ -23,13 +23,6 @@ -- @param self -- @return AlphaFrame#AlphaFrame ret (return value: ccs.AlphaFrame) --------------------------------- --- --- @function [parent=#AlphaFrame] apply --- @param self --- @param #float percent --- @return AlphaFrame#AlphaFrame self (return value: ccs.AlphaFrame) - -------------------------------- -- -- @function [parent=#AlphaFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/BlendFuncFrame.lua b/cocos/scripting/lua-bindings/auto/api/BlendFuncFrame.lua new file mode 100644 index 0000000000..d5ff54ba3e --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/BlendFuncFrame.lua @@ -0,0 +1,38 @@ + +-------------------------------- +-- @module BlendFuncFrame +-- @extend Frame +-- @parent_module ccs + +-------------------------------- +-- +-- @function [parent=#BlendFuncFrame] getBlendFunc +-- @param self +-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc) + +-------------------------------- +-- +-- @function [parent=#BlendFuncFrame] setBlendFunc +-- @param self +-- @param #cc.BlendFunc blendFunc +-- @return BlendFuncFrame#BlendFuncFrame self (return value: ccs.BlendFuncFrame) + +-------------------------------- +-- +-- @function [parent=#BlendFuncFrame] create +-- @param self +-- @return BlendFuncFrame#BlendFuncFrame ret (return value: ccs.BlendFuncFrame) + +-------------------------------- +-- +-- @function [parent=#BlendFuncFrame] clone +-- @param self +-- @return Frame#Frame ret (return value: ccs.Frame) + +-------------------------------- +-- +-- @function [parent=#BlendFuncFrame] BlendFuncFrame +-- @param self +-- @return BlendFuncFrame#BlendFuncFrame self (return value: ccs.BlendFuncFrame) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ColorFrame.lua b/cocos/scripting/lua-bindings/auto/api/ColorFrame.lua index 355c15890e..f97ffe1bad 100644 --- a/cocos/scripting/lua-bindings/auto/api/ColorFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ColorFrame.lua @@ -23,13 +23,6 @@ -- @param self -- @return ColorFrame#ColorFrame ret (return value: ccs.ColorFrame) --------------------------------- --- --- @function [parent=#ColorFrame] apply --- @param self --- @param #float percent --- @return ColorFrame#ColorFrame self (return value: ccs.ColorFrame) - -------------------------------- -- -- @function [parent=#ColorFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/Frame.lua b/cocos/scripting/lua-bindings/auto/api/Frame.lua index b62b004fbf..dacd214807 100644 --- a/cocos/scripting/lua-bindings/auto/api/Frame.lua +++ b/cocos/scripting/lua-bindings/auto/api/Frame.lua @@ -30,6 +30,19 @@ -- @param self -- @return bool#bool ret (return value: bool) +-------------------------------- +-- +-- @function [parent=#Frame] getEasingParams +-- @param self +-- @return array_table#array_table ret (return value: array_table) + +-------------------------------- +-- +-- @function [parent=#Frame] setEasingParams +-- @param self +-- @param #array_table easingParams +-- @return Frame#Frame self (return value: ccs.Frame) + -------------------------------- -- -- @function [parent=#Frame] getFrameIndex diff --git a/cocos/scripting/lua-bindings/auto/api/PositionFrame.lua b/cocos/scripting/lua-bindings/auto/api/PositionFrame.lua index 99d92b6c9d..99a421cb74 100644 --- a/cocos/scripting/lua-bindings/auto/api/PositionFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/PositionFrame.lua @@ -49,13 +49,6 @@ -- @param self -- @return PositionFrame#PositionFrame ret (return value: ccs.PositionFrame) --------------------------------- --- --- @function [parent=#PositionFrame] apply --- @param self --- @param #float percent --- @return PositionFrame#PositionFrame self (return value: ccs.PositionFrame) - -------------------------------- -- -- @function [parent=#PositionFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/RotationFrame.lua b/cocos/scripting/lua-bindings/auto/api/RotationFrame.lua index 850a7f89ca..05038a739f 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotationFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotationFrame.lua @@ -23,13 +23,6 @@ -- @param self -- @return RotationFrame#RotationFrame ret (return value: ccs.RotationFrame) --------------------------------- --- --- @function [parent=#RotationFrame] apply --- @param self --- @param #float percent --- @return RotationFrame#RotationFrame self (return value: ccs.RotationFrame) - -------------------------------- -- -- @function [parent=#RotationFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/RotationSkewFrame.lua b/cocos/scripting/lua-bindings/auto/api/RotationSkewFrame.lua index e2e29673da..48894f85d1 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotationSkewFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotationSkewFrame.lua @@ -10,13 +10,6 @@ -- @param self -- @return RotationSkewFrame#RotationSkewFrame ret (return value: ccs.RotationSkewFrame) --------------------------------- --- --- @function [parent=#RotationSkewFrame] apply --- @param self --- @param #float percent --- @return RotationSkewFrame#RotationSkewFrame self (return value: ccs.RotationSkewFrame) - -------------------------------- -- -- @function [parent=#RotationSkewFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/ScaleFrame.lua b/cocos/scripting/lua-bindings/auto/api/ScaleFrame.lua index b3131fba39..ecfaee581f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScaleFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScaleFrame.lua @@ -43,13 +43,6 @@ -- @param self -- @return ScaleFrame#ScaleFrame ret (return value: ccs.ScaleFrame) --------------------------------- --- --- @function [parent=#ScaleFrame] apply --- @param self --- @param #float percent --- @return ScaleFrame#ScaleFrame self (return value: ccs.ScaleFrame) - -------------------------------- -- -- @function [parent=#ScaleFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/SkewFrame.lua b/cocos/scripting/lua-bindings/auto/api/SkewFrame.lua index d8e9feabfb..e170914a94 100644 --- a/cocos/scripting/lua-bindings/auto/api/SkewFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/SkewFrame.lua @@ -36,13 +36,6 @@ -- @param self -- @return SkewFrame#SkewFrame ret (return value: ccs.SkewFrame) --------------------------------- --- --- @function [parent=#SkewFrame] apply --- @param self --- @param #float percent --- @return SkewFrame#SkewFrame self (return value: ccs.SkewFrame) - -------------------------------- -- -- @function [parent=#SkewFrame] clone diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua index 31610513d1..1e84596509 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua @@ -251,6 +251,11 @@ -- @field [parent=#ccs] ZOrderFrame#ZOrderFrame ZOrderFrame preloaded module +-------------------------------------------------------- +-- the ccs BlendFuncFrame +-- @field [parent=#ccs] BlendFuncFrame#BlendFuncFrame BlendFuncFrame preloaded module + + -------------------------------------------------------- -- the ccs Timeline -- @field [parent=#ccs] Timeline#Timeline Timeline preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index 5362beb811..77d180dffd 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -16099,6 +16099,103 @@ int lua_cocos2dx_studio_Frame_isEnterWhenPassed(lua_State* tolua_S) return 0; } +int lua_cocos2dx_studio_Frame_getEasingParams(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::Frame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.Frame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::Frame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Frame_getEasingParams'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Frame_getEasingParams'", nullptr); + return 0; + } + const std::vector >& ret = cobj->getEasingParams(); + ccvector_float_to_luaval(tolua_S, ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getEasingParams",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Frame_getEasingParams'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_studio_Frame_setEasingParams(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::Frame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.Frame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::Frame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_Frame_setEasingParams'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::vector > arg0; + + ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0, "ccs.Frame:setEasingParams"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Frame_setEasingParams'", nullptr); + return 0; + } + cobj->setEasingParams(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setEasingParams",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_Frame_setEasingParams'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_studio_Frame_getFrameIndex(lua_State* tolua_S) { int argc = 0; @@ -16453,6 +16550,8 @@ int lua_register_cocos2dx_studio_Frame(lua_State* tolua_S) tolua_function(tolua_S,"setNode",lua_cocos2dx_studio_Frame_setNode); tolua_function(tolua_S,"setTimeline",lua_cocos2dx_studio_Frame_setTimeline); tolua_function(tolua_S,"isEnterWhenPassed",lua_cocos2dx_studio_Frame_isEnterWhenPassed); + tolua_function(tolua_S,"getEasingParams",lua_cocos2dx_studio_Frame_getEasingParams); + tolua_function(tolua_S,"setEasingParams",lua_cocos2dx_studio_Frame_setEasingParams); tolua_function(tolua_S,"getFrameIndex",lua_cocos2dx_studio_Frame_getFrameIndex); tolua_function(tolua_S,"apply",lua_cocos2dx_studio_Frame_apply); tolua_function(tolua_S,"isTween",lua_cocos2dx_studio_Frame_isTween); @@ -19745,6 +19844,197 @@ int lua_register_cocos2dx_studio_ZOrderFrame(lua_State* tolua_S) return 1; } +int lua_cocos2dx_studio_BlendFuncFrame_getBlendFunc(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::BlendFuncFrame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.BlendFuncFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::BlendFuncFrame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_BlendFuncFrame_getBlendFunc'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_BlendFuncFrame_getBlendFunc'", nullptr); + return 0; + } + cocos2d::BlendFunc ret = cobj->getBlendFunc(); + blendfunc_to_luaval(tolua_S, ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BlendFuncFrame:getBlendFunc",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_BlendFuncFrame_getBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_studio_BlendFuncFrame_setBlendFunc(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::BlendFuncFrame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.BlendFuncFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::BlendFuncFrame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_BlendFuncFrame_setBlendFunc'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::BlendFunc arg0; + + ok &= luaval_to_blendfunc(tolua_S, 2, &arg0, "ccs.BlendFuncFrame:setBlendFunc"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_BlendFuncFrame_setBlendFunc'", nullptr); + return 0; + } + cobj->setBlendFunc(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BlendFuncFrame:setBlendFunc",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_BlendFuncFrame_setBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_studio_BlendFuncFrame_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,"ccs.BlendFuncFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_BlendFuncFrame_create'", nullptr); + return 0; + } + cocostudio::timeline::BlendFuncFrame* ret = cocostudio::timeline::BlendFuncFrame::create(); + object_to_luaval(tolua_S, "ccs.BlendFuncFrame",(cocostudio::timeline::BlendFuncFrame*)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BlendFuncFrame:create",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_BlendFuncFrame_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_studio_BlendFuncFrame_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::BlendFuncFrame* 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_studio_BlendFuncFrame_constructor'", nullptr); + return 0; + } + cobj = new cocostudio::timeline::BlendFuncFrame(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.BlendFuncFrame"); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BlendFuncFrame:BlendFuncFrame",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_BlendFuncFrame_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_studio_BlendFuncFrame_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (BlendFuncFrame)"); + return 0; +} + +int lua_register_cocos2dx_studio_BlendFuncFrame(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"ccs.BlendFuncFrame"); + tolua_cclass(tolua_S,"BlendFuncFrame","ccs.BlendFuncFrame","ccs.Frame",nullptr); + + tolua_beginmodule(tolua_S,"BlendFuncFrame"); + tolua_function(tolua_S,"new",lua_cocos2dx_studio_BlendFuncFrame_constructor); + tolua_function(tolua_S,"getBlendFunc",lua_cocos2dx_studio_BlendFuncFrame_getBlendFunc); + tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_studio_BlendFuncFrame_setBlendFunc); + tolua_function(tolua_S,"create", lua_cocos2dx_studio_BlendFuncFrame_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocostudio::timeline::BlendFuncFrame).name(); + g_luaType[typeName] = "ccs.BlendFuncFrame"; + g_typeCast["BlendFuncFrame"] = "ccs.BlendFuncFrame"; + return 1; +} + int lua_cocos2dx_studio_Timeline_clone(lua_State* tolua_S) { int argc = 0; @@ -22394,6 +22684,7 @@ TOLUA_API int register_all_cocos2dx_studio(lua_State* tolua_S) lua_register_cocos2dx_studio_ActionFrame(tolua_S); lua_register_cocos2dx_studio_ActionRotationFrame(tolua_S); lua_register_cocos2dx_studio_Frame(tolua_S); + lua_register_cocos2dx_studio_BlendFuncFrame(tolua_S); lua_register_cocos2dx_studio_ScaleFrame(tolua_S); lua_register_cocos2dx_studio_Tween(tolua_S); lua_register_cocos2dx_studio_ContourData(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp index de9182fb1b..d0a21c7915 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp @@ -501,6 +501,13 @@ int register_all_cocos2dx_studio(lua_State* tolua_S); + + + + + + +