mirror of https://github.com/axmolengine/axmol.git
Merge pull request #7198 from CocosRobot/update_lua_bindings_1403676931
[AUTO]: updating luabinding automatically
This commit is contained in:
commit
71f92a41b5
|
@ -14,9 +14,7 @@
|
|||
-- @return BatchNode#BatchNode ret (return value: ccs.BatchNode)
|
||||
|
||||
--------------------------------
|
||||
-- overload function: addChild(cc.Node, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node)
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
|
|
|
@ -178,9 +178,7 @@
|
|||
-- @return Ref#Ref ret (return value: cc.Ref)
|
||||
|
||||
--------------------------------
|
||||
-- overload function: addChild(cc.Node, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node)
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
|
|
|
@ -106,9 +106,7 @@
|
|||
-- @return Ref#Ref ret (return value: cc.Ref)
|
||||
|
||||
--------------------------------
|
||||
-- overload function: addChild(cc.Node, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node)
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
|
|
|
@ -38,11 +38,13 @@
|
|||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- @function [parent=#Menu] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
-- @param #string str
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Menu] isOpacityModifyRGB
|
||||
|
|
|
@ -10,11 +10,13 @@
|
|||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- @function [parent=#Node] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
-- @param #string str
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Node] removeComponent
|
||||
|
@ -368,6 +370,12 @@
|
|||
-- @param #mat4_table mat4
|
||||
-- @param #unsigned int int
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Node] removeChildByName
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Node] getGLProgramState
|
||||
-- @param self
|
||||
|
|
|
@ -22,12 +22,16 @@
|
|||
-- @return ParallaxNode#ParallaxNode ret (return value: cc.ParallaxNode)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParallaxNode] addChild
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- @function [parent=#ParallaxNode] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParallaxNode] visit
|
||||
-- @param self
|
||||
|
|
|
@ -60,12 +60,16 @@
|
|||
-- @return ParticleBatchNode#ParticleBatchNode ret (return value: cc.ParticleBatchNode)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParticleBatchNode] addChild
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- @function [parent=#ParticleBatchNode] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParticleBatchNode] draw
|
||||
-- @param self
|
||||
|
|
|
@ -40,10 +40,14 @@
|
|||
-- @param #float float
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Scene] addChild
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- @function [parent=#Scene] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
|
||||
return nil
|
||||
|
|
|
@ -180,9 +180,7 @@
|
|||
-- @return Ref#Ref ret (return value: cc.Ref)
|
||||
|
||||
--------------------------------
|
||||
-- overload function: addChild(cc.Node, int)
|
||||
--
|
||||
-- overload function: addChild(cc.Node)
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
|
|
|
@ -188,12 +188,16 @@
|
|||
-- @param #unsigned int int
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Sprite] addChild
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- @function [parent=#Sprite] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Sprite] setScaleY
|
||||
-- @param self
|
||||
|
|
|
@ -108,12 +108,16 @@
|
|||
-- @return SpriteBatchNode#SpriteBatchNode ret (return value: cc.SpriteBatchNode)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#SpriteBatchNode] addChild
|
||||
-- overload function: addChild(cc.Node, int, string)
|
||||
--
|
||||
-- overload function: addChild(cc.Node, int, int)
|
||||
--
|
||||
-- @function [parent=#SpriteBatchNode] addChild
|
||||
-- @param self
|
||||
-- @param #cc.Node node
|
||||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#SpriteBatchNode] draw
|
||||
-- @param self
|
||||
|
|
|
@ -3680,6 +3680,25 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S)
|
|||
}
|
||||
}while(0);
|
||||
ok = true;
|
||||
do{
|
||||
if (argc == 3) {
|
||||
cocos2d::Node* arg0;
|
||||
ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0);
|
||||
|
||||
if (!ok) { break; }
|
||||
int arg1;
|
||||
ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
|
||||
|
||||
if (!ok) { break; }
|
||||
std::string arg2;
|
||||
ok &= luaval_to_std_string(tolua_S, 4,&arg2);
|
||||
|
||||
if (!ok) { break; }
|
||||
cobj->addChild(arg0, arg1, arg2);
|
||||
return 0;
|
||||
}
|
||||
}while(0);
|
||||
ok = true;
|
||||
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChild",argc, 3);
|
||||
return 0;
|
||||
|
||||
|
@ -6676,6 +6695,65 @@ int lua_cocos2dx_Node_visit(lua_State* tolua_S)
|
|||
|
||||
return 0;
|
||||
}
|
||||
int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S)
|
||||
{
|
||||
int argc = 0;
|
||||
cocos2d::Node* 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.Node",0,&tolua_err)) goto tolua_lerror;
|
||||
#endif
|
||||
|
||||
cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
if (!cobj)
|
||||
{
|
||||
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_removeChildByName'", nullptr);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
argc = lua_gettop(tolua_S)-1;
|
||||
if (argc == 1)
|
||||
{
|
||||
std::string arg0;
|
||||
|
||||
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
|
||||
if(!ok)
|
||||
return 0;
|
||||
cobj->removeChildByName(arg0);
|
||||
return 0;
|
||||
}
|
||||
if (argc == 2)
|
||||
{
|
||||
std::string arg0;
|
||||
bool arg1;
|
||||
|
||||
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
|
||||
|
||||
ok &= luaval_to_boolean(tolua_S, 3,&arg1);
|
||||
if(!ok)
|
||||
return 0;
|
||||
cobj->removeChildByName(arg0, arg1);
|
||||
return 0;
|
||||
}
|
||||
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildByName",argc, 1);
|
||||
return 0;
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
tolua_lerror:
|
||||
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_removeChildByName'.",&tolua_err);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
int lua_cocos2dx_Node_getGLProgramState(lua_State* tolua_S)
|
||||
{
|
||||
int argc = 0;
|
||||
|
@ -9584,6 +9662,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S)
|
|||
tolua_function(tolua_S,"getRotation",lua_cocos2dx_Node_getRotation);
|
||||
tolua_function(tolua_S,"getAnchorPointInPoints",lua_cocos2dx_Node_getAnchorPointInPoints);
|
||||
tolua_function(tolua_S,"visit",lua_cocos2dx_Node_visit);
|
||||
tolua_function(tolua_S,"removeChildByName",lua_cocos2dx_Node_removeChildByName);
|
||||
tolua_function(tolua_S,"getGLProgramState",lua_cocos2dx_Node_getGLProgramState);
|
||||
tolua_function(tolua_S,"setScheduler",lua_cocos2dx_Node_setScheduler);
|
||||
tolua_function(tolua_S,"stopAllActions",lua_cocos2dx_Node_stopAllActions);
|
||||
|
|
|
@ -1559,6 +1559,7 @@ int register_all_cocos2dx(lua_State* tolua_S);
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // __cocos2dx_h__
|
||||
|
|
Loading…
Reference in New Issue