Commit Graph

170 Commits

Author SHA1 Message Date
James Chen c22673d440 Provides an interface for getting SafeArea (#1008)
* Provides an interface for getting SafeArea

* @available(iOS 11.0, *) isn't supported in Xcode8. So we use the old way.
2017-11-23 13:39:35 +08:00
James Chen 4a61e1423f Re-binds OpenGL interfaces. (#976)
* Adds opengl bindings code.

* Register OPENGL module.

* Updates Android.mk

* Updates win32 project configuration.

* Supports boolean -> integer conversion.

* glXXXXv count fix.

* GLNode needs to inherit from Node.

* Updates bindings.

* size fix in JSB_glGetUniformfv.

* JSB_glGetSupportedExtensions fix.
2017-11-14 18:05:14 +08:00
yinkaile 3497f34b3d add setEnable to CameraNode 2017-11-07 11:17:27 +08:00
yinkaile d7fa1f9e13 rename director culling functions 2017-10-31 18:23:13 +08:00
yinkaile 26ff253d8c support dynamic enable/disable culling 2017-10-31 15:37:12 +08:00
James Chen fdd46f2718 Auto binds RenderTexture::saveToFile and fix js memory leak while saveToFile.
The callback _saveFileCallback has to be set to nullptr to release se::Value the std::function captures.
2017-10-26 12:44:06 +08:00
CocosRobot 5dfb7e6c36 [ci skip][AUTO]: updating jsbinding automatically 2017-10-25 10:50:51 +00:00
CocosRobot e0e7867719 [ci skip][AUTO]: updating jsbinding automatically 2017-10-23 07:16:38 +00:00
James Chen 8ae6d54df3 Spine conversion should use pointer instead of reference since it probably returns nullptr. 2017-10-20 10:01:04 +08:00
yinkaile 8ac7257a46 fixed merge errors 2017-10-12 18:15:21 +08:00
yinkaile f7b2b1f87f Merge branch 'develop' into native-modules
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
#	cocos/scripting/js-bindings/manual/jsb_creator_physics_manual.cpp
2017-10-12 17:48:16 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen ee9713e007 CCLOG -> CCLOGINFO in finalize callback for less log output. 2017-10-11 17:02:46 +08:00
James Chen 412574c670 Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
2017-10-10 14:48:04 +08:00
2youyouo2 2405d0c917 remove unused extensions 2017-10-10 10:30:55 +08:00
James Chen f0d2eeb2b3 Adds jsb_set_extend_property for easily setting extend property.
Adds jsb_init_file_operation_delegate and jsb_enable_debugger for easily use in AppDelegate.cpp.
2017-10-09 14:57:14 +08:00
CocosRobot 4523e9aee3 [ci skip][AUTO]: updating jsbinding automatically 2017-09-26 03:27:35 +00:00
James Chen 8b1ba02f9f Implements seval_to_TTFConfig, don't ignore createWithTTF and setTTFConfig in auto bindings. 2017-09-23 17:53:24 +08:00
James Chen 235be1ec8a Updates bindings. 2017-09-22 17:47:38 +08:00
2youyouo2 6771164c5d remove unused ccui 2017-09-18 18:16:51 +08:00
James Chen 7539ccdad5 Merge pull request #819 from dumganhar/jsb2.0
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
2017-09-15 03:50:43 -05:00
James Chen 7bb53e3b13 update binding js. 2017-09-15 10:41:55 +08:00
James Chen ddc802d9f0 CCLOG in finalize method rather than cocos2d::log. 2017-09-15 10:40:43 +08:00
CocosRobot 1079062944 [ci skip][AUTO]: updating jsbinding automatically 2017-09-15 02:31:02 +00:00
CocosRobot 603698b1c0 [ci skip][AUTO]: updating jsbinding automatically 2017-09-08 02:12:57 +00:00
James Chen f21fea4344 executeScriptBuffer -> evalString, executeScriptFile -> runScript. 2017-08-31 15:00:23 +08:00
James Chen df01303041 attachChild -> attachObject, detachChild -> detachObject, isSame -> strictEquals 2017-08-31 10:33:17 +08:00
James Chen 2b8798a73c Merge pull request #784 from dumganhar/jsb2.0
Some fixes for JSB2.0
2017-08-29 22:30:53 -05:00
CocosRobot c707237826 [ci skip][AUTO]: updating jsbinding automatically 2017-08-28 08:08:38 +00:00
James Chen 4a1cc2ec1b Updates auto bindings code 2017-08-28 14:05:55 +08:00
James Chen 2f38e872c1 Action binding bug fix. 2017-08-22 16:50:41 +08:00
James Chen 73e45e92e4 Adds MappingUtils file, box2d works again. 2017-08-18 14:34:55 +08:00
James Chen 1a029399f9 Adds BaseJSAction and cleanup. 2017-08-16 15:42:26 +08:00
James Chen dbe9716536 Adds BaseJSAction 2017-08-16 15:41:27 +08:00
James Chen 0fe0580b5f deletes unused files. 2017-08-11 11:42:13 +08:00
James Chen 6b9cbbab28 cleanup. 2017-08-11 10:14:45 +08:00
James Chen 7653cb453f Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/libcocos2d.vcxproj.filters
#	cocos/Android.mk
#	cocos/editor-support/creator/CCCameraNode.cpp
#	cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
#	cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
#	cocos/network/SocketIO.cpp
#	cocos/network/WebSocket-libwebsockets.cpp
#	cocos/renderer/CCTextureCache.cpp
#	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
#	cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
#	cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
#	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
#	cocos/scripting/js-bindings/manual/ScriptingCore.h
#	cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
#	cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
#	cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
#	cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
#	cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
#	cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
#	cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
#	cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
#	cocos/scripting/js-bindings/manual/js_bindings_config.h
#	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.h
#	cocos/scripting/js-bindings/manual/js_module_register.cpp
#	cocos/scripting/js-bindings/manual/js_module_register.h
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
#	cocos/scripting/js-bindings/manual/jsb_helper.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
#	cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
#	cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
#	cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
#	cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
#	cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
#	cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
#	cocos/scripting/js-bindings/manual/network/js_network_manual.h
#	cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
#	cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
#	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
#	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h
#	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
#	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
#	cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h
#	cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
#	cocos/scripting/js-bindings/proj.android/Android.mk
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
#	cocos/scripting/js-bindings/script/jsb_boot.js
#	tools/bindings-generator
#	tools/tojs/cocos2dx.ini
#	tools/tojs/genbindings.py
2017-08-10 18:04:24 +08:00
James Chen e86ed76abf jsb2.0 windows works on v8. 2017-08-09 18:06:33 +08:00
James Chen dcadda2862 defineFinalizedFunction -> defineFinalizeFunction. 2017-08-03 17:28:40 +08:00
James Chen 708cf876fc b2Shape need to be owned by cpp since b2Shape is abstract and GetShape will return its sub class instance which is owned by cpp. Therefore it has to be rooted. 2017-08-03 13:46:53 +08:00
James Chen c7397d3865 PhysicsManifoldWrapper and PhysicsWorldManifoldWrapper should not inherit from Ref. 2017-08-03 11:45:40 +08:00
James Chen e5eac44c0f cleanup 2017-08-02 14:41:10 +08:00
James Chen 854aa81c0d JSB_PRECONDITION2->SE_PRECONDITION2 2017-07-31 10:57:59 +08:00
James Chen 10710cc407 switchToRoot -> root, switchToUnroot -> unroot. 2017-07-31 10:39:32 +08:00
James Chen 9862b765c8 cleanup 2017-07-28 17:35:55 +08:00
James Chen b0b5edf8a8 Remove unneeded addRef. 2017-07-20 17:48:20 +08:00
James Chen b3db0a842a add modules register 2017-07-12 11:15:46 +08:00
James Chen 2808497a88 clearException after manually registration. 2017-07-11 13:40:04 +08:00
James Chen b8fe0d3674 Updates box2d bindings. 2017-07-07 15:16:27 +08:00
James Chen 04f827e059 editbox, videoplayer, webview work. 2017-07-06 16:21:37 +08:00