Merge pull request #10142 from CocosRobot/update_lua_bindings_1421822695

[AUTO]: updating luabinding automatically
This commit is contained in:
minggo 2015-01-21 14:58:52 +08:00
commit 82bb5e6f69
3 changed files with 137 additions and 24 deletions

View File

@ -5,10 +5,10 @@
-- @parent_module cc -- @parent_module cc
-------------------------------- --------------------------------
-- -- get & set speed, negative speed means playing reverse
-- @function [parent=#Animate3D] setSpeed -- @function [parent=#Animate3D] getSpeed
-- @param self -- @param self
-- @param #float speed -- @return float#float ret (return value: float)
-------------------------------- --------------------------------
-- --
@ -17,11 +17,23 @@
-- @param #float weight -- @param #float weight
-------------------------------- --------------------------------
-- get & set speed, negative speed means playing reverse --
-- @function [parent=#Animate3D] getSpeed -- @function [parent=#Animate3D] getOriginInterval
-- @param self -- @param self
-- @return float#float ret (return value: float) -- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Animate3D] setSpeed
-- @param self
-- @param #float speed
--------------------------------
-- get & set origin interval
-- @function [parent=#Animate3D] setOriginInterval
-- @param self
-- @param #float interval
-------------------------------- --------------------------------
-- get & set blend weight, weight must positive -- get & set blend weight, weight must positive
-- @function [parent=#Animate3D] getWeight -- @function [parent=#Animate3D] getWeight

View File

@ -1767,7 +1767,7 @@ int lua_register_cocos2dx_3d_Animation3D(lua_State* tolua_S)
return 1; return 1;
} }
int lua_cocos2dx_3d_Animate3D_setSpeed(lua_State* tolua_S) int lua_cocos2dx_3d_Animate3D_getSpeed(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::Animate3D* cobj = nullptr; cocos2d::Animate3D* cobj = nullptr;
@ -1787,32 +1787,29 @@ int lua_cocos2dx_3d_Animate3D_setSpeed(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_setSpeed'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_getSpeed'", nullptr);
return 0; return 0;
} }
#endif #endif
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) if (argc == 0)
{ {
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setSpeed");
if(!ok) if(!ok)
{ {
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_setSpeed'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_getSpeed'", nullptr);
return 0; return 0;
} }
cobj->setSpeed(arg0); double ret = cobj->getSpeed();
lua_settop(tolua_S, 1); tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1; return 1;
} }
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setSpeed",argc, 1); luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getSpeed",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_3d_Animate3D_setSpeed'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_getSpeed'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -1867,7 +1864,7 @@ int lua_cocos2dx_3d_Animate3D_setWeight(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_3d_Animate3D_getSpeed(lua_State* tolua_S) int lua_cocos2dx_3d_Animate3D_getOriginInterval(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::Animate3D* cobj = nullptr; cocos2d::Animate3D* cobj = nullptr;
@ -1887,7 +1884,7 @@ int lua_cocos2dx_3d_Animate3D_getSpeed(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_getSpeed'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_getOriginInterval'", nullptr);
return 0; return 0;
} }
#endif #endif
@ -1897,19 +1894,119 @@ int lua_cocos2dx_3d_Animate3D_getSpeed(lua_State* tolua_S)
{ {
if(!ok) if(!ok)
{ {
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_getSpeed'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_getOriginInterval'", nullptr);
return 0; return 0;
} }
double ret = cobj->getSpeed(); double ret = cobj->getOriginInterval();
tolua_pushnumber(tolua_S,(lua_Number)ret); tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1; return 1;
} }
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getSpeed",argc, 0); luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getOriginInterval",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_3d_Animate3D_getSpeed'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_getOriginInterval'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_3d_Animate3D_setSpeed(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_setSpeed'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setSpeed");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_setSpeed'", nullptr);
return 0;
}
cobj->setSpeed(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setSpeed",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_setSpeed'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_3d_Animate3D_setOriginInterval(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_setOriginInterval'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setOriginInterval");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animate3D_setOriginInterval'", nullptr);
return 0;
}
cobj->setOriginInterval(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setOriginInterval",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_setOriginInterval'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -2120,9 +2217,11 @@ int lua_register_cocos2dx_3d_Animate3D(lua_State* tolua_S)
tolua_cclass(tolua_S,"Animate3D","cc.Animate3D","cc.ActionInterval",nullptr); tolua_cclass(tolua_S,"Animate3D","cc.Animate3D","cc.ActionInterval",nullptr);
tolua_beginmodule(tolua_S,"Animate3D"); tolua_beginmodule(tolua_S,"Animate3D");
tolua_function(tolua_S,"setSpeed",lua_cocos2dx_3d_Animate3D_setSpeed);
tolua_function(tolua_S,"setWeight",lua_cocos2dx_3d_Animate3D_setWeight);
tolua_function(tolua_S,"getSpeed",lua_cocos2dx_3d_Animate3D_getSpeed); tolua_function(tolua_S,"getSpeed",lua_cocos2dx_3d_Animate3D_getSpeed);
tolua_function(tolua_S,"setWeight",lua_cocos2dx_3d_Animate3D_setWeight);
tolua_function(tolua_S,"getOriginInterval",lua_cocos2dx_3d_Animate3D_getOriginInterval);
tolua_function(tolua_S,"setSpeed",lua_cocos2dx_3d_Animate3D_setSpeed);
tolua_function(tolua_S,"setOriginInterval",lua_cocos2dx_3d_Animate3D_setOriginInterval);
tolua_function(tolua_S,"getWeight",lua_cocos2dx_3d_Animate3D_getWeight); tolua_function(tolua_S,"getWeight",lua_cocos2dx_3d_Animate3D_getWeight);
tolua_function(tolua_S,"create", lua_cocos2dx_3d_Animate3D_create); tolua_function(tolua_S,"create", lua_cocos2dx_3d_Animate3D_create);
tolua_function(tolua_S,"getTransitionTime", lua_cocos2dx_3d_Animate3D_getTransitionTime); tolua_function(tolua_S,"getTransitionTime", lua_cocos2dx_3d_Animate3D_getTransitionTime);

View File

@ -62,6 +62,8 @@ int register_all_cocos2dx_3d(lua_State* tolua_S);