Skip to content

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #19431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2019
Merged

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #19431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cocos/scripting/lua-bindings/auto/api/Application.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@
-- @return string#string ret (return value: string)

--------------------------------
-- @overload self, float, int
-- @overload self, float
-- @function [parent=#Application] setAnimationInterval
-- brief Callback by Director to limit FPS.<br>
-- param interval The time, expressed in seconds, between current frame and next.
-- @function [parent=#Application] setAnimationInterval
-- @param self
-- @param #float interval
-- @param #int reason
-- @return Application#Application self (return value: cc.Application)

--------------------------------
-- brief Get current application instance.<br>
-- return Current application instance pointer.
Expand Down
47 changes: 19 additions & 28 deletions cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95150,51 +95150,42 @@ int lua_cocos2dx_Application_setAnimationInterval(lua_State* tolua_S)
int argc = 0;
cocos2d::Application* 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.Application",0,&tolua_err)) goto tolua_lerror;
#endif

cobj = (cocos2d::Application*)tolua_tousertype(tolua_S,1,0);

#if COCOS2D_DEBUG >= 1
if (!cobj)
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Application_setAnimationInterval'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
do{
if (argc == 2) {
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Application:setAnimationInterval");

if (!ok) { break; }
cocos2d::SetIntervalReason arg1;
ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Application:setAnimationInterval");

if (!ok) { break; }
cobj->setAnimationInterval(arg0, arg1);
lua_settop(tolua_S, 1);
return 1;
}
}while(0);
ok = true;
do{
if (argc == 1) {
double arg0;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Application:setAnimationInterval");
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
double arg0;

if (!ok) { break; }
cobj->setAnimationInterval(arg0);
lua_settop(tolua_S, 1);
return 1;
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Application:setAnimationInterval");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Application_setAnimationInterval'", nullptr);
return 0;
}
}while(0);
ok = true;
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:setAnimationInterval",argc, 1);
cobj->setAnimationInterval(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:setAnimationInterval",argc, 1);
return 0;

#if COCOS2D_DEBUG >= 1
Expand Down
67 changes: 0 additions & 67 deletions templates/cocos2dx_files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,6 @@
"cocos/platform/android/java/ant.properties",
"cocos/platform/android/java/build.xml",
"cocos/platform/android/java/libs/",
"cocos/platform/android/java/libs/EngineDataManager.jar",
"cocos/platform/android/java/libs/android-async-http-1.4.9.jar",
"cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar",
"cocos/platform/android/java/libs/httpclient-4.4.1.1.jar",
Expand All @@ -1048,7 +1047,6 @@
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxDownloader.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBox.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxHelper.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEngineDataManager.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java",
"cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java",
Expand All @@ -1074,15 +1072,11 @@
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.cpp",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.h",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h",
"cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp",
"cocos/platform/android/jni/JniHelper.cpp",
"cocos/platform/android/jni/JniHelper.h",
"cocos/platform/android/jni/ProcessCpuTracker.cpp",
"cocos/platform/android/jni/ProcessCpuTracker.h",
"cocos/platform/android/jni/TouchesJni.cpp",
"cocos/platform/android/libcocos2dx-with-controller/AndroidManifest.xml",
"cocos/platform/android/libcocos2dx-with-controller/build.gradle",
Expand Down Expand Up @@ -1136,18 +1130,6 @@
"cocos/platform/mac/CCPlatformDefine-mac.h",
"cocos/platform/mac/CCStdC-mac.h",
"cocos/platform/mac/cocos2d-prefix.pch",
"cocos/platform/tizen/CCApplication-tizen.cpp",
"cocos/platform/tizen/CCApplication-tizen.h",
"cocos/platform/tizen/CCCommon-tizen.cpp",
"cocos/platform/tizen/CCDevice-tizen.cpp",
"cocos/platform/tizen/CCFileUtils-tizen.cpp",
"cocos/platform/tizen/CCFileUtils-tizen.h",
"cocos/platform/tizen/CCGL-tizen.h",
"cocos/platform/tizen/CCGLViewImpl-tizen.cpp",
"cocos/platform/tizen/CCGLViewImpl-tizen.h",
"cocos/platform/tizen/CCPlatformDefine-tizen.h",
"cocos/platform/tizen/CCStdC-tizen.cpp",
"cocos/platform/tizen/CCStdC-tizen.h",
"cocos/platform/win32/CCApplication-win32.cpp",
"cocos/platform/win32/CCApplication-win32.h",
"cocos/platform/win32/CCCommon-win32.cpp",
Expand All @@ -1163,55 +1145,6 @@
"cocos/platform/win32/compat/stdint.h",
"cocos/platform/win32/inet_pton_mingw.cpp",
"cocos/platform/win32/inet_pton_mingw.h",
"cocos/platform/win8.1-universal/Cocos2dRenderer.cpp",
"cocos/platform/win8.1-universal/Cocos2dRenderer.h",
"cocos/platform/win8.1-universal/OpenGLES.cpp",
"cocos/platform/win8.1-universal/OpenGLES.h",
"cocos/platform/win8.1-universal/OpenGLESPage.xaml",
"cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp",
"cocos/platform/win8.1-universal/OpenGLESPage.xaml.h",
"cocos/platform/win8.1-universal/cocos2d-js/pch.h",
"cocos/platform/win8.1-universal/pch.cpp",
"cocos/platform/win8.1-universal/pch.h",
"cocos/platform/winrt/CCApplication.cpp",
"cocos/platform/winrt/CCApplication.h",
"cocos/platform/winrt/CCCommon.cpp",
"cocos/platform/winrt/CCDevice.cpp",
"cocos/platform/winrt/CCFileUtilsWinRT.cpp",
"cocos/platform/winrt/CCFileUtilsWinRT.h",
"cocos/platform/winrt/CCFreeTypeFont.cpp",
"cocos/platform/winrt/CCFreeTypeFont.h",
"cocos/platform/winrt/CCGL.h",
"cocos/platform/winrt/CCGLViewImpl-winrt.cpp",
"cocos/platform/winrt/CCGLViewImpl-winrt.h",
"cocos/platform/winrt/CCGLViewImpl.cpp",
"cocos/platform/winrt/CCGLViewImpl.h",
"cocos/platform/winrt/CCPThreadWinRT.cpp",
"cocos/platform/winrt/CCPThreadWinRT.h",
"cocos/platform/winrt/CCPlatformDefine-winrt.h",
"cocos/platform/winrt/CCPrecompiledShaders.cpp",
"cocos/platform/winrt/CCPrecompiledShaders.h",
"cocos/platform/winrt/CCStdC.cpp",
"cocos/platform/winrt/CCStdC.h",
"cocos/platform/winrt/CCWinRTUtils.cpp",
"cocos/platform/winrt/CCWinRTUtils.h",
"cocos/platform/winrt/InputEvent.cpp",
"cocos/platform/winrt/InputEvent.h",
"cocos/platform/winrt/InputEventTypes.h",
"cocos/platform/winrt/Keyboard-winrt.cpp",
"cocos/platform/winrt/Keyboard-winrt.h",
"cocos/platform/winrt/WICImageLoader-winrt.cpp",
"cocos/platform/winrt/WICImageLoader-winrt.h",
"cocos/platform/winrt/inet_ntop_winrt.cpp",
"cocos/platform/winrt/inet_ntop_winrt.h",
"cocos/platform/winrt/inet_pton_winrt.cpp",
"cocos/platform/winrt/inet_pton_winrt.h",
"cocos/platform/winrt/pch.cpp",
"cocos/platform/winrt/pch.h",
"cocos/platform/winrt/sha1.cpp",
"cocos/platform/winrt/sha1.h",
"cocos/platform/winrt/shaders/precompiledshaders.h",
"cocos/platform/winrt/targetver.h",
"cocos/precheader.cpp",
"cocos/precheader.h",
"cocos/renderer/CCBatchCommand.cpp",
Expand Down