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

Merge pull request #15285 from CocosRobot/update_lua_bindings_1458564868 

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
zilongshanren 2016-03-21 21:40:26 +08:00
parent 8389badc9d 97130dc084
commit 937ccf51b1
30 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "jsb_cocos2dx_3d_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "cocos2d.h"
#include "3d/CCBundle3D.h"
#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h"
#include "CCBundle3D.h"
#include "3d/jsb_cocos2dx_3d_manual.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,5 +1,5 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "jsb_cocos2dx_3d_extension_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "cocos-ext.h"
template<class T>

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

@ -1,7 +1,7 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp"
#include "jsb_cocos2dx_audioengine_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "audio/include/AudioEngine.h"
#include "cocos2d_specifics.hpp"
#include "AudioEngine.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,10 +1,10 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "jsb_cocos2dx_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "cocos2d.h"
#include "audio/include/SimpleAudioEngine.h"
#include "2d/CCProtectedNode.h"
#include "base/CCAsyncTaskPool.h"
#include "scripting/js-bindings/manual/component/CCComponentJS.h"
#include "SimpleAudioEngine.h"
#include "CCProtectedNode.h"
#include "CCAsyncTaskPool.h"
#include "component/CCComponentJS.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

6
cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp
View File

@ -1,6 +1,6 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "editor-support/cocosbuilder/CocosBuilder.h"
#include "jsb_cocos2dx_builder_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "CocosBuilder.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

6
cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
View File

@ -1,7 +1,7 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp"
#include "jsb_cocos2dx_experimental_video_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "ui/UIVideoPlayer.h"
#include "cocos2d_specifics.hpp"
#include "UIVideoPlayer.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,7 +1,7 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp"
#include "jsb_cocos2dx_experimental_webView_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "ui/UIWebView.h"
#include "cocos2d_specifics.hpp"
#include "UIWebView.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,5 +1,5 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "jsb_cocos2dx_extension_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "cocos-ext.h"
template<class T>

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

@ -1,8 +1,8 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp"
#include "jsb_cocos2dx_navmesh_auto.hpp"
#if CC_USE_NAVMESH
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "navmesh/CCNavMesh.h"
#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.h"
#include "cocos2d_specifics.hpp"
#include "CCNavMesh.h"
#include "navmesh/jsb_cocos2dx_navmesh_conversions.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,8 +1,8 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp"
#include "jsb_cocos2dx_physics3d_auto.hpp"
#if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "physics3d/CCPhysics3D.h"
#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h"
#include "cocos2d_specifics.hpp"
#include "CCPhysics3D.h"
#include "physics3d/jsb_cocos2dx_physics3d_manual.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,7 +1,7 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "editor-support/spine/spine-cocos2dx.h"
#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h"
#include "jsb_cocos2dx_spine_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "spine-cocos2dx.h"
#include "jsb_cocos2dx_spine_manual.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

10
cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "editor-support/cocostudio/CocoStudio.h"
#include "editor-support/cocostudio/CCComExtensionData.h"
#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.h"
#include "jsb_cocos2dx_studio_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "CocoStudio.h"
#include "CCComExtensionData.h"
#include "jsb_cocos2dx_studio_conversions.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,7 +1,7 @@
#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp"
#include "scripting/js-bindings/manual/cocos2d_specifics.hpp"
#include "ui/CocosGUI.h"
#include "ui/UIScrollViewBar.h"
#include "jsb_cocos2dx_ui_auto.hpp"
#include "cocos2d_specifics.hpp"
#include "CocosGUI.h"
#include "UIScrollViewBar.h"
template<class T>
static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp)

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

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp"
#include "lua_cocos2dx_3d_auto.hpp"
#include "cocos2d.h"
#include "3d/CCBundle3D.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "CCBundle3D.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_3d_Animation3D_initWithFile(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.hpp"
#include "lua_cocos2dx_audioengine_auto.hpp"
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#include "audio/include/AudioEngine.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "AudioEngine.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_audioengine_AudioProfile_constructor(lua_State* tolua_S)

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

