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 3e5b15b43ef3..72882a7ad456 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 @@ -12585,6 +12585,16 @@ labeleffect { }, +/** + * @method getLabelType + * @return {cc.Label::LabelType} + */ +getLabelType : function ( +) +{ + return 0; +}, + /** * @method getTextColor * @return {color4b_object} @@ -12959,6 +12969,16 @@ float { }, +/** + * @method getRenderingFontSize + * @return {float} + */ +getRenderingFontSize : function ( +) +{ + return 0; +}, + /** * @method getLineHeight * @return {float} diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 6cd73ce8470d..957ad77f5ba6 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -35040,6 +35040,24 @@ bool js_cocos2dx_Label_disableEffect(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_disableEffect : wrong number of arguments"); return false; } +bool js_cocos2dx_Label_getLabelType(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::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getLabelType : Invalid Native Object"); + if (argc == 0) { + int ret = (int)cobj->getLabelType(); + JS::RootedValue jsret(cx); + jsret = int32_to_jsval(cx, ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_getLabelType : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Label_getTextColor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -35945,6 +35963,24 @@ bool js_cocos2dx_Label_setLineSpacing(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_setLineSpacing : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } +bool js_cocos2dx_Label_getRenderingFontSize(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::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getRenderingFontSize : Invalid Native Object"); + if (argc == 0) { + double ret = cobj->getRenderingFontSize(); + JS::RootedValue jsret(cx); + jsret = DOUBLE_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_getRenderingFontSize : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Label_getLineHeight(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -36702,6 +36738,7 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) { JS_FN("getString", js_cocos2dx_Label_getString, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getHeight", js_cocos2dx_Label_getHeight, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("disableEffect", js_cocos2dx_Label_disableEffect, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getLabelType", js_cocos2dx_Label_getLabelType, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getTextColor", js_cocos2dx_Label_getTextColor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getBlendFunc", js_cocos2dx_Label_getBlendFunc, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("enableWrap", js_cocos2dx_Label_enableWrap, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -36737,6 +36774,7 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) { JS_FN("getSystemFontName", js_cocos2dx_Label_getSystemFontName, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setVerticalAlignment", js_cocos2dx_Label_setVerticalAlignment, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLineSpacing", js_cocos2dx_Label_setLineSpacing, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getRenderingFontSize", js_cocos2dx_Label_getRenderingFontSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getLineHeight", js_cocos2dx_Label_getLineHeight, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getShadowColor", js_cocos2dx_Label_getShadowColor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getTTFConfig", js_cocos2dx_Label_getTTFConfig, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 102c4da644e2..a2eb31b3753e 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -2292,6 +2292,7 @@ bool js_cocos2dx_Label_getWidth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getString(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getHeight(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_disableEffect(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_getLabelType(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getTextColor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getBlendFunc(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_enableWrap(JSContext *cx, uint32_t argc, jsval *vp); @@ -2327,6 +2328,7 @@ bool js_cocos2dx_Label_setMaxLineWidth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getSystemFontName(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setLineSpacing(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_getRenderingFontSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getLineHeight(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getShadowColor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getTTFConfig(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index 27c6561cbef4..376b5b84d464 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -59,6 +59,15 @@ -- @param #cc._ttfConfig ttfConfig -- @return bool#bool ret (return value: bool) +-------------------------------- +-- Returns type of label
+-- warning Not support system font.
+-- return the type of label
+-- since v3.18.0 +-- @function [parent=#Label] getLabelType +-- @param self +-- @return int#int ret (return value: int) + -------------------------------- -- Returns the text color of the Label. -- @function [parent=#Label] getTextColor @@ -325,6 +334,12 @@ -- @param #float height -- @return Label#Label self (return value: cc.Label) +-------------------------------- +-- Returns font size +-- @function [parent=#Label] getRenderingFontSize +-- @param self +-- @return float#float ret (return value: float) + -------------------------------- -- Returns the line height of this Label.
-- warning Not support system font.
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 60d24eccca8d..d3520ecdf7e4 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -54802,6 +54802,53 @@ int lua_cocos2dx_Label_setTTFConfig(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Label_getLabelType(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Label* 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.Label",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Label*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_getLabelType'", 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_Label_getLabelType'", nullptr); + return 0; + } + int ret = (int)cobj->getLabelType(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLabelType",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getLabelType'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Label_getTextColor(lua_State* tolua_S) { int argc = 0; @@ -56785,6 +56832,53 @@ int lua_cocos2dx_Label_setLineSpacing(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Label_getRenderingFontSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Label* 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.Label",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Label*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_getRenderingFontSize'", 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_Label_getRenderingFontSize'", nullptr); + return 0; + } + double ret = cobj->getRenderingFontSize(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getRenderingFontSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getRenderingFontSize'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Label_getLineHeight(lua_State* tolua_S) { int argc = 0; @@ -58233,6 +58327,7 @@ int lua_register_cocos2dx_Label(lua_State* tolua_S) tolua_function(tolua_S,"getHeight",lua_cocos2dx_Label_getHeight); tolua_function(tolua_S,"disableEffect",lua_cocos2dx_Label_disableEffect); tolua_function(tolua_S,"setTTFConfig",lua_cocos2dx_Label_setTTFConfig); + tolua_function(tolua_S,"getLabelType",lua_cocos2dx_Label_getLabelType); tolua_function(tolua_S,"getTextColor",lua_cocos2dx_Label_getTextColor); tolua_function(tolua_S,"getBlendFunc",lua_cocos2dx_Label_getBlendFunc); tolua_function(tolua_S,"enableWrap",lua_cocos2dx_Label_enableWrap); @@ -58269,6 +58364,7 @@ int lua_register_cocos2dx_Label(lua_State* tolua_S) tolua_function(tolua_S,"getSystemFontName",lua_cocos2dx_Label_getSystemFontName); tolua_function(tolua_S,"setVerticalAlignment",lua_cocos2dx_Label_setVerticalAlignment); tolua_function(tolua_S,"setLineSpacing",lua_cocos2dx_Label_setLineSpacing); + tolua_function(tolua_S,"getRenderingFontSize",lua_cocos2dx_Label_getRenderingFontSize); tolua_function(tolua_S,"getLineHeight",lua_cocos2dx_Label_getLineHeight); tolua_function(tolua_S,"getShadowColor",lua_cocos2dx_Label_getShadowColor); tolua_function(tolua_S,"getTTFConfig",lua_cocos2dx_Label_getTTFConfig); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index e377d2ed2c14..e0fe55df478b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2291,6 +2291,8 @@ int register_all_cocos2dx(lua_State* tolua_S); + +