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 af83603bf7..0ec34df40b 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 @@ -6155,6 +6155,16 @@ supportsPVRTC : function ( return false; }, +/** + * @method supportsOESDepth24 + * @return {bool} + */ +supportsOESDepth24 : function ( +) +{ + return false; +}, + /** * @method getMaxModelviewStackDepth * @return {int} @@ -6319,6 +6329,16 @@ supportsDiscardFramebuffer : function ( return false; }, +/** + * @method supportsOESPackedDepthStencil + * @return {bool} + */ +supportsOESPackedDepthStencil : function ( +) +{ + return false; +}, + /** * @method supportsS3TC * @return {bool} @@ -12151,6 +12171,16 @@ getShadowOffset : function ( return cc.Size; }, +/** + * @method getLineSpacing + * @return {float} + */ +getLineSpacing : function ( +) +{ + return 0; +}, + /** * @method setClipMarginEnabled * @param {bool} arg0 @@ -12181,6 +12211,16 @@ str { }, +/** + * @method isWrapEnabled + * @return {bool} + */ +isWrapEnabled : function ( +) +{ + return false; +}, + /** * @method getOutlineSize * @return {int} @@ -12260,13 +12300,11 @@ overflow }, /** - * @method getLineSpacing - * @return {float} + * @method enableStrikethrough */ -getLineSpacing : function ( +enableStrikethrough : function ( ) { - return 0; }, /** @@ -12448,13 +12486,11 @@ getTTFConfig : function ( }, /** - * @method getVerticalAlignment - * @return {cc.TextVAlignment} + * @method enableItalics */ -getVerticalAlignment : function ( +enableItalics : function ( ) { - return 0; }, /** @@ -12519,6 +12555,16 @@ getOverflow : function ( return 0; }, +/** + * @method getVerticalAlignment + * @return {cc.TextVAlignment} + */ +getVerticalAlignment : function ( +) +{ + return 0; +}, + /** * @method setAdditionalKerning * @param {float} arg0 @@ -12580,13 +12626,19 @@ texthalignment }, /** - * @method isWrapEnabled - * @return {bool} + * @method enableBold */ -isWrapEnabled : function ( +enableBold : function ( +) +{ +}, + +/** + * @method enableUnderline + */ +enableUnderline : function ( ) { - return false; }, /** @@ -15363,6 +15415,14 @@ vec2 { }, +/** + * @method stop + */ +stop : function ( +) +{ +}, + /** * @method updateParticleQuads */ @@ -15421,6 +15481,14 @@ bool { }, +/** + * @method start + */ +start : function ( +) +{ +}, + /** * @method setEndSizeVar * @param {float} arg0 diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js index b36cd47631..ffc2963314 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js @@ -2617,6 +2617,14 @@ end : function ( { }, +/** + * @method start + */ +start : function ( +) +{ +}, + /** * @method stopBackgroundMusic * @param {bool} bool @@ -2693,6 +2701,14 @@ bool { }, +/** + * @method stop + */ +stop : function ( +) +{ +}, + /** * @method playEffect * @param {char|char} char @@ -4241,6 +4257,14 @@ pause : function ( { }, +/** + * @method start + */ +start : function ( +) +{ +}, + /** * @method init * @return {bool} diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js index 2f3f7959a0..6292645afc 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js @@ -5314,6 +5314,8 @@ ccui.RichElementText = { * @param {String} arg3 * @param {String} arg4 * @param {float} arg5 + * @param {unsigned int} arg6 + * @param {String} arg7 * @return {bool} */ init : function ( @@ -5322,7 +5324,9 @@ color3b, char, str, str, -float +float, +int, +str ) { return false; @@ -5336,6 +5340,8 @@ float * @param {String} arg3 * @param {String} arg4 * @param {float} arg5 + * @param {unsigned int} arg6 + * @param {String} arg7 * @return {ccui.RichElementText} */ create : function ( @@ -5344,7 +5350,9 @@ color3b, char, str, str, -float +float, +int, +str ) { return ccui.RichElementText; @@ -5366,6 +5374,16 @@ RichElementText : function ( */ ccui.RichElementImage = { +/** + * @method setHeight + * @param {int} arg0 + */ +setHeight : function ( +int +) +{ +}, + /** * @method init * @param {int} arg0 @@ -5384,6 +5402,16 @@ str return false; }, +/** + * @method setWidth + * @param {int} arg0 + */ +setWidth : function ( +int +) +{ +}, + /** * @method create * @param {int} arg0 @@ -5510,6 +5538,18 @@ formatText : function ( { }, +/** + * @method initWithXML + * @param {String} arg0 + * @return {bool} + */ +initWithXML : function ( +str +) +{ + return false; +}, + /** * @method removeElement * @param {ccui.RichElement|int} richelement @@ -5530,6 +5570,18 @@ create : function ( return ccui.RichText; }, +/** + * @method createWithXML + * @param {String} arg0 + * @return {ccui.RichText} + */ +createWithXML : function ( +str +) +{ + return ccui.RichText; +}, + /** * @method RichText * @constructor diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index ce31d32d27..05d2858ceb 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -16452,6 +16452,24 @@ bool js_cocos2dx_Configuration_supportsPVRTC(JSContext *cx, uint32_t argc, jsval JS_ReportError(cx, "js_cocos2dx_Configuration_supportsPVRTC : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_Configuration_supportsOESDepth24(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::Configuration* cobj = (cocos2d::Configuration *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Configuration_supportsOESDepth24 : Invalid Native Object"); + if (argc == 0) { + bool ret = cobj->supportsOESDepth24(); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Configuration_supportsOESDepth24 : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Configuration_getMaxModelviewStackDepth(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -16750,6 +16768,24 @@ bool js_cocos2dx_Configuration_supportsDiscardFramebuffer(JSContext *cx, uint32_ JS_ReportError(cx, "js_cocos2dx_Configuration_supportsDiscardFramebuffer : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_Configuration_supportsOESPackedDepthStencil(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::Configuration* cobj = (cocos2d::Configuration *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Configuration_supportsOESPackedDepthStencil : Invalid Native Object"); + if (argc == 0) { + bool ret = cobj->supportsOESPackedDepthStencil(); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Configuration_supportsOESPackedDepthStencil : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Configuration_supportsS3TC(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -16902,6 +16938,7 @@ void js_register_cocos2dx_Configuration(JSContext *cx, JS::HandleObject global) static JSFunctionSpec funcs[] = { JS_FN("supportsPVRTC", js_cocos2dx_Configuration_supportsPVRTC, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("supportsOESDepth24", js_cocos2dx_Configuration_supportsOESDepth24, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getMaxModelviewStackDepth", js_cocos2dx_Configuration_getMaxModelviewStackDepth, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("supportsShareableVAO", js_cocos2dx_Configuration_supportsShareableVAO, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("supportsBGRA8888", js_cocos2dx_Configuration_supportsBGRA8888, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -16918,6 +16955,7 @@ void js_register_cocos2dx_Configuration(JSContext *cx, JS::HandleObject global) JS_FN("getMaxSupportDirLightInShader", js_cocos2dx_Configuration_getMaxSupportDirLightInShader, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("loadConfigFile", js_cocos2dx_Configuration_loadConfigFile, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("supportsDiscardFramebuffer", js_cocos2dx_Configuration_supportsDiscardFramebuffer, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("supportsOESPackedDepthStencil", js_cocos2dx_Configuration_supportsOESPackedDepthStencil, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("supportsS3TC", js_cocos2dx_Configuration_supportsS3TC, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("dumpInfo", js_cocos2dx_Configuration_getInfo, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getMaxTextureUnits", js_cocos2dx_Configuration_getMaxTextureUnits, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -33144,6 +33182,24 @@ bool js_cocos2dx_Label_getShadowOffset(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_getShadowOffset : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_Label_getLineSpacing(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_getLineSpacing : Invalid Native Object"); + if (argc == 0) { + double ret = cobj->getLineSpacing(); + jsval jsret = JSVAL_NULL; + jsret = DOUBLE_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_getLineSpacing : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Label_setClipMarginEnabled(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -33204,6 +33260,24 @@ bool js_cocos2dx_Label_setSystemFontName(JSContext *cx, uint32_t argc, jsval *vp JS_ReportError(cx, "js_cocos2dx_Label_setSystemFontName : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } +bool js_cocos2dx_Label_isWrapEnabled(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_isWrapEnabled : Invalid Native Object"); + if (argc == 0) { + bool ret = cobj->isWrapEnabled(); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_isWrapEnabled : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Label_getOutlineSize(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -33498,22 +33572,20 @@ bool js_cocos2dx_Label_setOverflow(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_setOverflow : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } -bool js_cocos2dx_Label_getLineSpacing(JSContext *cx, uint32_t argc, jsval *vp) +bool js_cocos2dx_Label_enableStrikethrough(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_getLineSpacing : Invalid Native Object"); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_enableStrikethrough : Invalid Native Object"); if (argc == 0) { - double ret = cobj->getLineSpacing(); - jsval jsret = JSVAL_NULL; - jsret = DOUBLE_TO_JSVAL(ret); - args.rval().set(jsret); + cobj->enableStrikethrough(); + args.rval().setUndefined(); return true; } - JS_ReportError(cx, "js_cocos2dx_Label_getLineSpacing : wrong number of arguments: %d, was expecting %d", argc, 0); + JS_ReportError(cx, "js_cocos2dx_Label_enableStrikethrough : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } bool js_cocos2dx_Label_updateContent(JSContext *cx, uint32_t argc, jsval *vp) @@ -33903,22 +33975,20 @@ bool js_cocos2dx_Label_getTTFConfig(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_getTTFConfig : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } -bool js_cocos2dx_Label_getVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp) +bool js_cocos2dx_Label_enableItalics(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_getVerticalAlignment : Invalid Native Object"); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_enableItalics : Invalid Native Object"); if (argc == 0) { - int ret = (int)cobj->getVerticalAlignment(); - jsval jsret = JSVAL_NULL; - jsret = int32_to_jsval(cx, ret); - args.rval().set(jsret); + cobj->enableItalics(); + args.rval().setUndefined(); return true; } - JS_ReportError(cx, "js_cocos2dx_Label_getVerticalAlignment : wrong number of arguments: %d, was expecting %d", argc, 0); + JS_ReportError(cx, "js_cocos2dx_Label_enableItalics : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } bool js_cocos2dx_Label_setTextColor(JSContext *cx, uint32_t argc, jsval *vp) @@ -34043,6 +34113,24 @@ bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Label_getOverflow : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_Label_getVerticalAlignment(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_getVerticalAlignment : Invalid Native Object"); + if (argc == 0) { + int ret = (int)cobj->getVerticalAlignment(); + jsval jsret = JSVAL_NULL; + jsret = int32_to_jsval(cx, ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_getVerticalAlignment : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_Label_setAdditionalKerning(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -34157,22 +34245,36 @@ bool js_cocos2dx_Label_setHorizontalAlignment(JSContext *cx, uint32_t argc, jsva JS_ReportError(cx, "js_cocos2dx_Label_setHorizontalAlignment : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } -bool js_cocos2dx_Label_isWrapEnabled(JSContext *cx, uint32_t argc, jsval *vp) +bool js_cocos2dx_Label_enableBold(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_isWrapEnabled : Invalid Native Object"); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_enableBold : Invalid Native Object"); if (argc == 0) { - bool ret = cobj->isWrapEnabled(); - jsval jsret = JSVAL_NULL; - jsret = BOOLEAN_TO_JSVAL(ret); - args.rval().set(jsret); + cobj->enableBold(); + args.rval().setUndefined(); return true; } - JS_ReportError(cx, "js_cocos2dx_Label_isWrapEnabled : wrong number of arguments: %d, was expecting %d", argc, 0); + JS_ReportError(cx, "js_cocos2dx_Label_enableBold : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} +bool js_cocos2dx_Label_enableUnderline(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_enableUnderline : Invalid Native Object"); + if (argc == 0) { + cobj->enableUnderline(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Label_enableUnderline : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } bool js_cocos2dx_Label_getLabelEffectType(JSContext *cx, uint32_t argc, jsval *vp) @@ -34587,16 +34689,18 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) { JS_FN("getMaxLineWidth", js_cocos2dx_Label_getMaxLineWidth, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getHorizontalAlignment", js_cocos2dx_Label_getHorizontalAlignment, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getShadowOffset", js_cocos2dx_Label_getShadowOffset, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getLineSpacing", js_cocos2dx_Label_getLineSpacing, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setClipMarginEnabled", js_cocos2dx_Label_setClipMarginEnabled, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setString", js_cocos2dx_Label_setString, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setSystemFontName", js_cocos2dx_Label_setSystemFontName, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("isWrapEnabled", js_cocos2dx_Label_isWrapEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getOutlineSize", js_cocos2dx_Label_getOutlineSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setBMFontFilePath", js_cocos2dx_Label_setBMFontFilePath, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("initWithTTF", js_cocos2dx_Label_initWithTTF, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLineHeight", js_cocos2dx_Label_setLineHeight, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setSystemFontSize", js_cocos2dx_Label_setSystemFontSize, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setOverflow", js_cocos2dx_Label_setOverflow, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("getLineSpacing", js_cocos2dx_Label_getLineSpacing, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("enableStrikethrough", js_cocos2dx_Label_enableStrikethrough, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("updateContent", js_cocos2dx_Label_updateContent, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getStringLength", js_cocos2dx_Label_getStringLength, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLineBreakWithoutSpace", js_cocos2dx_Label_setLineBreakWithoutSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -34614,20 +34718,22 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) { 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), - JS_FN("getVerticalAlignment", js_cocos2dx_Label_getVerticalAlignment, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("enableItalics", js_cocos2dx_Label_enableItalics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setTextColor", js_cocos2dx_Label_setTextColor, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getLetter", js_cocos2dx_Label_getLetter, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setHeight", js_cocos2dx_Label_setHeight, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("isShadowEnabled", js_cocos2dx_Label_isShadowEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("enableGlow", js_cocos2dx_Label_enableGlow, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getOverflow", js_cocos2dx_Label_getOverflow, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getVerticalAlignment", js_cocos2dx_Label_getVerticalAlignment, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setAdditionalKerning", js_cocos2dx_Label_setAdditionalKerning, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getSystemFontSize", js_cocos2dx_Label_getSystemFontSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setBlendFunc", js_cocos2dx_Label_setBlendFunc, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getTextAlignment", js_cocos2dx_Label_getTextAlignment, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getBMFontFilePath", js_cocos2dx_Label_getBMFontFilePath, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setHorizontalAlignment", js_cocos2dx_Label_setHorizontalAlignment, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("isWrapEnabled", js_cocos2dx_Label_isWrapEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("enableBold", js_cocos2dx_Label_enableBold, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("enableUnderline", js_cocos2dx_Label_enableUnderline, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getLabelEffectType", js_cocos2dx_Label_getLabelEffectType, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setAlignment", js_cocos2dx_Label_setAlignment, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("requestSystemFontRefresh", js_cocos2dx_Label_requestSystemFontRefresh, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -41747,6 +41853,22 @@ bool js_cocos2dx_ParticleSystem_setSourcePosition(JSContext *cx, uint32_t argc, JS_ReportError(cx, "js_cocos2dx_ParticleSystem_setSourcePosition : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } +bool js_cocos2dx_ParticleSystem_stop(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::ParticleSystem* cobj = (cocos2d::ParticleSystem *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ParticleSystem_stop : Invalid Native Object"); + if (argc == 0) { + cobj->stop(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ParticleSystem_stop : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_ParticleSystem_updateParticleQuads(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -41861,6 +41983,22 @@ bool js_cocos2dx_ParticleSystem_setRotationIsDir(JSContext *cx, uint32_t argc, j JS_ReportError(cx, "js_cocos2dx_ParticleSystem_setRotationIsDir : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } +bool js_cocos2dx_ParticleSystem_start(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::ParticleSystem* cobj = (cocos2d::ParticleSystem *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ParticleSystem_start : Invalid Native Object"); + if (argc == 0) { + cobj->start(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ParticleSystem_start : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_ParticleSystem_setEndSizeVar(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -42738,12 +42876,14 @@ void js_register_cocos2dx_ParticleSystem(JSContext *cx, JS::HandleObject global) JS_FN("setEmitterMode", js_cocos2dx_ParticleSystem_setEmitterMode, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getDuration", js_cocos2dx_ParticleSystem_getDuration, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setSourcePosition", js_cocos2dx_ParticleSystem_setSourcePosition, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("stop", js_cocos2dx_ParticleSystem_stop, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("updateParticleQuads", js_cocos2dx_ParticleSystem_updateParticleQuads, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getEndSpinVar", js_cocos2dx_ParticleSystem_getEndSpinVar, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setBlendAdditive", js_cocos2dx_ParticleSystem_setBlendAdditive, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLife", js_cocos2dx_ParticleSystem_setLife, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setAngleVar", js_cocos2dx_ParticleSystem_setAngleVar, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setRotationIsDir", js_cocos2dx_ParticleSystem_setRotationIsDir, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("start", js_cocos2dx_ParticleSystem_start, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setEndSizeVar", js_cocos2dx_ParticleSystem_setEndSizeVar, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setAngle", js_cocos2dx_ParticleSystem_setAngle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setBatchNode", js_cocos2dx_ParticleSystem_setBatchNode, 1, 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 cd4f07419a..9494ae9d67 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -950,6 +950,7 @@ void js_cocos2dx_Configuration_finalize(JSContext *cx, JSObject *obj); void js_register_cocos2dx_Configuration(JSContext *cx, JS::HandleObject global); void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj); bool js_cocos2dx_Configuration_supportsPVRTC(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Configuration_supportsOESDepth24(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_getMaxModelviewStackDepth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_supportsShareableVAO(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_supportsBGRA8888(JSContext *cx, uint32_t argc, jsval *vp); @@ -966,6 +967,7 @@ bool js_cocos2dx_Configuration_supportsETC(JSContext *cx, uint32_t argc, jsval * bool js_cocos2dx_Configuration_getMaxSupportDirLightInShader(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_loadConfigFile(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_supportsDiscardFramebuffer(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Configuration_supportsOESPackedDepthStencil(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_supportsS3TC(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_getInfo(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Configuration_getMaxTextureUnits(JSContext *cx, uint32_t argc, jsval *vp); @@ -2239,16 +2241,18 @@ bool js_cocos2dx_Label_getBMFontSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getMaxLineWidth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getHorizontalAlignment(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getShadowOffset(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_getLineSpacing(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setClipMarginEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setString(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setSystemFontName(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_isWrapEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getOutlineSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setBMFontFilePath(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_initWithTTF(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setLineHeight(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setSystemFontSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setOverflow(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Label_getLineSpacing(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_enableStrikethrough(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_updateContent(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getStringLength(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setLineBreakWithoutSpace(JSContext *cx, uint32_t argc, jsval *vp); @@ -2266,20 +2270,22 @@ bool js_cocos2dx_Label_setLineSpacing(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); -bool js_cocos2dx_Label_getVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_enableItalics(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setTextColor(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setHeight(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_isShadowEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_enableGlow(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_getVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setAdditionalKerning(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getSystemFontSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setBlendFunc(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getTextAlignment(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getBMFontFilePath(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setHorizontalAlignment(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Label_isWrapEnabled(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_enableBold(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Label_enableUnderline(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_getLabelEffectType(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_setAlignment(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Label_requestSystemFontRefresh(JSContext *cx, uint32_t argc, jsval *vp); @@ -2692,12 +2698,14 @@ bool js_cocos2dx_ParticleSystem_getRotatePerSecond(JSContext *cx, uint32_t argc, bool js_cocos2dx_ParticleSystem_setEmitterMode(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_getDuration(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setSourcePosition(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ParticleSystem_stop(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_updateParticleQuads(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_getEndSpinVar(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setBlendAdditive(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setLife(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setAngleVar(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setRotationIsDir(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ParticleSystem_start(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setEndSizeVar(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setAngle(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ParticleSystem_setBatchNode(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp index f26ef41787..ffc9df5ec9 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp @@ -6663,6 +6663,22 @@ bool js_cocos2dx_studio_ComAudio_end(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_studio_ComAudio_end : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_studio_ComAudio_start(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); + cocostudio::ComAudio* cobj = (cocostudio::ComAudio *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_studio_ComAudio_start : Invalid Native Object"); + if (argc == 0) { + cobj->start(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_studio_ComAudio_start : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_studio_ComAudio_stopBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp) { bool ok = true; @@ -6845,6 +6861,22 @@ bool js_cocos2dx_studio_ComAudio_playBackgroundMusic(JSContext *cx, uint32_t arg JS_ReportError(cx, "js_cocos2dx_studio_ComAudio_playBackgroundMusic : wrong number of arguments"); return false; } +bool js_cocos2dx_studio_ComAudio_stop(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); + cocostudio::ComAudio* cobj = (cocostudio::ComAudio *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_studio_ComAudio_stop : Invalid Native Object"); + if (argc == 0) { + cobj->stop(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_studio_ComAudio_stop : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_studio_ComAudio_playEffect(JSContext *cx, uint32_t argc, jsval *vp) { bool ok = true; @@ -7147,6 +7179,7 @@ void js_register_cocos2dx_studio_ComAudio(JSContext *cx, JS::HandleObject global JS_FN("willPlayBackgroundMusic", js_cocos2dx_studio_ComAudio_willPlayBackgroundMusic, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setBackgroundMusicVolume", js_cocos2dx_studio_ComAudio_setBackgroundMusicVolume, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("end", js_cocos2dx_studio_ComAudio_end, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("start", js_cocos2dx_studio_ComAudio_start, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("stopBackgroundMusic", js_cocos2dx_studio_ComAudio_stopBackgroundMusic, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("pauseBackgroundMusic", js_cocos2dx_studio_ComAudio_pauseBackgroundMusic, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("isBackgroundMusicPlaying", js_cocos2dx_studio_ComAudio_isBackgroundMusicPlaying, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -7155,6 +7188,7 @@ void js_register_cocos2dx_studio_ComAudio(JSContext *cx, JS::HandleObject global JS_FN("pauseAllEffects", js_cocos2dx_studio_ComAudio_pauseAllEffects, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("preloadBackgroundMusic", js_cocos2dx_studio_ComAudio_preloadBackgroundMusic, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("playBackgroundMusic", js_cocos2dx_studio_ComAudio_playBackgroundMusic, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("stop", js_cocos2dx_studio_ComAudio_stop, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("playEffect", js_cocos2dx_studio_ComAudio_playEffect, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("preloadEffect", js_cocos2dx_studio_ComAudio_preloadEffect, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLoop", js_cocos2dx_studio_ComAudio_setLoop, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -10794,6 +10828,22 @@ bool js_cocos2dx_studio_ActionTimeline_pause(JSContext *cx, uint32_t argc, jsval JS_ReportError(cx, "js_cocos2dx_studio_ActionTimeline_pause : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_studio_ActionTimeline_start(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); + cocostudio::timeline::ActionTimeline* cobj = (cocostudio::timeline::ActionTimeline *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_studio_ActionTimeline_start : Invalid Native Object"); + if (argc == 0) { + cobj->start(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_studio_ActionTimeline_start : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_studio_ActionTimeline_init(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -11423,6 +11473,7 @@ void js_register_cocos2dx_studio_ActionTimeline(JSContext *cx, JS::HandleObject JS_FN("getCurrentFrame", js_cocos2dx_studio_ActionTimeline_getCurrentFrame, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getStartFrame", js_cocos2dx_studio_ActionTimeline_getStartFrame, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("pause", js_cocos2dx_studio_ActionTimeline_pause, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("start", js_cocos2dx_studio_ActionTimeline_start, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("init", js_cocos2dx_studio_ActionTimeline_init, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("removeTimeline", js_cocos2dx_studio_ActionTimeline_removeTimeline, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setLastFrameCallFunc", js_cocos2dx_studio_ActionTimeline_setLastFrameCallFunc, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp index 51c7d8ba4b..e00a627858 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp @@ -413,6 +413,7 @@ bool js_cocos2dx_studio_ComAudio_getBackgroundMusicVolume(JSContext *cx, uint32_ bool js_cocos2dx_studio_ComAudio_willPlayBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_setBackgroundMusicVolume(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_end(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_studio_ComAudio_start(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_stopBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_pauseBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_isBackgroundMusicPlaying(JSContext *cx, uint32_t argc, jsval *vp); @@ -421,6 +422,7 @@ bool js_cocos2dx_studio_ComAudio_resumeAllEffects(JSContext *cx, uint32_t argc, bool js_cocos2dx_studio_ComAudio_pauseAllEffects(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_preloadBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_playBackgroundMusic(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_studio_ComAudio_stop(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_playEffect(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_preloadEffect(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ComAudio_setLoop(JSContext *cx, uint32_t argc, jsval *vp); @@ -730,6 +732,7 @@ bool js_cocos2dx_studio_ActionTimeline_addTimeline(JSContext *cx, uint32_t argc, bool js_cocos2dx_studio_ActionTimeline_getCurrentFrame(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ActionTimeline_getStartFrame(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ActionTimeline_pause(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_studio_ActionTimeline_start(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ActionTimeline_init(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ActionTimeline_removeTimeline(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_studio_ActionTimeline_setLastFrameCallFunc(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp index f33a2599ba..489b159329 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp @@ -12908,28 +12908,32 @@ bool js_cocos2dx_ui_RichElementText_init(JSContext *cx, uint32_t argc, jsval *vp js_proxy_t *proxy = jsb_get_js_proxy(obj); cocos2d::ui::RichElementText* cobj = (cocos2d::ui::RichElementText *)(proxy ? proxy->ptr : NULL); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichElementText_init : Invalid Native Object"); - if (argc == 6) { + if (argc == 8) { int arg0 = 0; cocos2d::Color3B arg1; uint16_t arg2; std::string arg3; std::string arg4; double arg5 = 0; + unsigned int arg6 = 0; + std::string arg7; ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); ok &= jsval_to_cccolor3b(cx, args.get(1), &arg1); ok &= jsval_to_uint16(cx, args.get(2), &arg2); ok &= jsval_to_std_string(cx, args.get(3), &arg3); ok &= jsval_to_std_string(cx, args.get(4), &arg4); ok &= JS::ToNumber( cx, args.get(5), &arg5) && !isnan(arg5); + ok &= jsval_to_uint32(cx, args.get(6), &arg6); + ok &= jsval_to_std_string(cx, args.get(7), &arg7); JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichElementText_init : Error processing arguments"); - bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5); + bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); jsval jsret = JSVAL_NULL; jsret = BOOLEAN_TO_JSVAL(ret); args.rval().set(jsret); return true; } - JS_ReportError(cx, "js_cocos2dx_ui_RichElementText_init : wrong number of arguments: %d, was expecting %d", argc, 6); + JS_ReportError(cx, "js_cocos2dx_ui_RichElementText_init : wrong number of arguments: %d, was expecting %d", argc, 8); return false; } bool js_cocos2dx_ui_RichElementText_create(JSContext *cx, uint32_t argc, jsval *vp) @@ -12957,6 +12961,54 @@ bool js_cocos2dx_ui_RichElementText_create(JSContext *cx, uint32_t argc, jsval * args.rval().set(OBJECT_TO_JSVAL(jsret)); return true; } + if (argc == 7) { + int arg0 = 0; + cocos2d::Color3B arg1; + uint16_t arg2; + std::string arg3; + std::string arg4; + double arg5 = 0; + unsigned int arg6 = 0; + ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); + ok &= jsval_to_cccolor3b(cx, args.get(1), &arg1); + ok &= jsval_to_uint16(cx, args.get(2), &arg2); + ok &= jsval_to_std_string(cx, args.get(3), &arg3); + ok &= jsval_to_std_string(cx, args.get(4), &arg4); + ok &= JS::ToNumber( cx, args.get(5), &arg5) && !isnan(arg5); + ok &= jsval_to_uint32(cx, args.get(6), &arg6); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichElementText_create : Error processing arguments"); + + auto ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6); + js_type_class_t *typeClass = js_get_type_from_native(ret); + JS::RootedObject jsret(cx, jsb_ref_autoreleased_create_jsobject(cx, ret, typeClass, "cocos2d::ui::RichElementText")); + args.rval().set(OBJECT_TO_JSVAL(jsret)); + return true; + } + if (argc == 8) { + int arg0 = 0; + cocos2d::Color3B arg1; + uint16_t arg2; + std::string arg3; + std::string arg4; + double arg5 = 0; + unsigned int arg6 = 0; + std::string arg7; + ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); + ok &= jsval_to_cccolor3b(cx, args.get(1), &arg1); + ok &= jsval_to_uint16(cx, args.get(2), &arg2); + ok &= jsval_to_std_string(cx, args.get(3), &arg3); + ok &= jsval_to_std_string(cx, args.get(4), &arg4); + ok &= JS::ToNumber( cx, args.get(5), &arg5) && !isnan(arg5); + ok &= jsval_to_uint32(cx, args.get(6), &arg6); + ok &= jsval_to_std_string(cx, args.get(7), &arg7); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichElementText_create : Error processing arguments"); + + auto ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + js_type_class_t *typeClass = js_get_type_from_native(ret); + JS::RootedObject jsret(cx, jsb_ref_autoreleased_create_jsobject(cx, ret, typeClass, "cocos2d::ui::RichElementText")); + args.rval().set(OBJECT_TO_JSVAL(jsret)); + return true; + } JS_ReportError(cx, "js_cocos2dx_ui_RichElementText_create : wrong number of arguments"); return false; } @@ -13013,7 +13065,7 @@ void js_register_cocos2dx_ui_RichElementText(JSContext *cx, JS::HandleObject glo }; static JSFunctionSpec funcs[] = { - JS_FN("init", js_cocos2dx_ui_RichElementText_init, 6, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("init", js_cocos2dx_ui_RichElementText_init, 8, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("ctor", js_cocos2dx_ui_RichElementText_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END }; @@ -13043,6 +13095,26 @@ void js_register_cocos2dx_ui_RichElementText(JSContext *cx, JS::HandleObject glo JSClass *jsb_cocos2d_ui_RichElementImage_class; JSObject *jsb_cocos2d_ui_RichElementImage_prototype; +bool js_cocos2dx_ui_RichElementImage_setHeight(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::ui::RichElementImage* cobj = (cocos2d::ui::RichElementImage *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichElementImage_setHeight : Invalid Native Object"); + if (argc == 1) { + int arg0 = 0; + ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichElementImage_setHeight : Error processing arguments"); + cobj->setHeight(arg0); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ui_RichElementImage_setHeight : wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} bool js_cocos2dx_ui_RichElementImage_init(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -13071,6 +13143,26 @@ bool js_cocos2dx_ui_RichElementImage_init(JSContext *cx, uint32_t argc, jsval *v JS_ReportError(cx, "js_cocos2dx_ui_RichElementImage_init : wrong number of arguments: %d, was expecting %d", argc, 4); return false; } +bool js_cocos2dx_ui_RichElementImage_setWidth(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::ui::RichElementImage* cobj = (cocos2d::ui::RichElementImage *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichElementImage_setWidth : Invalid Native Object"); + if (argc == 1) { + int arg0 = 0; + ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichElementImage_setWidth : Error processing arguments"); + cobj->setWidth(arg0); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ui_RichElementImage_setWidth : wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} bool js_cocos2dx_ui_RichElementImage_create(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -13148,7 +13240,9 @@ void js_register_cocos2dx_ui_RichElementImage(JSContext *cx, JS::HandleObject gl }; static JSFunctionSpec funcs[] = { + JS_FN("setHeight", js_cocos2dx_ui_RichElementImage_setHeight, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("init", js_cocos2dx_ui_RichElementImage_init, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("setWidth", js_cocos2dx_ui_RichElementImage_setWidth, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("ctor", js_cocos2dx_ui_RichElementImage_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END }; @@ -13423,6 +13517,28 @@ bool js_cocos2dx_ui_RichText_formatText(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_ui_RichText_formatText : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_ui_RichText_initWithXML(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::ui::RichText* cobj = (cocos2d::ui::RichText *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_RichText_initWithXML : Invalid Native Object"); + if (argc == 1) { + std::string arg0; + ok &= jsval_to_std_string(cx, args.get(0), &arg0); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichText_initWithXML : Error processing arguments"); + bool ret = cobj->initWithXML(arg0); + jsval jsret = JSVAL_NULL; + jsret = BOOLEAN_TO_JSVAL(ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ui_RichText_initWithXML : wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} bool js_cocos2dx_ui_RichText_removeElement(JSContext *cx, uint32_t argc, jsval *vp) { bool ok = true; @@ -13482,6 +13598,25 @@ bool js_cocos2dx_ui_RichText_create(JSContext *cx, uint32_t argc, jsval *vp) return false; } +bool js_cocos2dx_ui_RichText_createWithXML(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + bool ok = true; + if (argc == 1) { + std::string arg0; + ok &= jsval_to_std_string(cx, args.get(0), &arg0); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_RichText_createWithXML : Error processing arguments"); + + auto ret = cocos2d::ui::RichText::createWithXML(arg0); + js_type_class_t *typeClass = js_get_type_from_native(ret); + JS::RootedObject jsret(cx, jsb_ref_autoreleased_create_jsobject(cx, ret, typeClass, "cocos2d::ui::RichText")); + args.rval().set(OBJECT_TO_JSVAL(jsret)); + return true; + } + JS_ReportError(cx, "js_cocos2dx_ui_RichText_createWithXML : wrong number of arguments"); + return false; +} + bool js_cocos2dx_ui_RichText_constructor(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -13538,6 +13673,7 @@ void js_register_cocos2dx_ui_RichText(JSContext *cx, JS::HandleObject global) { JS_FN("pushBackElement", js_cocos2dx_ui_RichText_pushBackElement, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setVerticalSpace", js_cocos2dx_ui_RichText_setVerticalSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("formatText", js_cocos2dx_ui_RichText_formatText, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("initWithXML", js_cocos2dx_ui_RichText_initWithXML, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("removeElement", js_cocos2dx_ui_RichText_removeElement, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("ctor", js_cocos2dx_ui_RichText_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END @@ -13545,6 +13681,7 @@ void js_register_cocos2dx_ui_RichText(JSContext *cx, JS::HandleObject global) { static JSFunctionSpec st_funcs[] = { JS_FN("create", js_cocos2dx_ui_RichText_create, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("createWithXML", js_cocos2dx_ui_RichText_createWithXML, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FS_END }; diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp index 155f0722ad..a487c2fabc 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp @@ -698,7 +698,9 @@ bool js_cocos2dx_ui_RichElementImage_constructor(JSContext *cx, uint32_t argc, j void js_cocos2dx_ui_RichElementImage_finalize(JSContext *cx, JSObject *obj); void js_register_cocos2dx_ui_RichElementImage(JSContext *cx, JS::HandleObject global); void register_all_cocos2dx_ui(JSContext* cx, JS::HandleObject obj); +bool js_cocos2dx_ui_RichElementImage_setHeight(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichElementImage_init(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ui_RichElementImage_setWidth(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichElementImage_create(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichElementImage_RichElementImage(JSContext *cx, uint32_t argc, jsval *vp); @@ -724,8 +726,10 @@ bool js_cocos2dx_ui_RichText_insertElement(JSContext *cx, uint32_t argc, jsval * bool js_cocos2dx_ui_RichText_pushBackElement(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichText_setVerticalSpace(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichText_formatText(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ui_RichText_initWithXML(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichText_removeElement(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichText_create(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ui_RichText_createWithXML(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_RichText_RichText(JSContext *cx, uint32_t argc, jsval *vp); extern JSClass *jsb_cocos2d_ui_HBox_class; diff --git a/cocos/scripting/lua-bindings/auto/api/ActionFadeFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionFadeFrame.lua index 6443f9cbd0..8de5600738 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionFadeFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionFadeFrame.lua @@ -13,7 +13,7 @@ -------------------------------- -- Gets the ActionInterval of ActionFrame.
--- parame duration the duration time of ActionFrame
+-- param duration the duration time of ActionFrame
-- return ActionInterval -- @function [parent=#ActionFadeFrame] getAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua index a3842779a6..660ccc66f6 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua @@ -68,7 +68,7 @@ -------------------------------- -- Set the ActionInterval easing parameter.
--- parame parameter the parameter for frame ease +-- param parameter the parameter for frame ease -- @function [parent=#ActionFrame] setEasingParameter -- @param self -- @param #array_table parameter diff --git a/cocos/scripting/lua-bindings/auto/api/ActionMoveFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionMoveFrame.lua index 6de7472212..468e3a7d43 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionMoveFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionMoveFrame.lua @@ -14,7 +14,7 @@ -------------------------------- -- Gets the ActionInterval of ActionFrame.
--- parame duration the duration time of ActionFrame
+-- param duration the duration time of ActionFrame
-- return ActionInterval -- @function [parent=#ActionMoveFrame] getAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionScaleFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionScaleFrame.lua index b868328359..fadd7eb69a 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionScaleFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionScaleFrame.lua @@ -36,7 +36,7 @@ -------------------------------- -- Gets the ActionInterval of ActionFrame.
--- parame duration the duration time of ActionFrame
+-- param duration the duration time of ActionFrame
-- return ActionInterval -- @function [parent=#ActionScaleFrame] getAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua b/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua index 4cd3e893e8..fa6880919f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua @@ -1,7 +1,7 @@ -------------------------------- -- @module ActionTimeline --- @extend Action +-- @extend Action,PlayableProtocol -- @parent_module ccs -------------------------------- @@ -45,6 +45,12 @@ -- @param self -- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) +-------------------------------- +-- / @{/ @name implement Playable Protocol +-- @function [parent=#ActionTimeline] start +-- @param self +-- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) + -------------------------------- -- -- @function [parent=#ActionTimeline] init @@ -226,13 +232,6 @@ -- @param self -- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline) --------------------------------- --- --- @function [parent=#ActionTimeline] step --- @param self --- @param #float delta --- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) - -------------------------------- -- -- @function [parent=#ActionTimeline] startWithTarget @@ -240,6 +239,13 @@ -- @param #cc.Node target -- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) +-------------------------------- +-- Returns a reverse of ActionTimeline.
+-- Not implement yet. +-- @function [parent=#ActionTimeline] reverse +-- @param self +-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline) + -------------------------------- -- Returns a clone of ActionTimeline -- @function [parent=#ActionTimeline] clone @@ -247,11 +253,17 @@ -- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline) -------------------------------- --- Returns a reverse of ActionTimeline.
--- Not implement yet. --- @function [parent=#ActionTimeline] reverse +-- +-- @function [parent=#ActionTimeline] stop -- @param self --- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline) +-- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) + +-------------------------------- +-- +-- @function [parent=#ActionTimeline] step +-- @param self +-- @param #float delta +-- @return ActionTimeline#ActionTimeline self (return value: ccs.ActionTimeline) -------------------------------- -- diff --git a/cocos/scripting/lua-bindings/auto/api/ActionTintFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionTintFrame.lua index 3c73a5eaac..5d8c49968b 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionTintFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionTintFrame.lua @@ -13,7 +13,7 @@ -------------------------------- -- Gets the ActionInterval of ActionFrame.
--- parame duration the duration time of ActionFrame
+-- param duration the duration time of ActionFrame
-- return ActionInterval -- @function [parent=#ActionTintFrame] getAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Bone.lua b/cocos/scripting/lua-bindings/auto/api/Bone.lua index 49e23a6906..cabced8f63 100644 --- a/cocos/scripting/lua-bindings/auto/api/Bone.lua +++ b/cocos/scripting/lua-bindings/auto/api/Bone.lua @@ -111,7 +111,7 @@ -------------------------------- -- Set parent bone.
--- If parent is NUll, then also remove this bone from armature.
+-- If parent is null, then also remove this bone from armature.
-- It will not set the Armature, if you want to add the bone to a Armature, you should use Armature::addBone(Bone *bone, const char* parentName).
-- param parent the parent bone.
-- nullptr : remove this bone from armature diff --git a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua index 48cf8c7219..73c1f242b2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua @@ -1,7 +1,7 @@ -------------------------------- -- @module ComAudio --- @extend Component +-- @extend Component,PlayableProtocol -- @parent_module ccs -------------------------------- @@ -48,6 +48,12 @@ -- @param self -- @return ComAudio#ComAudio self (return value: ccs.ComAudio) +-------------------------------- +-- / @{/ @name implement Playable Protocol +-- @function [parent=#ComAudio] start +-- @param self +-- @return ComAudio#ComAudio self (return value: ccs.ComAudio) + -------------------------------- -- @overload self -- @overload self, bool @@ -103,6 +109,12 @@ -- @param #bool bLoop -- @return ComAudio#ComAudio self (return value: ccs.ComAudio) +-------------------------------- +-- +-- @function [parent=#ComAudio] stop +-- @param self +-- @return ComAudio#ComAudio self (return value: ccs.ComAudio) + -------------------------------- -- @overload self, char -- @overload self, char, bool diff --git a/cocos/scripting/lua-bindings/auto/api/Helper.lua b/cocos/scripting/lua-bindings/auto/api/Helper.lua index 47a984b2d9..7e783554ef 100644 --- a/cocos/scripting/lua-bindings/auto/api/Helper.lua +++ b/cocos/scripting/lua-bindings/auto/api/Helper.lua @@ -37,7 +37,7 @@ -------------------------------- -- Find a widget with a specific action tag from root widget
--- This search will be recursive throught all child widgets.
+-- This search will be recursive through all child widgets.
-- param root The be searched root widget.
-- param tag The widget action's tag.
-- return Widget instance pointer. @@ -49,7 +49,7 @@ -------------------------------- -- Find a widget with a specific name from root widget.
--- This search will be recursive throught all child widgets.
+-- This search will be recursive through all child widgets.
-- param root The be searched root widget.
-- param name The widget name.
-- return Widget instance pointer. @@ -61,8 +61,8 @@ -------------------------------- -- Find a widget with a specific tag from root widget.
--- This search will be recursive throught all child widgets.
--- param root The be seached root widget.
+-- This search will be recursive through all child widgets.
+-- param root The be searched root widget.
-- param tag The widget tag.
-- return Widget instance pointer. -- @function [parent=#Helper] seekWidgetByTag diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index ce836e927c..b0c6a13404 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -121,6 +121,12 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- +-- @function [parent=#Label] getLineSpacing +-- @param self +-- @return float#float ret (return value: float) + -------------------------------- -- Makes the Label to clip upper and lower margin for reduce height of Label. -- @function [parent=#Label] setClipMarginEnabled @@ -144,6 +150,13 @@ -- @param #string font -- @return Label#Label self (return value: cc.Label) +-------------------------------- +-- Query the wrap is enabled or not.
+-- Note: System font will always return true. +-- @function [parent=#Label] isWrapEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- Return the outline effect size value. -- @function [parent=#Label] getOutlineSize @@ -205,10 +218,12 @@ -- @return Label#Label self (return value: cc.Label) -------------------------------- --- --- @function [parent=#Label] getLineSpacing +-- Enables strikethrough.
+-- Underline and Strikethrough cannot be enabled at the same time.
+-- Strikethough is like an underline but at the middle of the glyph +-- @function [parent=#Label] enableStrikethrough -- @param self --- @return float#float ret (return value: float) +-- @return Label#Label self (return value: cc.Label) -------------------------------- -- Update content immediately. @@ -252,7 +267,7 @@ -- @return float#float ret (return value: float) -------------------------------- --- Return current effect color vlaue. +-- Return current effect color value. -- @function [parent=#Label] getEffectColor -- @param self -- @return color4f_table#color4f_table ret (return value: color4f_table) @@ -332,10 +347,10 @@ -- @return _ttfConfig#_ttfConfig ret (return value: cc._ttfConfig) -------------------------------- --- Returns the Label's text vertical alignment. --- @function [parent=#Label] getVerticalAlignment +-- Enable italics rendering +-- @function [parent=#Label] enableItalics -- @param self --- @return int#int ret (return value: int) +-- @return Label#Label self (return value: cc.Label) -------------------------------- -- Sets the text color of Label.
@@ -384,6 +399,12 @@ -- @param self -- @return int#int ret (return value: int) +-------------------------------- +-- Returns the Label's text vertical alignment. +-- @function [parent=#Label] getVerticalAlignment +-- @param self +-- @return int#int ret (return value: int) + -------------------------------- -- Sets the additional kerning of the Label.
-- warning Not support system font.
@@ -426,11 +447,16 @@ -- @return Label#Label self (return value: cc.Label) -------------------------------- --- Query the wrap is enabled or not.
--- Note: System font will always return true. --- @function [parent=#Label] isWrapEnabled +-- Enable bold rendering +-- @function [parent=#Label] enableBold -- @param self --- @return bool#bool ret (return value: bool) +-- @return Label#Label self (return value: cc.Label) + +-------------------------------- +-- Enable underline +-- @function [parent=#Label] enableUnderline +-- @param self +-- @return Label#Label self (return value: cc.Label) -------------------------------- -- Return current effect type. diff --git a/cocos/scripting/lua-bindings/auto/api/LayoutComponent.lua b/cocos/scripting/lua-bindings/auto/api/LayoutComponent.lua index 0502099586..51e08fff3d 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayoutComponent.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayoutComponent.lua @@ -111,7 +111,7 @@ -------------------------------- -- Query the percent content size value.
--- return Percet (x,y) in Vec2. +-- return Percent (x,y) in Vec2. -- @function [parent=#LayoutComponent] getPercentContentSize -- @param self -- @return vec2_table#vec2_table ret (return value: vec2_table) diff --git a/cocos/scripting/lua-bindings/auto/api/ListView.lua b/cocos/scripting/lua-bindings/auto/api/ListView.lua index 46a57edddc..e0e16fd013 100644 --- a/cocos/scripting/lua-bindings/auto/api/ListView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ListView.lua @@ -20,14 +20,14 @@ -------------------------------- -- brief Query the center item
--- return A item instance. +-- return An item instance. -- @function [parent=#ListView] getCenterItemInCurrentView -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) -------------------------------- --- brief Query current selected widget's idnex.
--- return A index of a selected item. +-- brief Query current selected widget's index.
+-- return An index of a selected item. -- @function [parent=#ListView] getCurSelectedIndex -- @param self -- @return long#long ret (return value: long) @@ -70,7 +70,7 @@ -------------------------------- -- Insert a custom item into the end of ListView.
--- param item A item in `Widget*`. +-- param item An item in `Widget*`. -- @function [parent=#ListView] pushBackCustomItem -- @param self -- @param #ccui.Widget item @@ -78,7 +78,7 @@ -------------------------------- -- Insert a default item(create by cloning model) into listview at a give index.
--- param index A index in ssize_t. +-- param index An index in ssize_t. -- @function [parent=#ListView] insertDefaultItem -- @param self -- @param #long index @@ -92,7 +92,7 @@ -- @return ListView#ListView self (return value: ccui.ListView) -------------------------------- --- Add a event click callback to ListView, then one item of Listview is clicked, the callback will be called.
+-- Add an event click callback to ListView, then one item of Listview is clicked, the callback will be called.
-- param callback A callback function with type of `ccListViewCallback`. -- @function [parent=#ListView] addEventListener -- @param self @@ -107,7 +107,7 @@ -------------------------------- -- brief Query the topmost item in horizontal list
--- return A item instance. +-- return An item instance. -- @function [parent=#ListView] getTopmostItemInCurrentView -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) @@ -120,7 +120,7 @@ -------------------------------- -- brief Query the bottommost item in horizontal list
--- return A item instance. +-- return An item instance. -- @function [parent=#ListView] getBottommostItemInCurrentView -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) @@ -134,7 +134,7 @@ -------------------------------- -- brief Query the leftmost item in horizontal list
--- return A item instance. +-- return An item instance. -- @function [parent=#ListView] getLeftmostItemInCurrentView -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) @@ -154,7 +154,7 @@ -- @return int#int ret (return value: int) -------------------------------- --- Return a item at a given index.
+-- Return an item at a given index.
-- param index A given index in ssize_t.
-- return A widget instance. -- @function [parent=#ListView] getItem @@ -163,7 +163,7 @@ -- @return Widget#Widget ret (return value: ccui.Widget) -------------------------------- --- Remove a item at given index.
+-- Remove an item at given index.
-- param index A given index in ssize_t. -- @function [parent=#ListView] removeItem -- @param self @@ -197,7 +197,7 @@ -- brief Query the closest item to a specific position in inner container.
-- param targetPosition Specifies the target position in inner container's coordinates.
-- param itemAnchorPoint Specifies an anchor point of each item for position to calculate distance.
--- return A item instance if list view is not empty. Otherwise, returns null. +-- return An item instance if list view is not empty. Otherwise, returns null. -- @function [parent=#ListView] getClosestItemToPosition -- @param self -- @param #vec2_table targetPosition @@ -206,7 +206,7 @@ -------------------------------- -- brief Query the rightmost item in horizontal list
--- return A item instance. +-- return An item instance. -- @function [parent=#ListView] getRightmostItemInCurrentView -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) @@ -216,7 +216,7 @@ -- For instance, to find the item in the center of view, call 'getClosestItemToPositionInCurrentView(Vec2::ANCHOR_MIDDLE, Vec2::ANCHOR_MIDDLE)'.
-- param positionRatioInView Specifies the target position with ratio in list view's content size.
-- param itemAnchorPoint Specifies an anchor point of each item for position to calculate distance.
--- return A item instance if list view is not empty. Otherwise, returns null. +-- return An item instance if list view is not empty. Otherwise, returns null. -- @function [parent=#ListView] getClosestItemToPositionInCurrentView -- @param self -- @param #vec2_table positionRatioInView @@ -224,7 +224,7 @@ -- @return Widget#Widget ret (return value: ccui.Widget) -------------------------------- --- Set a item model for listview.
+-- Set an item model for listview.
-- When calling `pushBackDefaultItem`, the model will be used as a blueprint and new model copy will be inserted into ListView.
-- param model Model in `Widget*`. -- @function [parent=#ListView] setItemModel diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua index d9e5de1645..f8d8ee3bbb 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua @@ -1,7 +1,7 @@ -------------------------------- -- @module ParticleSystem --- @extend Node,TextureProtocol +-- @extend Node,TextureProtocol,PlayableProtocol -- @parent_module cc -------------------------------- @@ -416,6 +416,12 @@ -- @param #vec2_table pos -- @return ParticleSystem#ParticleSystem self (return value: cc.ParticleSystem) +-------------------------------- +-- +-- @function [parent=#ParticleSystem] stop +-- @param self +-- @return ParticleSystem#ParticleSystem self (return value: cc.ParticleSystem) + -------------------------------- -- Update the verts position data of particle,
-- should be overridden by subclasses. @@ -462,6 +468,12 @@ -- @param #bool t -- @return ParticleSystem#ParticleSystem self (return value: cc.ParticleSystem) +-------------------------------- +-- / @{/ @name implement Playable Protocol +-- @function [parent=#ParticleSystem] start +-- @param self +-- @return ParticleSystem#ParticleSystem self (return value: cc.ParticleSystem) + -------------------------------- -- Sets the end size variance in pixels of each particle.
-- param sizeVar The end size variance in pixels of each particle. diff --git a/cocos/scripting/lua-bindings/auto/api/PlayableFrame.lua b/cocos/scripting/lua-bindings/auto/api/PlayableFrame.lua new file mode 100644 index 0000000000..b41de1d22a --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/PlayableFrame.lua @@ -0,0 +1,38 @@ + +-------------------------------- +-- @module PlayableFrame +-- @extend Frame +-- @parent_module ccs + +-------------------------------- +-- +-- @function [parent=#PlayableFrame] setPlayableAct +-- @param self +-- @param #string playact +-- @return PlayableFrame#PlayableFrame self (return value: ccs.PlayableFrame) + +-------------------------------- +-- +-- @function [parent=#PlayableFrame] getPlayableAct +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- +-- @function [parent=#PlayableFrame] create +-- @param self +-- @return PlayableFrame#PlayableFrame ret (return value: ccs.PlayableFrame) + +-------------------------------- +-- +-- @function [parent=#PlayableFrame] clone +-- @param self +-- @return Frame#Frame ret (return value: ccs.Frame) + +-------------------------------- +-- +-- @function [parent=#PlayableFrame] PlayableFrame +-- @param self +-- @return PlayableFrame#PlayableFrame self (return value: ccs.PlayableFrame) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PolygonInfo.lua b/cocos/scripting/lua-bindings/auto/api/PolygonInfo.lua index 7a8be292b7..9406778b08 100644 --- a/cocos/scripting/lua-bindings/auto/api/PolygonInfo.lua +++ b/cocos/scripting/lua-bindings/auto/api/PolygonInfo.lua @@ -11,16 +11,16 @@ -- @return float#float ret (return value: float) -------------------------------- --- get triangles count
--- return number of triangles --- @function [parent=#PolygonInfo] getTriaglesCount +-- get vertex count
+-- return number of vertices +-- @function [parent=#PolygonInfo] getVertCount -- @param self -- @return unsigned int#unsigned int ret (return value: unsigned int) -------------------------------- --- get vertex count
--- return number of vertices --- @function [parent=#PolygonInfo] getVertCount +-- get triangles count
+-- return number of triangles +-- @function [parent=#PolygonInfo] getTrianglesCount -- @param self -- @return unsigned int#unsigned int ret (return value: unsigned int) diff --git a/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua b/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua index 89fd4698ac..4782a55978 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua @@ -4,6 +4,13 @@ -- @extend RichElement -- @parent_module ccui +-------------------------------- +-- +-- @function [parent=#RichElementImage] setHeight +-- @param self +-- @param #int height +-- @return RichElementImage#RichElementImage self (return value: ccui.RichElementImage) + -------------------------------- -- brief Initialize a RichElementImage with various arguments.
-- param tag A integer tag value.
@@ -19,6 +26,13 @@ -- @param #string filePath -- @return bool#bool ret (return value: bool) +-------------------------------- +-- +-- @function [parent=#RichElementImage] setWidth +-- @param self +-- @param #int width +-- @return RichElementImage#RichElementImage self (return value: ccui.RichElementImage) + -------------------------------- -- brief Create a RichElementImage with various arguments.
-- param tag A integer tag value.
diff --git a/cocos/scripting/lua-bindings/auto/api/RichElementText.lua b/cocos/scripting/lua-bindings/auto/api/RichElementText.lua index 68d7587641..8855119c59 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElementText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElementText.lua @@ -12,7 +12,8 @@ -- param text Content string.
-- param fontName Content font name.
-- param fontSize Content font size.
--- return True if initialize scucess, false otherwise. +-- param flags: italics, bold, underline or strikethrough
+-- return True if initialize success, false otherwise. -- @function [parent=#RichElementText] init -- @param self -- @param #int tag @@ -21,6 +22,8 @@ -- @param #string text -- @param #string fontName -- @param #float fontSize +-- @param #unsigned int flags +-- @param #string url -- @return bool#bool ret (return value: bool) -------------------------------- @@ -31,6 +34,7 @@ -- param text Content string.
-- param fontName Content font name.
-- param fontSize Content font size.
+-- param flags: italics, bold, underline or strikethrough
-- return RichElementText instance. -- @function [parent=#RichElementText] create -- @param self @@ -40,6 +44,8 @@ -- @param #string text -- @param #string fontName -- @param #float fontSize +-- @param #unsigned int flags +-- @param #string url -- @return RichElementText#RichElementText ret (return value: ccui.RichElementText) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/RichText.lua b/cocos/scripting/lua-bindings/auto/api/RichText.lua index 8a49cbad15..ba127cbb6c 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichText.lua @@ -37,6 +37,13 @@ -- @param self -- @return RichText#RichText self (return value: ccui.RichText) +-------------------------------- +-- +-- @function [parent=#RichText] initWithXML +-- @param self +-- @param #string xml +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @overload self, ccui.RichElement -- @overload self, int @@ -52,6 +59,14 @@ -- @param self -- @return RichText#RichText ret (return value: ccui.RichText) +-------------------------------- +-- brief Create a RichText from an XML
+-- return RichText instance. +-- @function [parent=#RichText] createWithXML +-- @param self +-- @param #string xml +-- @return RichText#RichText ret (return value: ccui.RichText) + -------------------------------- -- -- @function [parent=#RichText] init diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua index 1456e0c91a..e8aa523581 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua @@ -163,7 +163,7 @@ -- @return vec2_table#vec2_table ret (return value: vec2_table) -------------------------------- --- Check if anchor point is defined for frame.
+-- Check if anchor point is defined for the frame.
-- return true if anchor point is available. -- @function [parent=#SpriteFrame] hasAnchorPoint -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Text.lua b/cocos/scripting/lua-bindings/auto/api/Text.lua index 7eadb87592..b2554f9d21 100644 --- a/cocos/scripting/lua-bindings/auto/api/Text.lua +++ b/cocos/scripting/lua-bindings/auto/api/Text.lua @@ -170,7 +170,7 @@ -- @return Text#Text self (return value: ccui.Text) -------------------------------- --- Return current effect color vlaue. +-- Return current effect color value. -- @function [parent=#Text] getEffectColor -- @param self -- @return color4b_table#color4b_table ret (return value: color4b_table) diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua index 0969800bef..31870e7fab 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua @@ -256,6 +256,11 @@ -- @field [parent=#ccs] BlendFuncFrame#BlendFuncFrame BlendFuncFrame preloaded module +-------------------------------------------------------- +-- the ccs PlayableFrame +-- @field [parent=#ccs] PlayableFrame#PlayableFrame PlayableFrame preloaded module + + -------------------------------------------------------- -- the ccs Timeline -- @field [parent=#ccs] Timeline#Timeline Timeline preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 24385f0ec1..18232dfe87 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -20465,53 +20465,6 @@ int lua_cocos2dx_PolygonInfo_getArea(lua_State* tolua_S) return 0; } -int lua_cocos2dx_PolygonInfo_getTriaglesCount(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PolygonInfo* 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.PolygonInfo",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PolygonInfo*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_PolygonInfo_getTriaglesCount'", 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_PolygonInfo_getTriaglesCount'", nullptr); - return 0; - } - const unsigned int ret = cobj->getTriaglesCount(); - 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.PolygonInfo:getTriaglesCount",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_PolygonInfo_getTriaglesCount'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_PolygonInfo_getVertCount(lua_State* tolua_S) { int argc = 0; @@ -20559,6 +20512,53 @@ int lua_cocos2dx_PolygonInfo_getVertCount(lua_State* tolua_S) return 0; } +int lua_cocos2dx_PolygonInfo_getTrianglesCount(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PolygonInfo* 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.PolygonInfo",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PolygonInfo*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_PolygonInfo_getTrianglesCount'", 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_PolygonInfo_getTrianglesCount'", nullptr); + return 0; + } + const unsigned int ret = cobj->getTrianglesCount(); + 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.PolygonInfo:getTrianglesCount",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_PolygonInfo_getTrianglesCount'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_PolygonInfo_setQuad(lua_State* tolua_S) { int argc = 0; @@ -20710,8 +20710,8 @@ int lua_register_cocos2dx_PolygonInfo(lua_State* tolua_S) tolua_beginmodule(tolua_S,"PolygonInfo"); tolua_function(tolua_S,"new",lua_cocos2dx_PolygonInfo_constructor); tolua_function(tolua_S,"getArea",lua_cocos2dx_PolygonInfo_getArea); - tolua_function(tolua_S,"getTriaglesCount",lua_cocos2dx_PolygonInfo_getTriaglesCount); tolua_function(tolua_S,"getVertCount",lua_cocos2dx_PolygonInfo_getVertCount); + tolua_function(tolua_S,"getTrianglesCount",lua_cocos2dx_PolygonInfo_getTrianglesCount); tolua_function(tolua_S,"setQuad",lua_cocos2dx_PolygonInfo_setQuad); tolua_function(tolua_S,"setTriangles",lua_cocos2dx_PolygonInfo_setTriangles); tolua_endmodule(tolua_S); @@ -51962,6 +51962,53 @@ int lua_cocos2dx_Label_getShadowOffset(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Label_getLineSpacing(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_getLineSpacing'", 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_getLineSpacing'", nullptr); + return 0; + } + double ret = cobj->getLineSpacing(); + 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:getLineSpacing",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getLineSpacing'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Label_setClipMarginEnabled(lua_State* tolua_S) { int argc = 0; @@ -52112,6 +52159,53 @@ int lua_cocos2dx_Label_setSystemFontName(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Label_isWrapEnabled(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_isWrapEnabled'", 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_isWrapEnabled'", nullptr); + return 0; + } + bool ret = cobj->isWrapEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:isWrapEnabled",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_isWrapEnabled'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Label_getOutlineSize(lua_State* tolua_S) { int argc = 0; @@ -52638,7 +52732,7 @@ int lua_cocos2dx_Label_setOverflow(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Label_getLineSpacing(lua_State* tolua_S) +int lua_cocos2dx_Label_enableStrikethrough(lua_State* tolua_S) { int argc = 0; cocos2d::Label* cobj = nullptr; @@ -52658,7 +52752,7 @@ int lua_cocos2dx_Label_getLineSpacing(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_getLineSpacing'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_enableStrikethrough'", nullptr); return 0; } #endif @@ -52668,19 +52762,19 @@ int lua_cocos2dx_Label_getLineSpacing(lua_State* tolua_S) { if(!ok) { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getLineSpacing'", nullptr); + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_enableStrikethrough'", nullptr); return 0; } - double ret = cobj->getLineSpacing(); - tolua_pushnumber(tolua_S,(lua_Number)ret); + cobj->enableStrikethrough(); + lua_settop(tolua_S, 1); return 1; } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLineSpacing",argc, 0); + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableStrikethrough",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getLineSpacing'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_enableStrikethrough'.",&tolua_err); #endif return 0; @@ -53563,7 +53657,7 @@ int lua_cocos2dx_Label_getTTFConfig(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Label_getVerticalAlignment(lua_State* tolua_S) +int lua_cocos2dx_Label_enableItalics(lua_State* tolua_S) { int argc = 0; cocos2d::Label* cobj = nullptr; @@ -53583,7 +53677,7 @@ int lua_cocos2dx_Label_getVerticalAlignment(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_getVerticalAlignment'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_enableItalics'", nullptr); return 0; } #endif @@ -53593,19 +53687,19 @@ int lua_cocos2dx_Label_getVerticalAlignment(lua_State* tolua_S) { if(!ok) { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getVerticalAlignment'", nullptr); + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_enableItalics'", nullptr); return 0; } - int ret = (int)cobj->getVerticalAlignment(); - tolua_pushnumber(tolua_S,(lua_Number)ret); + cobj->enableItalics(); + lua_settop(tolua_S, 1); return 1; } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getVerticalAlignment",argc, 0); + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableItalics",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getVerticalAlignment'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_enableItalics'.",&tolua_err); #endif return 0; @@ -53904,6 +53998,53 @@ int lua_cocos2dx_Label_getOverflow(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Label_getVerticalAlignment(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_getVerticalAlignment'", 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_getVerticalAlignment'", nullptr); + return 0; + } + int ret = (int)cobj->getVerticalAlignment(); + 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:getVerticalAlignment",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_getVerticalAlignment'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Label_setAdditionalKerning(lua_State* tolua_S) { int argc = 0; @@ -54195,7 +54336,7 @@ int lua_cocos2dx_Label_setHorizontalAlignment(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Label_isWrapEnabled(lua_State* tolua_S) +int lua_cocos2dx_Label_enableBold(lua_State* tolua_S) { int argc = 0; cocos2d::Label* cobj = nullptr; @@ -54215,7 +54356,7 @@ int lua_cocos2dx_Label_isWrapEnabled(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_isWrapEnabled'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Label_enableBold'", nullptr); return 0; } #endif @@ -54225,19 +54366,66 @@ int lua_cocos2dx_Label_isWrapEnabled(lua_State* tolua_S) { if(!ok) { - tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_isWrapEnabled'", nullptr); + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_enableBold'", nullptr); return 0; } - bool ret = cobj->isWrapEnabled(); - tolua_pushboolean(tolua_S,(bool)ret); + cobj->enableBold(); + lua_settop(tolua_S, 1); return 1; } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:isWrapEnabled",argc, 0); + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableBold",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_isWrapEnabled'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_enableBold'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Label_enableUnderline(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_enableUnderline'", 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_enableUnderline'", nullptr); + return 0; + } + cobj->enableUnderline(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableUnderline",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Label_enableUnderline'.",&tolua_err); #endif return 0; @@ -54785,9 +54973,11 @@ int lua_register_cocos2dx_Label(lua_State* tolua_S) tolua_function(tolua_S,"getMaxLineWidth",lua_cocos2dx_Label_getMaxLineWidth); tolua_function(tolua_S,"getHorizontalAlignment",lua_cocos2dx_Label_getHorizontalAlignment); tolua_function(tolua_S,"getShadowOffset",lua_cocos2dx_Label_getShadowOffset); + tolua_function(tolua_S,"getLineSpacing",lua_cocos2dx_Label_getLineSpacing); tolua_function(tolua_S,"setClipMarginEnabled",lua_cocos2dx_Label_setClipMarginEnabled); tolua_function(tolua_S,"setString",lua_cocos2dx_Label_setString); tolua_function(tolua_S,"setSystemFontName",lua_cocos2dx_Label_setSystemFontName); + tolua_function(tolua_S,"isWrapEnabled",lua_cocos2dx_Label_isWrapEnabled); tolua_function(tolua_S,"getOutlineSize",lua_cocos2dx_Label_getOutlineSize); tolua_function(tolua_S,"setBMFontFilePath",lua_cocos2dx_Label_setBMFontFilePath); tolua_function(tolua_S,"initWithTTF",lua_cocos2dx_Label_initWithTTF); @@ -54795,7 +54985,7 @@ int lua_register_cocos2dx_Label(lua_State* tolua_S) tolua_function(tolua_S,"setLineHeight",lua_cocos2dx_Label_setLineHeight); tolua_function(tolua_S,"setSystemFontSize",lua_cocos2dx_Label_setSystemFontSize); tolua_function(tolua_S,"setOverflow",lua_cocos2dx_Label_setOverflow); - tolua_function(tolua_S,"getLineSpacing",lua_cocos2dx_Label_getLineSpacing); + tolua_function(tolua_S,"enableStrikethrough",lua_cocos2dx_Label_enableStrikethrough); tolua_function(tolua_S,"updateContent",lua_cocos2dx_Label_updateContent); tolua_function(tolua_S,"getStringLength",lua_cocos2dx_Label_getStringLength); tolua_function(tolua_S,"setLineBreakWithoutSpace",lua_cocos2dx_Label_setLineBreakWithoutSpace); @@ -54813,20 +55003,22 @@ int lua_register_cocos2dx_Label(lua_State* tolua_S) 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); - tolua_function(tolua_S,"getVerticalAlignment",lua_cocos2dx_Label_getVerticalAlignment); + tolua_function(tolua_S,"enableItalics",lua_cocos2dx_Label_enableItalics); tolua_function(tolua_S,"setTextColor",lua_cocos2dx_Label_setTextColor); tolua_function(tolua_S,"getLetter",lua_cocos2dx_Label_getLetter); tolua_function(tolua_S,"setHeight",lua_cocos2dx_Label_setHeight); tolua_function(tolua_S,"isShadowEnabled",lua_cocos2dx_Label_isShadowEnabled); tolua_function(tolua_S,"enableGlow",lua_cocos2dx_Label_enableGlow); tolua_function(tolua_S,"getOverflow",lua_cocos2dx_Label_getOverflow); + tolua_function(tolua_S,"getVerticalAlignment",lua_cocos2dx_Label_getVerticalAlignment); tolua_function(tolua_S,"setAdditionalKerning",lua_cocos2dx_Label_setAdditionalKerning); tolua_function(tolua_S,"getSystemFontSize",lua_cocos2dx_Label_getSystemFontSize); tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_Label_setBlendFunc); tolua_function(tolua_S,"getTextAlignment",lua_cocos2dx_Label_getTextAlignment); tolua_function(tolua_S,"getBMFontFilePath",lua_cocos2dx_Label_getBMFontFilePath); tolua_function(tolua_S,"setHorizontalAlignment",lua_cocos2dx_Label_setHorizontalAlignment); - tolua_function(tolua_S,"isWrapEnabled",lua_cocos2dx_Label_isWrapEnabled); + tolua_function(tolua_S,"enableBold",lua_cocos2dx_Label_enableBold); + tolua_function(tolua_S,"enableUnderline",lua_cocos2dx_Label_enableUnderline); tolua_function(tolua_S,"getLabelEffectType",lua_cocos2dx_Label_getLabelEffectType); tolua_function(tolua_S,"setAlignment",lua_cocos2dx_Label_setAlignment); tolua_function(tolua_S,"requestSystemFontRefresh",lua_cocos2dx_Label_requestSystemFontRefresh); @@ -64656,6 +64848,53 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ParticleSystem_stop(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ParticleSystem* 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.ParticleSystem",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ParticleSystem*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ParticleSystem_stop'", 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_ParticleSystem_stop'", nullptr); + return 0; + } + cobj->stop(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:stop",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ParticleSystem_stop'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ParticleSystem_updateParticleQuads(lua_State* tolua_S) { int argc = 0; @@ -64950,6 +65189,53 @@ int lua_cocos2dx_ParticleSystem_setRotationIsDir(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ParticleSystem_start(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ParticleSystem* 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.ParticleSystem",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ParticleSystem*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ParticleSystem_start'", 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_ParticleSystem_start'", nullptr); + return 0; + } + cobj->start(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:start",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ParticleSystem_start'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ParticleSystem_setEndSizeVar(lua_State* tolua_S) { int argc = 0; @@ -66927,12 +67213,14 @@ int lua_register_cocos2dx_ParticleSystem(lua_State* tolua_S) tolua_function(tolua_S,"setEmitterMode",lua_cocos2dx_ParticleSystem_setEmitterMode); tolua_function(tolua_S,"getDuration",lua_cocos2dx_ParticleSystem_getDuration); tolua_function(tolua_S,"setSourcePosition",lua_cocos2dx_ParticleSystem_setSourcePosition); + tolua_function(tolua_S,"stop",lua_cocos2dx_ParticleSystem_stop); tolua_function(tolua_S,"updateParticleQuads",lua_cocos2dx_ParticleSystem_updateParticleQuads); tolua_function(tolua_S,"getEndSpinVar",lua_cocos2dx_ParticleSystem_getEndSpinVar); tolua_function(tolua_S,"setBlendAdditive",lua_cocos2dx_ParticleSystem_setBlendAdditive); tolua_function(tolua_S,"setLife",lua_cocos2dx_ParticleSystem_setLife); tolua_function(tolua_S,"setAngleVar",lua_cocos2dx_ParticleSystem_setAngleVar); tolua_function(tolua_S,"setRotationIsDir",lua_cocos2dx_ParticleSystem_setRotationIsDir); + tolua_function(tolua_S,"start",lua_cocos2dx_ParticleSystem_start); tolua_function(tolua_S,"setEndSizeVar",lua_cocos2dx_ParticleSystem_setEndSizeVar); tolua_function(tolua_S,"setAngle",lua_cocos2dx_ParticleSystem_setAngle); tolua_function(tolua_S,"setBatchNode",lua_cocos2dx_ParticleSystem_setBatchNode); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index c5ea706f82..7984e43f18 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2170,6 +2170,15 @@ int register_all_cocos2dx(lua_State* tolua_S); + + + + + + + + + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp index 5f9cf0537b..0892c03b49 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp @@ -1,5 +1,5 @@ #include "base/ccConfig.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) #ifndef __cocos2dx_experimental_video_h__ #define __cocos2dx_experimental_video_h__ @@ -30,4 +30,4 @@ int register_all_cocos2dx_experimental_video(lua_State* tolua_S); #endif // __cocos2dx_experimental_video_h__ -#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp index 7a01ebc9c5..bc69bdec7c 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp @@ -1,5 +1,5 @@ #include "base/ccConfig.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) #ifndef __cocos2dx_experimental_webview_h__ #define __cocos2dx_experimental_webview_h__ @@ -30,4 +30,4 @@ int register_all_cocos2dx_experimental_webview(lua_State* tolua_S); #endif // __cocos2dx_experimental_webview_h__ -#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index 3ebe684ddb..b8d56d2dd1 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -13107,6 +13107,53 @@ int lua_cocos2dx_studio_ComAudio_end(lua_State* tolua_S) return 0; } +int lua_cocos2dx_studio_ComAudio_start(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::ComAudio* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.ComAudio",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::ComAudio*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ComAudio_start'", 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_studio_ComAudio_start'", nullptr); + return 0; + } + cobj->start(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:start",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ComAudio_start'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_studio_ComAudio_stopBackgroundMusic(lua_State* tolua_S) { int argc = 0; @@ -13510,6 +13557,53 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) return 0; } +int lua_cocos2dx_studio_ComAudio_stop(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::ComAudio* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.ComAudio",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::ComAudio*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ComAudio_stop'", 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_studio_ComAudio_stop'", nullptr); + return 0; + } + cobj->stop(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stop",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ComAudio_stop'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) { int argc = 0; @@ -14155,6 +14249,7 @@ int lua_register_cocos2dx_studio_ComAudio(lua_State* tolua_S) tolua_function(tolua_S,"willPlayBackgroundMusic",lua_cocos2dx_studio_ComAudio_willPlayBackgroundMusic); tolua_function(tolua_S,"setBackgroundMusicVolume",lua_cocos2dx_studio_ComAudio_setBackgroundMusicVolume); tolua_function(tolua_S,"end",lua_cocos2dx_studio_ComAudio_end); + tolua_function(tolua_S,"start",lua_cocos2dx_studio_ComAudio_start); tolua_function(tolua_S,"stopBackgroundMusic",lua_cocos2dx_studio_ComAudio_stopBackgroundMusic); tolua_function(tolua_S,"pauseBackgroundMusic",lua_cocos2dx_studio_ComAudio_pauseBackgroundMusic); tolua_function(tolua_S,"isBackgroundMusicPlaying",lua_cocos2dx_studio_ComAudio_isBackgroundMusicPlaying); @@ -14163,6 +14258,7 @@ int lua_register_cocos2dx_studio_ComAudio(lua_State* tolua_S) tolua_function(tolua_S,"pauseAllEffects",lua_cocos2dx_studio_ComAudio_pauseAllEffects); tolua_function(tolua_S,"preloadBackgroundMusic",lua_cocos2dx_studio_ComAudio_preloadBackgroundMusic); tolua_function(tolua_S,"playBackgroundMusic",lua_cocos2dx_studio_ComAudio_playBackgroundMusic); + tolua_function(tolua_S,"stop",lua_cocos2dx_studio_ComAudio_stop); tolua_function(tolua_S,"playEffect",lua_cocos2dx_studio_ComAudio_playEffect); tolua_function(tolua_S,"preloadEffect",lua_cocos2dx_studio_ComAudio_preloadEffect); tolua_function(tolua_S,"setLoop",lua_cocos2dx_studio_ComAudio_setLoop); @@ -19975,6 +20071,197 @@ int lua_register_cocos2dx_studio_BlendFuncFrame(lua_State* tolua_S) return 1; } +int lua_cocos2dx_studio_PlayableFrame_setPlayableAct(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::PlayableFrame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.PlayableFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::PlayableFrame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_PlayableFrame_setPlayableAct'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.PlayableFrame:setPlayableAct"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_PlayableFrame_setPlayableAct'", nullptr); + return 0; + } + cobj->setPlayableAct(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PlayableFrame:setPlayableAct",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_PlayableFrame_setPlayableAct'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_studio_PlayableFrame_getPlayableAct(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::PlayableFrame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.PlayableFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::PlayableFrame*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_PlayableFrame_getPlayableAct'", 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_studio_PlayableFrame_getPlayableAct'", nullptr); + return 0; + } + std::string ret = cobj->getPlayableAct(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PlayableFrame:getPlayableAct",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_PlayableFrame_getPlayableAct'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_studio_PlayableFrame_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccs.PlayableFrame",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_PlayableFrame_create'", nullptr); + return 0; + } + cocostudio::timeline::PlayableFrame* ret = cocostudio::timeline::PlayableFrame::create(); + object_to_luaval(tolua_S, "ccs.PlayableFrame",(cocostudio::timeline::PlayableFrame*)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.PlayableFrame:create",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_PlayableFrame_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_studio_PlayableFrame_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::PlayableFrame* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_PlayableFrame_constructor'", nullptr); + return 0; + } + cobj = new cocostudio::timeline::PlayableFrame(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.PlayableFrame"); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PlayableFrame:PlayableFrame",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_PlayableFrame_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_studio_PlayableFrame_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (PlayableFrame)"); + return 0; +} + +int lua_register_cocos2dx_studio_PlayableFrame(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"ccs.PlayableFrame"); + tolua_cclass(tolua_S,"PlayableFrame","ccs.PlayableFrame","ccs.Frame",nullptr); + + tolua_beginmodule(tolua_S,"PlayableFrame"); + tolua_function(tolua_S,"new",lua_cocos2dx_studio_PlayableFrame_constructor); + tolua_function(tolua_S,"setPlayableAct",lua_cocos2dx_studio_PlayableFrame_setPlayableAct); + tolua_function(tolua_S,"getPlayableAct",lua_cocos2dx_studio_PlayableFrame_getPlayableAct); + tolua_function(tolua_S,"create", lua_cocos2dx_studio_PlayableFrame_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocostudio::timeline::PlayableFrame).name(); + g_luaType[typeName] = "ccs.PlayableFrame"; + g_typeCast["PlayableFrame"] = "ccs.PlayableFrame"; + return 1; +} + int lua_cocos2dx_studio_Timeline_clone(lua_State* tolua_S) { int argc = 0; @@ -21257,6 +21544,53 @@ int lua_cocos2dx_studio_ActionTimeline_pause(lua_State* tolua_S) return 0; } +int lua_cocos2dx_studio_ActionTimeline_start(lua_State* tolua_S) +{ + int argc = 0; + cocostudio::timeline::ActionTimeline* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccs.ActionTimeline",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocostudio::timeline::ActionTimeline*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionTimeline_start'", 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_studio_ActionTimeline_start'", nullptr); + return 0; + } + cobj->start(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:start",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionTimeline_start'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_studio_ActionTimeline_init(lua_State* tolua_S) { int argc = 0; @@ -22593,6 +22927,7 @@ int lua_register_cocos2dx_studio_ActionTimeline(lua_State* tolua_S) tolua_function(tolua_S,"getCurrentFrame",lua_cocos2dx_studio_ActionTimeline_getCurrentFrame); tolua_function(tolua_S,"getStartFrame",lua_cocos2dx_studio_ActionTimeline_getStartFrame); tolua_function(tolua_S,"pause",lua_cocos2dx_studio_ActionTimeline_pause); + tolua_function(tolua_S,"start",lua_cocos2dx_studio_ActionTimeline_start); tolua_function(tolua_S,"init",lua_cocos2dx_studio_ActionTimeline_init); tolua_function(tolua_S,"removeTimeline",lua_cocos2dx_studio_ActionTimeline_removeTimeline); tolua_function(tolua_S,"clearFrameEventCallFunc",lua_cocos2dx_studio_ActionTimeline_clearFrameEventCallFunc); @@ -24671,17 +25006,17 @@ TOLUA_API int register_all_cocos2dx_studio(lua_State* tolua_S) tolua_module(tolua_S,"ccs",0); tolua_beginmodule(tolua_S,"ccs"); + lua_register_cocos2dx_studio_Frame(tolua_S); + lua_register_cocos2dx_studio_PlayableFrame(tolua_S); lua_register_cocos2dx_studio_ActionTimelineNode(tolua_S); lua_register_cocos2dx_studio_ActionFrame(tolua_S); lua_register_cocos2dx_studio_ActionRotationFrame(tolua_S); - lua_register_cocos2dx_studio_Frame(tolua_S); lua_register_cocos2dx_studio_BlendFuncFrame(tolua_S); lua_register_cocos2dx_studio_BoneNode(tolua_S); lua_register_cocos2dx_studio_SkeletonNode(tolua_S); lua_register_cocos2dx_studio_ScaleFrame(tolua_S); lua_register_cocos2dx_studio_Tween(tolua_S); lua_register_cocos2dx_studio_ContourData(tolua_S); - lua_register_cocos2dx_studio_ComAudio(tolua_S); lua_register_cocos2dx_studio_ActionTimeline(tolua_S); lua_register_cocos2dx_studio_InnerActionFrame(tolua_S); lua_register_cocos2dx_studio_ActionTimelineData(tolua_S); @@ -24723,6 +25058,7 @@ TOLUA_API int register_all_cocos2dx_studio(lua_State* tolua_S) lua_register_cocos2dx_studio_SceneReader(tolua_S); lua_register_cocos2dx_studio_ActionTimelineCache(tolua_S); lua_register_cocos2dx_studio_AlphaFrame(tolua_S); + lua_register_cocos2dx_studio_ComAudio(tolua_S); lua_register_cocos2dx_studio_ComExtensionData(tolua_S); lua_register_cocos2dx_studio_AnimationData(tolua_S); lua_register_cocos2dx_studio_AnchorPointFrame(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp index 885c34824b..b7fe302b9a 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp @@ -550,6 +550,14 @@ int register_all_cocos2dx_studio(lua_State* tolua_S); + + + + + + + + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index cb61d4b715..6635f7d402 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -24321,7 +24321,7 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S) #endif argc = lua_gettop(tolua_S)-1; - if (argc == 6) + if (argc == 8) { int arg0; cocos2d::Color3B arg1; @@ -24329,6 +24329,8 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S) std::string arg3; std::string arg4; double arg5; + unsigned int arg6; + std::string arg7; ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init"); @@ -24341,16 +24343,20 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S) ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init"); ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init"); + + ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init"); + + ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init"); if(!ok) { tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_init'", nullptr); return 0; } - bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5); + bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:init",argc, 6); + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:init",argc, 8); return 0; #if COCOS2D_DEBUG >= 1 @@ -24398,6 +24404,58 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RichElementText",(cocos2d::ui::RichElementText*)ret); return 1; } + if (argc == 7) + { + int arg0; + cocos2d::Color3B arg1; + uint16_t arg2; + std::string arg3; + std::string arg4; + double arg5; + unsigned int arg6; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create"); + ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_create'", nullptr); + return 0; + } + cocos2d::ui::RichElementText* ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6); + object_to_luaval(tolua_S, "ccui.RichElementText",(cocos2d::ui::RichElementText*)ret); + return 1; + } + if (argc == 8) + { + int arg0; + cocos2d::Color3B arg1; + uint16_t arg2; + std::string arg3; + std::string arg4; + double arg5; + unsigned int arg6; + std::string arg7; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create"); + ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_create'", nullptr); + return 0; + } + cocos2d::ui::RichElementText* ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + object_to_luaval(tolua_S, "ccui.RichElementText",(cocos2d::ui::RichElementText*)ret); + return 1; + } luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementText:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -24465,6 +24523,56 @@ int lua_register_cocos2dx_ui_RichElementText(lua_State* tolua_S) return 1; } +int lua_cocos2dx_ui_RichElementImage_setHeight(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::RichElementImage* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.RichElementImage",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::RichElementImage*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_RichElementImage_setHeight'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:setHeight"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_setHeight'", nullptr); + return 0; + } + cobj->setHeight(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:setHeight",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichElementImage_setHeight'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S) { int argc = 0; @@ -24524,6 +24632,56 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_RichElementImage_setWidth(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::RichElementImage* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.RichElementImage",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::RichElementImage*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_RichElementImage_setWidth'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:setWidth"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_setWidth'", nullptr); + return 0; + } + cobj->setWidth(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:setWidth",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichElementImage_setWidth'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S) { int argc = 0; @@ -24616,7 +24774,9 @@ int lua_register_cocos2dx_ui_RichElementImage(lua_State* tolua_S) tolua_beginmodule(tolua_S,"RichElementImage"); tolua_function(tolua_S,"new",lua_cocos2dx_ui_RichElementImage_constructor); + tolua_function(tolua_S,"setHeight",lua_cocos2dx_ui_RichElementImage_setHeight); tolua_function(tolua_S,"init",lua_cocos2dx_ui_RichElementImage_init); + tolua_function(tolua_S,"setWidth",lua_cocos2dx_ui_RichElementImage_setWidth); tolua_function(tolua_S,"create", lua_cocos2dx_ui_RichElementImage_create); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::ui::RichElementImage).name(); @@ -25083,6 +25243,56 @@ int lua_cocos2dx_ui_RichText_formatText(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_RichText_initWithXML(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::RichText* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.RichText",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::RichText*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_RichText_initWithXML'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:initWithXML"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_initWithXML'", nullptr); + return 0; + } + bool ret = cobj->initWithXML(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:initWithXML",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichText_initWithXML'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_RichText_removeElement(lua_State* tolua_S) { int argc = 0; @@ -25172,6 +25382,42 @@ int lua_cocos2dx_ui_RichText_create(lua_State* tolua_S) #endif return 0; } +int lua_cocos2dx_ui_RichText_createWithXML(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccui.RichText",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:createWithXML"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_createWithXML'", nullptr); + return 0; + } + cocos2d::ui::RichText* ret = cocos2d::ui::RichText::createWithXML(arg0); + object_to_luaval(tolua_S, "ccui.RichText",(cocos2d::ui::RichText*)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichText:createWithXML",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_RichText_createWithXML'.",&tolua_err); +#endif + return 0; +} int lua_cocos2dx_ui_RichText_constructor(lua_State* tolua_S) { int argc = 0; @@ -25226,8 +25472,10 @@ int lua_register_cocos2dx_ui_RichText(lua_State* tolua_S) tolua_function(tolua_S,"pushBackElement",lua_cocos2dx_ui_RichText_pushBackElement); tolua_function(tolua_S,"setVerticalSpace",lua_cocos2dx_ui_RichText_setVerticalSpace); tolua_function(tolua_S,"formatText",lua_cocos2dx_ui_RichText_formatText); + tolua_function(tolua_S,"initWithXML",lua_cocos2dx_ui_RichText_initWithXML); tolua_function(tolua_S,"removeElement",lua_cocos2dx_ui_RichText_removeElement); tolua_function(tolua_S,"create", lua_cocos2dx_ui_RichText_create); + tolua_function(tolua_S,"createWithXML", lua_cocos2dx_ui_RichText_createWithXML); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::ui::RichText).name(); g_luaType[typeName] = "ccui.RichText"; diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index 41f9c051c2..91debe0a5f 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -661,6 +661,10 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + + + +