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 68c88635b0..146bd347f7 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 @@ -150,6 +150,8 @@ getName : function ( * @param {size_object} size * @param {cc.TextHAlignment} texthalignment * @param {cc.TextVAlignment} textvalignment +* @param {bool} bool +* @param {int} int * @return {bool|bool} */ initWithString : function( @@ -158,7 +160,9 @@ str, float, size, texthalignment, -textvalignment +textvalignment, +bool, +int ) { return false; diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 8ea8b5dcdb..def1b3a348 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -448,6 +448,69 @@ bool js_cocos2dx_Texture2D_initWithString(JSContext *cx, uint32_t argc, jsval *v } } while(0); + do { + if (argc == 7) { + const char* arg0 = nullptr; + std::string arg0_tmp; ok &= jsval_to_std_string(cx, args.get(0), &arg0_tmp); arg0 = arg0_tmp.c_str(); + if (!ok) { ok = true; break; } + std::string arg1; + ok &= jsval_to_std_string(cx, args.get(1), &arg1); + if (!ok) { ok = true; break; } + double arg2 = 0; + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); + if (!ok) { ok = true; break; } + cocos2d::Size arg3; + ok &= jsval_to_ccsize(cx, args.get(3), &arg3); + if (!ok) { ok = true; break; } + cocos2d::TextHAlignment arg4; + ok &= jsval_to_int32(cx, args.get(4), (int32_t *)&arg4); + if (!ok) { ok = true; break; } + cocos2d::TextVAlignment arg5; + ok &= jsval_to_int32(cx, args.get(5), (int32_t *)&arg5); + if (!ok) { ok = true; break; } + bool arg6; + arg6 = JS::ToBoolean(args.get(6)); + bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5, arg6); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + } while(0); + + do { + if (argc == 8) { + const char* arg0 = nullptr; + std::string arg0_tmp; ok &= jsval_to_std_string(cx, args.get(0), &arg0_tmp); arg0 = arg0_tmp.c_str(); + if (!ok) { ok = true; break; } + std::string arg1; + ok &= jsval_to_std_string(cx, args.get(1), &arg1); + if (!ok) { ok = true; break; } + double arg2 = 0; + ok &= JS::ToNumber( cx, args.get(2), &arg2) && !std::isnan(arg2); + if (!ok) { ok = true; break; } + cocos2d::Size arg3; + ok &= jsval_to_ccsize(cx, args.get(3), &arg3); + if (!ok) { ok = true; break; } + cocos2d::TextHAlignment arg4; + ok &= jsval_to_int32(cx, args.get(4), (int32_t *)&arg4); + if (!ok) { ok = true; break; } + cocos2d::TextVAlignment arg5; + ok &= jsval_to_int32(cx, args.get(5), (int32_t *)&arg5); + if (!ok) { ok = true; break; } + bool arg6; + arg6 = JS::ToBoolean(args.get(6)); + int arg7 = 0; + ok &= jsval_to_int32(cx, args.get(7), (int32_t *)&arg7); + if (!ok) { ok = true; break; } + bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + } while(0); + JS_ReportError(cx, "js_cocos2dx_Texture2D_initWithString : wrong number of arguments"); return false; } diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index b4b552afb4..3a298db273 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -68,7 +68,7 @@ -------------------------------- -- @overload self, char, cc.FontDefinition --- @overload self, char, string, float, size_table, int, int +-- @overload self, char, string, float, size_table, int, int, bool, int -- @function [parent=#Texture2D] initWithString -- @param self -- @param #char text @@ -77,6 +77,8 @@ -- @param #size_table dimensions -- @param #int hAlignment -- @param #int vAlignment +-- @param #bool enableWrap +-- @param #int overflow -- @return bool#bool ret (return value: bool) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 813e8fb2dc..b6868db2a7 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -1319,6 +1319,82 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) } }while(0); ok = true; + do{ + if (argc == 7) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + double arg2; + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::Size arg3; + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::TextHAlignment arg4; + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::TextVAlignment arg5; + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + bool arg6; + ok &= luaval_to_boolean(tolua_S, 8,&arg6, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5, arg6); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 8) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + double arg2; + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::Size arg3; + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::TextHAlignment arg4; + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + cocos2d::TextVAlignment arg5; + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + bool arg6; + ok &= luaval_to_boolean(tolua_S, 8,&arg6, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + int arg7; + ok &= luaval_to_int32(tolua_S, 9,(int *)&arg7, "cc.Texture2D:initWithString"); + + if (!ok) { break; } + bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:initWithString",argc, 3); return 0;