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

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18540)

This commit is contained in:
CocosRobot 2017-12-07 13:45:26 +08:00 committed by minggo
parent 907b6fda75
commit fe69b07e75
23 changed files with 219 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2733,20 +2733,20 @@ pause : function (
/**
* @method pushProjectionMatrix
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
pushProjectionMatrix : function (
long
int
)
{
},
/**
* @method popProjectionMatrix
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
popProjectionMatrix : function (
long
int
)
{
},
@ -2763,10 +2763,10 @@ eventdispatcher
/**
* @method loadProjectionIdentityMatrix
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
loadProjectionIdentityMatrix : function (
long
int
)
{
},
@ -3028,11 +3028,11 @@ scheduler
/**
* @method multiplyProjectionMatrix
* @param {mat4_object} arg0
* @param {unsigned long} arg1
* @param {unsigned int} arg1
*/
multiplyProjectionMatrix : function (
mat4,
long
int
)
{
},
@ -3310,21 +3310,21 @@ getVisibleSize : function (
/**
* @method loadProjectionMatrix
* @param {mat4_object} arg0
* @param {unsigned long} arg1
* @param {unsigned int} arg1
*/
loadProjectionMatrix : function (
mat4,
long
int
)
{
},
/**
* @method initProjectionMatrixStack
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
initProjectionMatrixStack : function (
long
int
)
{
},
@ -7738,11 +7738,11 @@ event
/**
* @method hasEventListener
* @param {std::basic_string<char>} arg0
* @param {String} arg0
* @return {bool}
*/
hasEventListener : function (
basic_string<char>
str
)
{
return false;
@ -10955,7 +10955,7 @@ node
* @method getNumberOfRunningActionsInTargetByTag
* @param {cc.Node} arg0
* @param {int} arg1
* @return {unsigned long}
* @return {unsigned int}
*/
getNumberOfRunningActionsInTargetByTag : function (
node,
@ -15063,6 +15063,14 @@ isEnabled : function (
return false;
},
/**
* @method alignItemsHorizontally
*/
alignItemsHorizontally : function (
)
{
},
/**
* @method alignItemsHorizontallyWithPadding
* @param {float} arg0
@ -15083,14 +15091,6 @@ float
{
},
/**
* @method alignItemsHorizontally
*/
alignItemsHorizontally : function (
)
{
},
/**
* @method Menu
* @constructor
@ -22862,7 +22862,7 @@ cc.TextFieldTTF = {
/**
* @method getCharCount
* @return {unsigned long}
* @return {unsigned int}
*/
getCharCount : function (
)
@ -23024,10 +23024,10 @@ getPlaceHolder : function (
/**
* @method setCursorPosition
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
setCursorPosition : function (
long
int
)
{
},

8
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_experimental_webView_auto_api.js
View File

@ -73,7 +73,7 @@ bool
getOnDidFailLoading : function (
)
{
return std::function<void (cocos2d::experimental::ui::WebView , std::basic_string<char> &)>;
return std::function<void (cocos2d::experimental::ui::WebView , std::string&)>;
},
/**
@ -133,7 +133,7 @@ setBackgroundTransparent : function (
getOnJSCallback : function (
)
{
return std::function<void (cocos2d::experimental::ui::WebView , std::basic_string<char> &)>;
return std::function<void (cocos2d::experimental::ui::WebView , std::string&)>;
},
/**
@ -153,7 +153,7 @@ canGoForward : function (
getOnShouldStartLoading : function (
)
{
return std::function<bool (cocos2d::experimental::ui::WebView , std::basic_string<char> &)>;
return std::function<bool (cocos2d::experimental::ui::WebView , std::string&)>;
},
/**
@ -199,7 +199,7 @@ str
getOnDidFinishLoading : function (
)
{
return std::function<void (cocos2d::experimental::ui::WebView , std::basic_string<char> &)>;
return std::function<void (cocos2d::experimental::ui::WebView , std::string&)>;
},
/**

28
cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js
View File

@ -4469,13 +4469,13 @@ getAttachWithIME : function (
* @method onTextFieldDeleteBackward
* @param {cc.TextFieldTTF} arg0
* @param {char} arg1
* @param {unsigned long} arg2
* @param {unsigned int} arg2
* @return {bool}
*/
onTextFieldDeleteBackward : function (
textfieldttf,
char,
long
int
)
{
return false;
@ -4513,7 +4513,7 @@ getDetachWithIME : function (
/**
* @method getCharCount
* @return {unsigned long}
* @return {unsigned int}
*/
getCharCount : function (
)
@ -4562,11 +4562,11 @@ isPasswordEnabled : function (
/**
* @method insertText
* @param {char} arg0
* @param {unsigned long} arg1
* @param {unsigned int} arg1
*/
insertText : function (
char,
long
int
)
{
},
@ -4585,13 +4585,13 @@ str
* @method onTextFieldInsertText
* @param {cc.TextFieldTTF} arg0
* @param {char} arg1
* @param {unsigned long} arg2
* @param {unsigned int} arg2
* @return {bool}
*/
onTextFieldInsertText : function (
textfieldttf,
char,
long
int
)
{
return false;
@ -4967,10 +4967,10 @@ bool
/**
* @method setCursorPosition
* @param {unsigned long} arg0
* @param {unsigned int} arg0
*/
setCursorPosition : function (
long
int
)
{
},
@ -5602,14 +5602,14 @@ ccui.Helper = {
/**
* @method getSubStringOfUTF8String
* @param {String} arg0
* @param {unsigned long} arg1
* @param {unsigned long} arg2
* @param {unsigned int} arg1
* @param {unsigned int} arg2
* @return {String}
*/
getSubStringOfUTF8String : function (
str,
long,
long
int,
int
)
{
return ;
@ -8079,7 +8079,7 @@ int
/**
* @method getTabCount
* @return {unsigned long}
* @return {unsigned int}
*/
getTabCount : function (
)

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

@ -700,14 +700,14 @@ bool js_cocos2dx_audioengine_AudioEngine_setFinishCallback(JSContext *cx, uint32
bool ok = true;
if (argc == 2) {
int arg0 = 0;
std::function<void (int, const std::basic_string<char> &)> arg1;
std::function<void (int, const std::string&)> arg1;
ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
do {
if(JS_TypeOfValue(cx, args.get(1)) == JSTYPE_FUNCTION)
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(1), args.thisv()));
auto lambda = [=](int larg0, const std::basic_string<char> & larg1) -> void {
auto lambda = [=](int larg0, const std::string& larg1) -> void {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[2];
largv[0] = int32_to_jsval(cx, larg0);

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

@ -2595,7 +2595,7 @@ bool js_cocos2dx_Node__setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node__setLocalZOrder : Invalid Native Object");
if (argc == 1) {
int arg0 = 0;
int32_t arg0 = 0;
ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Node__setLocalZOrder : Error processing arguments");
cobj->_setLocalZOrder(arg0);
@ -4119,7 +4119,7 @@ bool js_cocos2dx_Node_getLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_getLocalZOrder : Invalid Native Object");
if (argc == 0) {
int ret = cobj->getLocalZOrder();
int32_t ret = cobj->getLocalZOrder();
JS::RootedValue jsret(cx);
jsret = int32_to_jsval(cx, ret);
args.rval().set(jsret);
@ -4635,7 +4635,7 @@ bool js_cocos2dx_Node_setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_setLocalZOrder : Invalid Native Object");
if (argc == 1) {
int arg0 = 0;
int32_t arg0 = 0;
ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Node_setLocalZOrder : Error processing arguments");
cobj->setLocalZOrder(arg0);
@ -6769,8 +6769,8 @@ bool js_cocos2dx_Director_pushProjectionMatrix(JSContext *cx, uint32_t argc, jsv
cocos2d::Director* cobj = (cocos2d::Director *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_pushProjectionMatrix : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_pushProjectionMatrix : Error processing arguments");
cobj->pushProjectionMatrix(arg0);
args.rval().setUndefined();
@ -6789,8 +6789,8 @@ bool js_cocos2dx_Director_popProjectionMatrix(JSContext *cx, uint32_t argc, jsva
cocos2d::Director* cobj = (cocos2d::Director *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_popProjectionMatrix : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_popProjectionMatrix : Error processing arguments");
cobj->popProjectionMatrix(arg0);
args.rval().setUndefined();
@ -6837,8 +6837,8 @@ bool js_cocos2dx_Director_loadProjectionIdentityMatrix(JSContext *cx, uint32_t a
cocos2d::Director* cobj = (cocos2d::Director *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_loadProjectionIdentityMatrix : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_loadProjectionIdentityMatrix : Error processing arguments");
cobj->loadProjectionIdentityMatrix(arg0);
args.rval().setUndefined();
@ -7375,9 +7375,9 @@ bool js_cocos2dx_Director_multiplyProjectionMatrix(JSContext *cx, uint32_t argc,
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_multiplyProjectionMatrix : Invalid Native Object");
if (argc == 2) {
cocos2d::Mat4 arg0;
unsigned long arg1 = 0;
size_t arg1 = 0;
ok &= jsval_to_matrix(cx, args.get(0), &arg0);
ok &= jsval_to_ulong(cx, args.get(1), &arg1);
ok &= jsval_to_size(cx, args.get(1), &arg1);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_multiplyProjectionMatrix : Error processing arguments");
cobj->multiplyProjectionMatrix(arg0, arg1);
args.rval().setUndefined();
@ -7947,9 +7947,9 @@ bool js_cocos2dx_Director_loadProjectionMatrix(JSContext *cx, uint32_t argc, jsv
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_loadProjectionMatrix : Invalid Native Object");
if (argc == 2) {
cocos2d::Mat4 arg0;
unsigned long arg1 = 0;
size_t arg1 = 0;
ok &= jsval_to_matrix(cx, args.get(0), &arg0);
ok &= jsval_to_ulong(cx, args.get(1), &arg1);
ok &= jsval_to_size(cx, args.get(1), &arg1);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_loadProjectionMatrix : Error processing arguments");
cobj->loadProjectionMatrix(arg0, arg1);
args.rval().setUndefined();
@ -7968,8 +7968,8 @@ bool js_cocos2dx_Director_initProjectionMatrixStack(JSContext *cx, uint32_t argc
cocos2d::Director* cobj = (cocos2d::Director *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Director_initProjectionMatrixStack : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Director_initProjectionMatrixStack : Error processing arguments");
cobj->initProjectionMatrixStack(arg0);
args.rval().setUndefined();
@ -18093,7 +18093,7 @@ bool js_cocos2dx_Properties_getPath(JSContext *cx, uint32_t argc, jsval *vp)
const char* arg0 = nullptr;
std::string* arg1 = nullptr;
std::string arg0_tmp; ok &= jsval_to_std_string(cx, args.get(0), &arg0_tmp); arg0 = arg0_tmp.c_str();
#pragma warning NO CONVERSION TO NATIVE FOR std::string*
#pragma warning NO CONVERSION TO NATIVE FOR basic_string*
ok = false;
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Properties_getPath : Error processing arguments");
bool ret = cobj->getPath(arg0, arg1);
@ -18889,13 +18889,13 @@ bool js_cocos2dx_FileUtils_getStringFromFile(JSContext *cx, uint32_t argc, jsval
std::string arg0;
ok &= jsval_to_std_string(cx, args.get(0), &arg0);
if (!ok) { ok = true; break; }
std::function<void (std::basic_string<char>)> arg1;
std::function<void (std::string)> arg1;
do {
if(JS_TypeOfValue(cx, args.get(1)) == JSTYPE_FUNCTION)
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(1), args.thisv()));
auto lambda = [=](std::basic_string<char> larg0) -> void {
auto lambda = [=](std::string larg0) -> void {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[1];
largv[0] = std_string_to_jsval(cx, larg0);
@ -20191,7 +20191,7 @@ bool js_cocos2dx_FileUtils_listFilesRecursively(JSContext *cx, uint32_t argc, js
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_FileUtils_listFilesRecursively : Invalid Native Object");
if (argc == 2) {
std::string arg0;
std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >* arg1 = nullptr;
std::vector<std::string>* arg1 = nullptr;
ok &= jsval_to_std_string(cx, args.get(0), &arg0);
do {
if (args.get(1).isNull()) { arg1 = nullptr; break; }
@ -20199,7 +20199,7 @@ bool js_cocos2dx_FileUtils_listFilesRecursively(JSContext *cx, uint32_t argc, js
js_proxy_t *jsProxy;
JS::RootedObject tmpObj(cx, args.get(1).toObjectOrNull());
jsProxy = jsb_get_js_proxy(tmpObj);
arg1 = (std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >*)(jsProxy ? jsProxy->ptr : NULL);
arg1 = (std::vector<std::string>*)(jsProxy ? jsProxy->ptr : NULL);
JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object");
} while (0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_FileUtils_listFilesRecursively : Error processing arguments");
@ -30959,9 +30959,9 @@ bool js_cocos2dx_ActionManager_getNumberOfRunningActionsInTargetByTag(JSContext
} while (0);
ok &= jsval_to_int32(cx, args.get(1), (int32_t *)&arg1);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ActionManager_getNumberOfRunningActionsInTargetByTag : Error processing arguments");
unsigned long ret = cobj->getNumberOfRunningActionsInTargetByTag(arg0, arg1);
size_t ret = cobj->getNumberOfRunningActionsInTargetByTag(arg0, arg1);
JS::RootedValue jsret(cx);
jsret = ulong_to_jsval(cx, ret);
jsret = size_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}
@ -41898,6 +41898,22 @@ bool js_cocos2dx_Menu_isEnabled(JSContext *cx, uint32_t argc, jsval *vp)
JS_ReportError(cx, "js_cocos2dx_Menu_isEnabled : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Menu_alignItemsHorizontally(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::Menu* cobj = (cocos2d::Menu *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Menu_alignItemsHorizontally : Invalid Native Object");
if (argc == 0) {
cobj->alignItemsHorizontally();
args.rval().setUndefined();
return true;
}
JS_ReportError(cx, "js_cocos2dx_Menu_alignItemsHorizontally : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Menu_alignItemsHorizontallyWithPadding(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@ -41938,22 +41954,6 @@ bool js_cocos2dx_Menu_alignItemsVerticallyWithPadding(JSContext *cx, uint32_t ar
JS_ReportError(cx, "js_cocos2dx_Menu_alignItemsVerticallyWithPadding : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Menu_alignItemsHorizontally(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::Menu* cobj = (cocos2d::Menu *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Menu_alignItemsHorizontally : Invalid Native Object");
if (argc == 0) {
cobj->alignItemsHorizontally();
args.rval().setUndefined();
return true;
}
JS_ReportError(cx, "js_cocos2dx_Menu_alignItemsHorizontally : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Menu_constructor(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@ -42008,9 +42008,9 @@ void js_register_cocos2dx_Menu(JSContext *cx, JS::HandleObject global) {
JS_FN("setEnabled", js_cocos2dx_Menu_setEnabled, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("alignItemsVertically", js_cocos2dx_Menu_alignItemsVertically, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("isEnabled", js_cocos2dx_Menu_isEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("alignItemsHorizontally", js_cocos2dx_Menu_alignItemsHorizontally, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("alignItemsHorizontallyWithPadding", js_cocos2dx_Menu_alignItemsHorizontallyWithPadding, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("alignItemsVerticallyWithPadding", js_cocos2dx_Menu_alignItemsVerticallyWithPadding, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("alignItemsHorizontally", js_cocos2dx_Menu_alignItemsHorizontally, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("ctor", js_cocos2dx_Menu_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END
};
@ -62956,9 +62956,9 @@ bool js_cocos2dx_TextFieldTTF_getCharCount(JSContext *cx, uint32_t argc, jsval *
cocos2d::TextFieldTTF* cobj = (cocos2d::TextFieldTTF *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_TextFieldTTF_getCharCount : Invalid Native Object");
if (argc == 0) {
unsigned long ret = cobj->getCharCount();
size_t ret = cobj->getCharCount();
JS::RootedValue jsret(cx);
jsret = ulong_to_jsval(cx, ret);
jsret = size_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}
@ -63309,8 +63309,8 @@ bool js_cocos2dx_TextFieldTTF_setCursorPosition(JSContext *cx, uint32_t argc, js
cocos2d::TextFieldTTF* cobj = (cocos2d::TextFieldTTF *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_TextFieldTTF_setCursorPosition : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_TextFieldTTF_setCursorPosition : Error processing arguments");
cobj->setCursorPosition(arg0);
args.rval().setUndefined();

2
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
View File

@ -2644,9 +2644,9 @@ bool js_cocos2dx_Menu_initWithArray(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_setEnabled(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_alignItemsVertically(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_isEnabled(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_alignItemsHorizontally(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_alignItemsHorizontallyWithPadding(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_alignItemsVerticallyWithPadding(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_alignItemsHorizontally(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Menu_Menu(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_cocos2d_MotionStreak_class;

2
cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
View File

@ -319,7 +319,7 @@ bool js_cocos2dx_experimental_webView_WebView_getOnShouldStartLoading(JSContext
cocos2d::experimental::ui::WebView* cobj = (cocos2d::experimental::ui::WebView *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_experimental_webView_WebView_getOnShouldStartLoading : Invalid Native Object");
if (argc == 0) {
std::function<bool (cocos2d::experimental::ui::WebView *, const std::basic_string<char> &)> ret = cobj->getOnShouldStartLoading();
std::function<bool (cocos2d::experimental::ui::WebView *, const std::string&)> ret = cobj->getOnShouldStartLoading();
JS::RootedValue jsret(cx);
#pragma warning NO CONVERSION FROM NATIVE FOR std::function;
args.rval().set(jsret);

8
cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
View File

@ -6731,13 +6731,13 @@ bool js_cocos2dx_extension_AssetsManagerEx_setVerifyCallback(JSContext *cx, uint
cocos2d::extension::AssetsManagerEx* cobj = (cocos2d::extension::AssetsManagerEx *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_AssetsManagerEx_setVerifyCallback : Invalid Native Object");
if (argc == 1) {
std::function<bool (const std::basic_string<char> &, cocos2d::extension::ManifestAsset)> arg0;
std::function<bool (const std::string&, cocos2d::extension::ManifestAsset)> arg0;
do {
if(JS_TypeOfValue(cx, args.get(0)) == JSTYPE_FUNCTION)
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(0), args.thisv()));
auto lambda = [=](const std::basic_string<char> & larg0, cocos2d::extension::ManifestAsset larg1) -> bool {
auto lambda = [=](const std::string& larg0, cocos2d::extension::ManifestAsset larg1) -> bool {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[2];
largv[0] = std_string_to_jsval(cx, larg0);
@ -6813,13 +6813,13 @@ bool js_cocos2dx_extension_AssetsManagerEx_setVersionCompareHandle(JSContext *cx
cocos2d::extension::AssetsManagerEx* cobj = (cocos2d::extension::AssetsManagerEx *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_AssetsManagerEx_setVersionCompareHandle : Invalid Native Object");
if (argc == 1) {
std::function<int (const std::basic_string<char> &, const std::basic_string<char> &)> arg0;
std::function<int (const std::string&, const std::string&)> arg0;
do {
if(JS_TypeOfValue(cx, args.get(0)) == JSTYPE_FUNCTION)
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(0), args.thisv()));
auto lambda = [=](const std::basic_string<char> & larg0, const std::basic_string<char> & larg1) -> int {
auto lambda = [=](const std::string& larg0, const std::string& larg1) -> int {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[2];
largv[0] = std_string_to_jsval(cx, larg0);

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

@ -32,13 +32,13 @@ bool js_cocos2dx_network_Downloader_setOnTaskError(JSContext *cx, uint32_t argc,
cocos2d::network::Downloader* cobj = (cocos2d::network::Downloader *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_network_Downloader_setOnTaskError : Invalid Native Object");
if (argc == 1) {
std::function<void (const cocos2d::network::DownloadTask &, int, int, const std::basic_string<char> &)> arg0;
std::function<void (const cocos2d::network::DownloadTask &, int, int, const std::string&)> arg0;
do {
if(JS_TypeOfValue(cx, args.get(0)) == JSTYPE_FUNCTION)
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(0), args.thisv()));
auto lambda = [=](const cocos2d::network::DownloadTask & larg0, int larg1, int larg2, const std::basic_string<char> & larg3) -> void {
auto lambda = [=](const cocos2d::network::DownloadTask & larg0, int larg1, int larg2, const std::string& larg3) -> void {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[4];
largv[0] = downloadTask_to_jsval(cx, larg0);

40
cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
View File

@ -10888,7 +10888,7 @@ bool js_cocos2dx_ui_UICCTextField_onTextFieldDeleteBackward(JSContext *cx, uint3
if (argc == 3) {
cocos2d::TextFieldTTF* arg0 = nullptr;
const char* arg1 = nullptr;
unsigned long arg2 = 0;
size_t arg2 = 0;
do {
if (args.get(0).isNull()) { arg0 = nullptr; break; }
if (!args.get(0).isObject()) { ok = false; break; }
@ -10899,7 +10899,7 @@ bool js_cocos2dx_ui_UICCTextField_onTextFieldDeleteBackward(JSContext *cx, uint3
JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object");
} while (0);
std::string arg1_tmp; ok &= jsval_to_std_string(cx, args.get(1), &arg1_tmp); arg1 = arg1_tmp.c_str();
ok &= jsval_to_ulong(cx, args.get(2), &arg2);
ok &= jsval_to_size(cx, args.get(2), &arg2);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_UICCTextField_onTextFieldDeleteBackward : Error processing arguments");
bool ret = cobj->onTextFieldDeleteBackward(arg0, arg1, arg2);
JS::RootedValue jsret(cx);
@ -10975,9 +10975,9 @@ bool js_cocos2dx_ui_UICCTextField_getCharCount(JSContext *cx, uint32_t argc, jsv
cocos2d::ui::UICCTextField* cobj = (cocos2d::ui::UICCTextField *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_UICCTextField_getCharCount : Invalid Native Object");
if (argc == 0) {
unsigned long ret = cobj->getCharCount();
size_t ret = cobj->getCharCount();
JS::RootedValue jsret(cx);
jsret = ulong_to_jsval(cx, ret);
jsret = size_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}
@ -11069,9 +11069,9 @@ bool js_cocos2dx_ui_UICCTextField_insertText(JSContext *cx, uint32_t argc, jsval
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_UICCTextField_insertText : Invalid Native Object");
if (argc == 2) {
const char* arg0 = nullptr;
unsigned long arg1 = 0;
size_t arg1 = 0;
std::string arg0_tmp; ok &= jsval_to_std_string(cx, args.get(0), &arg0_tmp); arg0 = arg0_tmp.c_str();
ok &= jsval_to_ulong(cx, args.get(1), &arg1);
ok &= jsval_to_size(cx, args.get(1), &arg1);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_UICCTextField_insertText : Error processing arguments");
cobj->insertText(arg0, arg1);
args.rval().setUndefined();
@ -11112,7 +11112,7 @@ bool js_cocos2dx_ui_UICCTextField_onTextFieldInsertText(JSContext *cx, uint32_t
if (argc == 3) {
cocos2d::TextFieldTTF* arg0 = nullptr;
const char* arg1 = nullptr;
unsigned long arg2 = 0;
size_t arg2 = 0;
do {
if (args.get(0).isNull()) { arg0 = nullptr; break; }
if (!args.get(0).isObject()) { ok = false; break; }
@ -11123,7 +11123,7 @@ bool js_cocos2dx_ui_UICCTextField_onTextFieldInsertText(JSContext *cx, uint32_t
JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object");
} while (0);
std::string arg1_tmp; ok &= jsval_to_std_string(cx, args.get(1), &arg1_tmp); arg1 = arg1_tmp.c_str();
ok &= jsval_to_ulong(cx, args.get(2), &arg2);
ok &= jsval_to_size(cx, args.get(2), &arg2);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_UICCTextField_onTextFieldInsertText : Error processing arguments");
bool ret = cobj->onTextFieldInsertText(arg0, arg1, arg2);
JS::RootedValue jsret(cx);
@ -11952,8 +11952,8 @@ bool js_cocos2dx_ui_TextField_setCursorPosition(JSContext *cx, uint32_t argc, js
cocos2d::ui::TextField* cobj = (cocos2d::ui::TextField *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_TextField_setCursorPosition : Invalid Native Object");
if (argc == 1) {
unsigned long arg0 = 0;
ok &= jsval_to_ulong(cx, args.get(0), &arg0);
size_t arg0 = 0;
ok &= jsval_to_size(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_TextField_setCursorPosition : Error processing arguments");
cobj->setCursorPosition(arg0);
args.rval().setUndefined();
@ -13542,11 +13542,11 @@ bool js_cocos2dx_ui_Helper_getSubStringOfUTF8String(JSContext *cx, uint32_t argc
bool ok = true;
if (argc == 3) {
std::string arg0;
unsigned long arg1 = 0;
unsigned long arg2 = 0;
unsigned int arg1 = 0;
unsigned int arg2 = 0;
ok &= jsval_to_std_string(cx, args.get(0), &arg0);
ok &= jsval_to_ulong(cx, args.get(1), &arg1);
ok &= jsval_to_ulong(cx, args.get(2), &arg2);
ok &= jsval_to_uint32(cx, args.get(1), &arg1);
ok &= jsval_to_uint32(cx, args.get(2), &arg2);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_ui_Helper_getSubStringOfUTF8String : Error processing arguments");
std::string ret = cocos2d::ui::Helper::getSubStringOfUTF8String(arg0, arg1, arg2);
@ -15500,7 +15500,7 @@ bool js_cocos2dx_ui_RichText_initWithXML(JSContext *cx, uint32_t argc, jsval *vp
if (argc == 3) {
std::string arg0;
cocos2d::ValueMap arg1;
std::function<void (const std::basic_string<char> &)> arg2;
std::function<void (const std::string&)> arg2;
ok &= jsval_to_std_string(cx, args.get(0), &arg0);
ok &= jsval_to_ccvaluemap(cx, args.get(1), &arg1);
do {
@ -15508,7 +15508,7 @@ bool js_cocos2dx_ui_RichText_initWithXML(JSContext *cx, uint32_t argc, jsval *vp
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(2), args.thisv()));
auto lambda = [=](const std::basic_string<char> & larg0) -> void {
auto lambda = [=](const std::string& larg0) -> void {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[1];
largv[0] = std_string_to_jsval(cx, larg0);
@ -16124,7 +16124,7 @@ bool js_cocos2dx_ui_RichText_createWithXML(JSContext *cx, uint32_t argc, jsval *
if (argc == 3) {
std::string arg0;
cocos2d::ValueMap arg1;
std::function<void (const std::basic_string<char> &)> arg2;
std::function<void (const std::string&)> arg2;
ok &= jsval_to_std_string(cx, args.get(0), &arg0);
ok &= jsval_to_ccvaluemap(cx, args.get(1), &arg1);
do {
@ -16132,7 +16132,7 @@ bool js_cocos2dx_ui_RichText_createWithXML(JSContext *cx, uint32_t argc, jsval *
{
JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull());
std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, jstarget, args.get(2), args.thisv()));
auto lambda = [=](const std::basic_string<char> & larg0) -> void {
auto lambda = [=](const std::string& larg0) -> void {
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
jsval largv[1];
largv[0] = std_string_to_jsval(cx, larg0);
@ -20278,9 +20278,9 @@ bool js_cocos2dx_ui_TabControl_getTabCount(JSContext *cx, uint32_t argc, jsval *
cocos2d::ui::TabControl* cobj = (cocos2d::ui::TabControl *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_TabControl_getTabCount : Invalid Native Object");
if (argc == 0) {
unsigned long ret = cobj->getTabCount();
size_t ret = cobj->getTabCount();
JS::RootedValue jsret(cx);
jsret = ulong_to_jsval(cx, ret);
jsret = size_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}

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

@ -162,7 +162,7 @@
-- @param self
-- @param #cc.Node target
-- @param #int tag
-- @return unsigned long#unsigned long ret (return value: unsigned long)
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
-- js ctor

12
cocos/scripting/lua-bindings/auto/api/Director.lua
View File

@ -17,7 +17,7 @@
-- js NA
-- @function [parent=#Director] pushProjectionMatrix
-- @param self
-- @param #unsigned long index
-- @param #unsigned int index
-- @return Director#Director self (return value: cc.Director)
--------------------------------
@ -26,7 +26,7 @@
-- js NA
-- @function [parent=#Director] popProjectionMatrix
-- @param self
-- @param #unsigned long index
-- @param #unsigned int index
-- @return Director#Director self (return value: cc.Director)
--------------------------------
@ -44,7 +44,7 @@
-- js NA
-- @function [parent=#Director] loadProjectionIdentityMatrix
-- @param self
-- @param #unsigned long index
-- @param #unsigned int index
-- @return Director#Director self (return value: cc.Director)
--------------------------------
@ -239,7 +239,7 @@
-- @function [parent=#Director] multiplyProjectionMatrix
-- @param self
-- @param #mat4_table mat
-- @param #unsigned long index
-- @param #unsigned int index
-- @return Director#Director self (return value: cc.Director)
--------------------------------
@ -480,7 +480,7 @@
-- @function [parent=#Director] loadProjectionMatrix
-- @param self
-- @param #mat4_table mat
-- @param #unsigned long index
-- @param #unsigned int index
-- @return Director#Director self (return value: cc.Director)
--------------------------------
@ -489,7 +489,7 @@
-- js NA
-- @function [parent=#Director] initProjectionMatrixStack
-- @param self
-- @param #unsigned long stackCount
-- @param #unsigned int stackCount
-- @return Director#Director self (return value: cc.Director)
--------------------------------

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

@ -122,7 +122,7 @@
-- return True if dispatching events is exist
-- @function [parent=#EventDispatcher] hasEventListener
-- @param self
-- @param #std::basic_string<char> listenerID
-- @param #string listenerID
-- @return bool#bool ret (return value: bool)
--------------------------------

4
cocos/scripting/lua-bindings/auto/api/Helper.lua
View File

@ -14,8 +14,8 @@
-- @function [parent=#Helper] getSubStringOfUTF8String
-- @param self
-- @param #string str
-- @param #unsigned long start
-- @param #unsigned long length
-- @param #unsigned int start
-- @param #unsigned int length
-- @return string#string ret (return value: string)
--------------------------------

12
cocos/scripting/lua-bindings/auto/api/Menu.lua
View File

@ -35,6 +35,12 @@
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Align items horizontally.
-- @function [parent=#Menu] alignItemsHorizontally
-- @param self
-- @return Menu#Menu self (return value: cc.Menu)
--------------------------------
-- Align items horizontally with padding.<br>
-- since v0.7.2
@ -51,12 +57,6 @@
-- @param #float padding
-- @return Menu#Menu self (return value: cc.Menu)
--------------------------------
-- Align items horizontally.
-- @function [parent=#Menu] alignItemsHorizontally
-- @param self
-- @return Menu#Menu self (return value: cc.Menu)
--------------------------------
-- @overload self, cc.Node, int
-- @overload self, cc.Node

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

@ -25,7 +25,7 @@
-- return the count of tabs
-- @function [parent=#TabControl] getTabCount
-- @param self
-- @return unsigned long#unsigned long ret (return value: unsigned long)
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
--

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

@ -207,7 +207,7 @@
-- js NA
-- @function [parent=#TextField] setCursorPosition
-- @param self
-- @param #unsigned long cursorPosition
-- @param #unsigned int cursorPosition
-- @return TextField#TextField self (return value: ccui.TextField)
--------------------------------

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
View File

@ -5327,7 +5327,7 @@ int lua_cocos2dx_3d_Terrain_getHeightData(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Terrain_getHeightData'", nullptr);
return 0;
}
std::vector<float, std::allocator<float> > ret = cobj->getHeightData();
std::vector<float> ret = cobj->getHeightData();
ccvector_float_to_luaval(tolua_S, ret);
return 1;
}

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

@ -13531,9 +13531,9 @@ int lua_cocos2dx_Director_pushProjectionMatrix(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
unsigned long arg0;
unsigned int arg0;
ok &= luaval_to_ulong(tolua_S, 2, &arg0, "cc.Director:pushProjectionMatrix");
ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Director:pushProjectionMatrix");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_pushProjectionMatrix'", nullptr);
@ -13581,9 +13581,9 @@ int lua_cocos2dx_Director_popProjectionMatrix(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
unsigned long arg0;
unsigned int arg0;
ok &= luaval_to_ulong(tolua_S, 2, &arg0, "cc.Director:popProjectionMatrix");
ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Director:popProjectionMatrix");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_popProjectionMatrix'", nullptr);
@ -13681,9 +13681,9 @@ int lua_cocos2dx_Director_loadProjectionIdentityMatrix(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
unsigned long arg0;
unsigned int arg0;
ok &= luaval_to_ulong(tolua_S, 2, &arg0, "cc.Director:loadProjectionIdentityMatrix");
ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Director:loadProjectionIdentityMatrix");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_loadProjectionIdentityMatrix'", nullptr);
@ -14938,11 +14938,11 @@ int lua_cocos2dx_Director_multiplyProjectionMatrix(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::Mat4 arg0;
unsigned long arg1;
unsigned int arg1;
ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.Director:multiplyProjectionMatrix");
ok &= luaval_to_ulong(tolua_S, 3, &arg1, "cc.Director:multiplyProjectionMatrix");
ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Director:multiplyProjectionMatrix");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_multiplyProjectionMatrix'", nullptr);
@ -16440,11 +16440,11 @@ int lua_cocos2dx_Director_loadProjectionMatrix(lua_State* tolua_S)
if (argc == 2)
{
cocos2d::Mat4 arg0;
unsigned long arg1;
unsigned int arg1;
ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.Director:loadProjectionMatrix");
ok &= luaval_to_ulong(tolua_S, 3, &arg1, "cc.Director:loadProjectionMatrix");
ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Director:loadProjectionMatrix");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_loadProjectionMatrix'", nullptr);
@ -16492,9 +16492,9 @@ int lua_cocos2dx_Director_initProjectionMatrixStack(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
unsigned long arg0;
unsigned int arg0;
ok &= luaval_to_ulong(tolua_S, 2, &arg0, "cc.Director:initProjectionMatrixStack");
ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Director:initProjectionMatrixStack");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_initProjectionMatrixStack'", nullptr);
@ -30661,7 +30661,7 @@ int lua_cocos2dx_Properties_getPath(lua_State* tolua_S)
std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Properties:getPath"); arg0 = arg0_tmp.c_str();
#pragma warning NO CONVERSION TO NATIVE FOR std::string*
#pragma warning NO CONVERSION TO NATIVE FOR basic_string*
ok = false;
if(!ok)
{
@ -32737,7 +32737,7 @@ int lua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile");
if (!ok) { break; }
std::function<void (std::basic_string<char>)> arg1;
std::function<void (std::string)> arg1;
do {
// Lambda binding for lua is not supported.
assert(false);
@ -32915,7 +32915,7 @@ int lua_cocos2dx_FileUtils_listFilesRecursivelyAsync(lua_State* tolua_S)
if (argc == 2)
{
std::string arg0;
std::function<void (std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >)> arg1;
std::function<void (std::vector<std::string>)> arg1;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursivelyAsync");
@ -34844,7 +34844,7 @@ int lua_cocos2dx_FileUtils_listFilesAsync(lua_State* tolua_S)
if (argc == 2)
{
std::string arg0;
std::function<void (std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >)> arg1;
std::function<void (std::vector<std::string>)> arg1;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesAsync");
@ -34948,11 +34948,11 @@ int lua_cocos2dx_FileUtils_listFilesRecursively(lua_State* tolua_S)
if (argc == 2)
{
std::string arg0;
std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >* arg1;
std::vector<std::string>* arg1;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursively");
ok &= luaval_to_object<std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >>(tolua_S, 3, "std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >*",&arg1, "cc.FileUtils:listFilesRecursively");
ok &= luaval_to_object<std::vector<std::string>>(tolua_S, 3, "std::vector<std::string>*",&arg1, "cc.FileUtils:listFilesRecursively");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_listFilesRecursively'", nullptr);
@ -48451,7 +48451,7 @@ int lua_cocos2dx_ActionManager_getNumberOfRunningActionsInTargetByTag(lua_State*
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ActionManager_getNumberOfRunningActionsInTargetByTag'", nullptr);
return 0;
}
unsigned long ret = cobj->getNumberOfRunningActionsInTargetByTag(arg0, arg1);
unsigned int ret = cobj->getNumberOfRunningActionsInTargetByTag(arg0, arg1);
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -63879,6 +63879,53 @@ int lua_cocos2dx_Menu_isEnabled(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Menu_alignItemsHorizontally(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Menu* 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.Menu",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Menu*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Menu_alignItemsHorizontally'", 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_Menu_alignItemsHorizontally'", nullptr);
return 0;
}
cobj->alignItemsHorizontally();
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontally",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Menu_alignItemsHorizontally'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Menu_alignItemsHorizontallyWithPadding(lua_State* tolua_S)
{
int argc = 0;
@ -63979,53 +64026,6 @@ int lua_cocos2dx_Menu_alignItemsVerticallyWithPadding(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Menu_alignItemsHorizontally(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Menu* 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.Menu",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Menu*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Menu_alignItemsHorizontally'", 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_Menu_alignItemsHorizontally'", nullptr);
return 0;
}
cobj->alignItemsHorizontally();
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontally",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Menu_alignItemsHorizontally'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Menu_constructor(lua_State* tolua_S)
{
int argc = 0;
@ -64080,9 +64080,9 @@ int lua_register_cocos2dx_Menu(lua_State* tolua_S)
tolua_function(tolua_S,"setEnabled",lua_cocos2dx_Menu_setEnabled);
tolua_function(tolua_S,"alignItemsVertically",lua_cocos2dx_Menu_alignItemsVertically);
tolua_function(tolua_S,"isEnabled",lua_cocos2dx_Menu_isEnabled);
tolua_function(tolua_S,"alignItemsHorizontally",lua_cocos2dx_Menu_alignItemsHorizontally);
tolua_function(tolua_S,"alignItemsHorizontallyWithPadding",lua_cocos2dx_Menu_alignItemsHorizontallyWithPadding);
tolua_function(tolua_S,"alignItemsVerticallyWithPadding",lua_cocos2dx_Menu_alignItemsVerticallyWithPadding);
tolua_function(tolua_S,"alignItemsHorizontally",lua_cocos2dx_Menu_alignItemsHorizontally);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Menu).name();
g_luaType[typeName] = "cc.Menu";
@ -78571,7 +78571,7 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile");
if (!ok) { break; }
std::function<void (cocos2d::RenderTexture *, const std::basic_string<char> &)> arg3;
std::function<void (cocos2d::RenderTexture *, const std::string&)> arg3;
do {
// Lambda binding for lua is not supported.
assert(false);
@ -78623,7 +78623,7 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile");
if (!ok) { break; }
std::function<void (cocos2d::RenderTexture *, const std::basic_string<char> &)> arg2;
std::function<void (cocos2d::RenderTexture *, const std::string&)> arg2;
do {
// Lambda binding for lua is not supported.
assert(false);

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

@ -12744,7 +12744,7 @@ int lua_cocos2dx_extension_AssetsManagerEx_setVerifyCallback(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
std::function<bool (const std::basic_string<char> &, cocos2d::extension::ManifestAsset)> arg0;
std::function<bool (const std::string&, cocos2d::extension::ManifestAsset)> arg0;
do {
// Lambda binding for lua is not supported.
@ -12892,7 +12892,7 @@ int lua_cocos2dx_extension_AssetsManagerEx_setVersionCompareHandle(lua_State* to
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
std::function<int (const std::basic_string<char> &, const std::basic_string<char> &)> arg0;
std::function<int (const std::string&, const std::string&)> arg0;
do {
// Lambda binding for lua is not supported.

6
cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
View File

@ -433,7 +433,7 @@ int lua_cocos2dx_studio_ActionFrame_setEasingParameter(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
std::vector<float, std::allocator<float> > arg0;
std::vector<float> arg0;
ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0, "ccs.ActionFrame:setEasingParameter");
if(!ok)
@ -16267,7 +16267,7 @@ int lua_cocos2dx_studio_Frame_getEasingParams(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Frame_getEasingParams'", nullptr);
return 0;
}
const std::vector<float, std::allocator<float> >& ret = cobj->getEasingParams();
const std::vector<float>& ret = cobj->getEasingParams();
ccvector_float_to_luaval(tolua_S, ret);
return 1;
}
@ -16309,7 +16309,7 @@ int lua_cocos2dx_studio_Frame_setEasingParams(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
std::vector<float, std::allocator<float> > arg0;
std::vector<float> arg0;
ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0, "ccs.Frame:setEasingParams");
if(!ok)

18
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
View File

@ -22872,9 +22872,9 @@ int lua_cocos2dx_ui_TextField_setCursorPosition(lua_State* tolua_S)
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
unsigned long arg0;
unsigned int arg0;
ok &= luaval_to_ulong(tolua_S, 2, &arg0, "ccui.TextField:setCursorPosition");
ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccui.TextField:setCursorPosition");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setCursorPosition'", nullptr);
@ -26045,11 +26045,11 @@ int lua_cocos2dx_ui_Helper_getSubStringOfUTF8String(lua_State* tolua_S)
if (argc == 3)
{
std::string arg0;
unsigned long arg1;
unsigned long arg2;
unsigned int arg1;
unsigned int arg2;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Helper:getSubStringOfUTF8String");
ok &= luaval_to_ulong(tolua_S, 3, &arg1, "ccui.Helper:getSubStringOfUTF8String");
ok &= luaval_to_ulong(tolua_S, 4, &arg2, "ccui.Helper:getSubStringOfUTF8String");
ok &= luaval_to_uint32(tolua_S, 3,&arg1, "ccui.Helper:getSubStringOfUTF8String");
ok &= luaval_to_uint32(tolua_S, 4,&arg2, "ccui.Helper:getSubStringOfUTF8String");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Helper_getSubStringOfUTF8String'", nullptr);
@ -28941,7 +28941,7 @@ int lua_cocos2dx_ui_RichText_initWithXML(lua_State* tolua_S)
{
std::string arg0;
cocos2d::ValueMap arg1;
std::function<void (const std::basic_string<char> &)> arg2;
std::function<void (const std::string&)> arg2;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:initWithXML");
@ -30393,7 +30393,7 @@ int lua_cocos2dx_ui_RichText_createWithXML(lua_State* tolua_S)
{
std::string arg0;
cocos2d::ValueMap arg1;
std::function<void (const std::basic_string<char> &)> arg2;
std::function<void (const std::string&)> arg2;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:createWithXML");
ok &= luaval_to_ccvaluemap(tolua_S, 3, &arg1, "ccui.RichText:createWithXML");
do {
@ -38209,7 +38209,7 @@ int lua_cocos2dx_ui_TabControl_getTabCount(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TabControl_getTabCount'", nullptr);
return 0;
}
unsigned long ret = cobj->getTabCount();
unsigned int ret = cobj->getTabCount();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}

3
templates/cocos2dx_files.json
View File

@ -5745,9 +5745,6 @@
"external/lua/tolua/tolua_to.c",
"tools/bindings-generator/AUTHORS",
"tools/bindings-generator/README.md",
"tools/bindings-generator/backup/clang-llvm-3.3-pybinding/__init__.py",
"tools/bindings-generator/backup/clang-llvm-3.3-pybinding/cindex.py",
"tools/bindings-generator/backup/clang-llvm-3.3-pybinding/enumerations.py",
"tools/bindings-generator/clang/__init__.py",
"tools/bindings-generator/clang/cindex.py",
"tools/bindings-generator/clang/enumerations.py",