Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15477 from CocosRobot/update_lua_bindings_1461203553 

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
minggo 2016-04-21 09:55:52 +08:00
parent 481c55adb2 f4c9ea3902
commit 59f063a39b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
View File

@ -755,10 +755,10 @@ str
/** /**
* @method setPhysicsBody * @method setPhysicsBody
* @param {cc.Component} arg0 * @param {cc.PhysicsBody} arg0
*/ */
setPhysicsBody : function ( setPhysicsBody : function (
component physicsbody
) )
{ {
}, },

4
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

@ -1997,14 +1997,14 @@ bool js_cocos2dx_Node_setPhysicsBody(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_setPhysicsBody : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_setPhysicsBody : Invalid Native Object");
if (argc == 1) { if (argc == 1) {
cocos2d::Component* arg0 = nullptr; cocos2d::PhysicsBody* arg0 = nullptr;
do { do {
if (args.get(0).isNull()) { arg0 = nullptr; break; } if (args.get(0).isNull()) { arg0 = nullptr; break; }
if (!args.get(0).isObject()) { ok = false; break; } if (!args.get(0).isObject()) { ok = false; break; }
js_proxy_t *jsProxy; js_proxy_t *jsProxy;
JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull());
jsProxy = jsb_get_js_proxy(tmpObj); jsProxy = jsb_get_js_proxy(tmpObj);
arg0 = (cocos2d::Component*)(jsProxy ? jsProxy->ptr : NULL); arg0 = (cocos2d::PhysicsBody*)(jsProxy ? jsProxy->ptr : NULL);
JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object"); JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object");
} while (0); } while (0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Node_setPhysicsBody : Error processing arguments"); JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Node_setPhysicsBody : Error processing arguments");

2
cocos/scripting/lua-bindings/auto/api/Node.lua
View File

@ -28,7 +28,7 @@
-- --
-- @function [parent=#Node] setPhysicsBody -- @function [parent=#Node] setPhysicsBody
-- @param self -- @param self
-- @param #cc.Component physicsBody -- @param #cc.PhysicsBody physicsBody
-- @return Node#Node self (return value: cc.Node) -- @return Node#Node self (return value: cc.Node)
-------------------------------- --------------------------------

4
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -3768,9 +3768,9 @@ int lua_cocos2dx_Node_setPhysicsBody(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1; argc = lua_gettop(tolua_S)-1;
if (argc == 1) if (argc == 1)
{ {
cocos2d::Component* arg0; cocos2d::PhysicsBody* arg0;
ok &= luaval_to_object<cocos2d::Component>(tolua_S, 2, "cc.Component",&arg0, "cc.Node:setPhysicsBody"); ok &= luaval_to_object<cocos2d::PhysicsBody>(tolua_S, 2, "cc.PhysicsBody",&arg0, "cc.Node:setPhysicsBody");
if(!ok) if(!ok)
{ {
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_setPhysicsBody'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_setPhysicsBody'", nullptr);