@ -1,10 +1,10 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp"
#include "lua_cocos2dx_auto.hpp"
#include "cocos2d.h"
#include "2d/CCProtectedNode.h"
#include "base/CCAsyncTaskPool.h"
#include "scripting/lua-bindings/manual/CCComponentLua.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "CCProtectedNode.h"
#include "CCAsyncTaskPool.h"
#include "CCComponentLua.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_Ref_release(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp
View File

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp"
#include "editor-support/cocosbuilder/CocosBuilder.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_cocosbuilder_auto.hpp"
#include "CocosBuilder.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp
View File

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp"
#include "audio/include/SimpleAudioEngine.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_cocosdenshion_auto.hpp"
#include "SimpleAudioEngine.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp"
#include "lua_cocos2dx_controller_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "base/CCGameController.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "CCGameController.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_controller_Controller_receiveExternalKeyEvent(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp
View File

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.hpp"
#include "editor-support/cocostudio/ActionTimeline/CSLoader.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_csloader_auto.hpp"
#include "CSLoader.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_csloader_CSLoader_createNodeFromJson(lua_State* tolua_S)

10
cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp"
#include "2d/CCFastTMXLayer.h"
#include "2d/CCFastTMXTiledMap.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_experimental_auto.hpp"
#include "CCFastTMXLayer.h"
#include "CCFastTMXTiledMap.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_experimental_TMXLayer_getPositionAt(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp"
#include "lua_cocos2dx_experimental_video_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
#include "ui/UIVideoPlayer.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "UIVideoPlayer.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_experimental_video_VideoPlayer_getFileName(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp"
#include "lua_cocos2dx_experimental_webview_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
#include "ui/UIWebView.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "UIWebView.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_experimental_webview_WebView_canGoBack(lua_State* tolua_S)

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

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp"
#include "lua_cocos2dx_extension_auto.hpp"
#include "cocos-ext.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_extension_Control_setEnabled(lua_State* tolua_S)

10
cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp
View File

@ -1,9 +1,9 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.hpp"
#include "lua_cocos2dx_navmesh_auto.hpp"
#if CC_USE_NAVMESH
#include "navmesh/CCNavMesh.h"
#include "scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "CCNavMesh.h"
#include "lua_cocos2dx_navmesh_conversions.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_navmesh_NavMeshAgent_setMaxSpeed(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp
View File

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.hpp"
#include "lua_cocos2dx_physics3d_auto.hpp"
#if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION
#include "physics3d/CCPhysics3D.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "CCPhysics3D.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_physics3d_Physics3DShape_getbtShape(lua_State* tolua_S)

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

@ -1,8 +1,8 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp"
#include "lua_cocos2dx_physics_auto.hpp"
#if CC_USE_PHYSICS
#include "cocos2d.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S)

8
cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp
View File

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp"
#include "editor-support/spine/spine-cocos2dx.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_spine_auto.hpp"
#include "spine-cocos2dx.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_spine_SkeletonRenderer_setTimeScale(lua_State* tolua_S)

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

@ -1,9 +1,9 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp"
#include "editor-support/cocostudio/CocoStudio.h"
#include "editor-support/cocostudio/CCComExtensionData.h"
#include "scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_studio_auto.hpp"
#include "CocoStudio.h"
#include "CCComExtensionData.h"
#include "lua-cocos-studio-conversions.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S)

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

@ -1,7 +1,7 @@
#include "scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp"
#include "ui/CocosGUI.h"
#include "scripting/lua-bindings/manual/tolua_fix.h"
#include "scripting/lua-bindings/manual/LuaBasicConversions.h"
#include "lua_cocos2dx_ui_auto.hpp"
#include "CocosGUI.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
int lua_cocos2dx_ui_LayoutParameter_clone(lua_State* tolua_S)