diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index 0f679d24a4..3e5b15b43e 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -12147,6 +12147,16 @@ color4f { }, +/** + * @method setIsolated + * @param {bool} arg0 + */ +setIsolated : function ( +bool +) +{ +}, + /** * @method drawRect * @param {vec2_object|vec2_object} vec2 @@ -12449,6 +12459,16 @@ color4f { }, +/** + * @method isIsolated + * @return {bool} + */ +isIsolated : function ( +) +{ + return false; +}, + /** * @method drawCubicBezier * @param {vec2_object} arg0 diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 08d035a685..6cd73ce847 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -34044,6 +34044,26 @@ bool js_cocos2dx_DrawNode_drawPoints(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_DrawNode_drawPoints : wrong number of arguments"); return false; } +bool js_cocos2dx_DrawNode_setIsolated(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + bool ok = true; + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::DrawNode* cobj = (cocos2d::DrawNode *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_setIsolated : Invalid Native Object"); + if (argc == 1) { + bool arg0; + arg0 = JS::ToBoolean(args.get(0)); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_DrawNode_setIsolated : Error processing arguments"); + cobj->setIsolated(arg0); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_DrawNode_setIsolated : wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} bool js_cocos2dx_DrawNode_drawRect(JSContext *cx, uint32_t argc, jsval *vp) { bool ok = true; @@ -34662,6 +34682,24 @@ bool js_cocos2dx_DrawNode_drawPoint(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_DrawNode_drawPoint : wrong number of arguments: %d, was expecting %d", argc, 3); return false; } +bool js_cocos2dx_DrawNode_isIsolated(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::DrawNode* cobj = (cocos2d::DrawNode *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_isIsolated : Invalid Native Object"); + if (argc == 0) { + bool ret = cobj->isIsolated(); + JS::RootedValue jsret(cx); + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_DrawNode_isIsolated : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_DrawNode_drawCubicBezier(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -34771,6 +34809,7 @@ void js_register_cocos2dx_DrawNode(JSContext *cx, JS::HandleObject global) { static JSFunctionSpec funcs[] = { JS_FN("drawLine", js_cocos2dx_DrawNode_drawLine, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("drawPoints", js_cocos2dx_DrawNode_drawPoints, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("setIsolated", js_cocos2dx_DrawNode_setIsolated, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("drawRect", js_cocos2dx_DrawNode_drawRect, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("drawSolidCircle", js_cocos2dx_DrawNode_drawSolidCircle, 5, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLineWidth", js_cocos2dx_DrawNode_setLineWidth, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -34792,6 +34831,7 @@ void js_register_cocos2dx_DrawNode(JSContext *cx, JS::HandleObject global) { JS_FN("drawSolidRect", js_cocos2dx_DrawNode_drawSolidRect, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getLineWidth", js_cocos2dx_DrawNode_getLineWidth, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("drawPoint", js_cocos2dx_DrawNode_drawPoint, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("isIsolated", js_cocos2dx_DrawNode_isIsolated, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("drawCubicBezier", js_cocos2dx_DrawNode_drawCubicBezier, 6, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("ctor", js_cocos2dx_DrawNode_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 15bd7d2142..102c4da644 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -2251,6 +2251,7 @@ void js_register_cocos2dx_DrawNode(JSContext *cx, JS::HandleObject global); void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj); bool js_cocos2dx_DrawNode_drawLine(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_drawPoints(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_DrawNode_setIsolated(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_drawRect(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_drawSolidCircle(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_setLineWidth(JSContext *cx, uint32_t argc, jsval *vp); @@ -2272,6 +2273,7 @@ bool js_cocos2dx_DrawNode_drawCardinalSpline(JSContext *cx, uint32_t argc, jsval bool js_cocos2dx_DrawNode_drawSolidRect(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_getLineWidth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_drawPoint(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_DrawNode_isIsolated(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_drawCubicBezier(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_create(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_DrawNode_DrawNode(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua index c3428385f2..a7eb685059 100644 --- a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua @@ -17,6 +17,14 @@ -- @param #color4f_table color -- @return DrawNode#DrawNode self (return value: cc.DrawNode) +-------------------------------- +-- When isolated is set, the position of the node is no longer affected by parent nodes.
+-- Which means it will be drawn just like a root node. +-- @function [parent=#DrawNode] setIsolated +-- @param self +-- @param #bool isolated +-- @return DrawNode#DrawNode self (return value: cc.DrawNode) + -------------------------------- -- @overload self, vec2_table, vec2_table, vec2_table, vec2_table, color4f_table -- @overload self, vec2_table, vec2_table, color4f_table @@ -204,6 +212,12 @@ -- @param #color4f_table color -- @return DrawNode#DrawNode self (return value: cc.DrawNode) +-------------------------------- +-- +-- @function [parent=#DrawNode] isIsolated +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- Draw a cubic bezier curve with color and number of segments
-- param origin The origin of the bezier path.
@@ -238,6 +252,15 @@ -- @param #unsigned int flags -- @return DrawNode#DrawNode self (return value: cc.DrawNode) +-------------------------------- +-- +-- @function [parent=#DrawNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #mat4_table parentTransform +-- @param #unsigned int parentFlags +-- @return DrawNode#DrawNode self (return value: cc.DrawNode) + -------------------------------- -- -- @function [parent=#DrawNode] init diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 1a91a874b9..60d24eccca 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -53032,6 +53032,56 @@ int lua_cocos2dx_DrawNode_drawLine(lua_State* tolua_S) return 0; } +int lua_cocos2dx_DrawNode_setIsolated(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::DrawNode* 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.DrawNode",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::DrawNode*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode_setIsolated'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.DrawNode:setIsolated"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_setIsolated'", nullptr); + return 0; + } + cobj->setIsolated(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:setIsolated",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_DrawNode_setIsolated'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_DrawNode_drawRect(lua_State* tolua_S) { int argc = 0; @@ -54057,6 +54107,53 @@ int lua_cocos2dx_DrawNode_drawPoint(lua_State* tolua_S) return 0; } +int lua_cocos2dx_DrawNode_isIsolated(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::DrawNode* 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.DrawNode",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::DrawNode*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode_isIsolated'", 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_DrawNode_isIsolated'", nullptr); + return 0; + } + bool ret = cobj->isIsolated(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:isIsolated",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_DrawNode_isIsolated'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S) { int argc = 0; @@ -54237,6 +54334,7 @@ int lua_register_cocos2dx_DrawNode(lua_State* tolua_S) tolua_beginmodule(tolua_S,"DrawNode"); tolua_function(tolua_S,"new",lua_cocos2dx_DrawNode_constructor); tolua_function(tolua_S,"drawLine",lua_cocos2dx_DrawNode_drawLine); + tolua_function(tolua_S,"setIsolated",lua_cocos2dx_DrawNode_setIsolated); tolua_function(tolua_S,"drawRect",lua_cocos2dx_DrawNode_drawRect); tolua_function(tolua_S,"drawSolidCircle",lua_cocos2dx_DrawNode_drawSolidCircle); tolua_function(tolua_S,"setLineWidth",lua_cocos2dx_DrawNode_setLineWidth); @@ -54254,6 +54352,7 @@ int lua_register_cocos2dx_DrawNode(lua_State* tolua_S) tolua_function(tolua_S,"drawSolidRect",lua_cocos2dx_DrawNode_drawSolidRect); tolua_function(tolua_S,"getLineWidth",lua_cocos2dx_DrawNode_getLineWidth); tolua_function(tolua_S,"drawPoint",lua_cocos2dx_DrawNode_drawPoint); + tolua_function(tolua_S,"isIsolated",lua_cocos2dx_DrawNode_isIsolated); tolua_function(tolua_S,"drawCubicBezier",lua_cocos2dx_DrawNode_drawCubicBezier); tolua_function(tolua_S,"create", lua_cocos2dx_DrawNode_create); tolua_endmodule(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index c98e319cbe..e377d2ed2c 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2289,6 +2289,8 @@ int register_all_cocos2dx(lua_State* tolua_S); + +