Commit Graph

24 Commits

Author SHA1 Message Date
leda 4ca166e109 dispatch show/hide event to js, included "cocos simulator" (#1500)
* add dispatchEnterBackgroundEvent for simulator

* more stable when set canvas size on win32

* add isNan check for float & double

* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +08:00
leda a7f266b9e8 resume View Menu for simulator on mac & win32 (#1456)
* start add menu back

* simulator resume works

* readded scale feature, fix exit bug

* free SetupUI, and fix compile only

* adapt to CustomEvent from struct to class

* resume show/hide FPS feature

* Revert "free SetupUI, and fix compile only"

This reverts commit fd8cf5ca0a17ba62ae5dec46fefea3b58c267c9d.

* Revert "Revert "free SetupUI, and fix compile only""

This reverts commit 6e5934a583db286508d00a61a22e11a3325090f1.

* correct EXIT logic

* scale works

* show/hide fps works

* remove unneed menu, replace tab with space

* remove debug output info

* no need _isShowFPS member

* fix NSError init error
2018-08-16 09:34:47 +08:00
leda 80e102d475 add onResize interface for application on mac & win32 (#1452)
* add resize interface for application

* add dispatchResizeEvent interface

* improve function name, add comments

* add onResize for win32

* directly supply size info when dispatch resize event
2018-08-13 14:30:56 +08:00
yongminghuang 4e206fd656 [bug] Fixed a crash of multiple finger operations (#1433) 2018-08-02 17:27:24 +08:00
James Chen c7801b75f8 Minor fixes while running on macOS with V8 script engine. (#1305) 2018-06-07 16:08:06 +08:00
James Chen d54f1943b8 Keyboard Event works. (#1267)
* Keyboard Event works.

* Adds todo.

* temp commit for keyboard event.

* Keyboard event handle all keys.
2018-05-28 18:53:57 +08:00
James Chen 73537df727 bufferWidth and bufferHeight check in CCCanvasRenderingContext2D. (#1262)
* Removes unused logic in EventDispatcher::dispatchTickEvent.

* Uses __jsbObj directly, dispatch enter background & foreground event

* bufferWidth and bufferHeight check in CCCanvasRenderingContext2D.
2018-05-24 14:38:55 +08:00
James Chen 5f4e814ade Supports mouse event for desktop platforms. (#1256) 2018-05-22 14:03:54 +08:00
James Chen 442c149053 Implements Application::restart and some fixes. (#1253)
* Implements Application::restart.

* SAFE_DEC_REF should reset pointer to nullptr.

* Class::cleanup should be after of JSGlobalContextRelease.

* WebGLObject needs to be released if ScriptEngine is in cleanup process.

* Fixes memory leak in JSB_glGetActiveAttrib
2018-05-21 18:46:12 +08:00
James Chen 2e174ff1c2 Supports dispatching custom event for EventDispatcher. (#1240)
* Adds __jsbInvocationCount for SpiderMonkey.

* Supports dispatching custom event for EventDispatcher.
2018-05-14 17:19:03 +08:00
James Chen d92ab3cbe7 touch event should also pass pageX, pageY. jsb.loadImage supports data base64 string. (#1174)
* touch event should also pass pageX, pageY.

* jsb.loadImage supports data base64 string.
2018-03-30 07:41:59 +08:00
James Chen c3602eb1e3 [runtime] Android testcase works. (#1148)
* Adds jsb_run_script_module for CommonJS module, reverts original `require`.

* Uses window.gameTick for sending tick event.

* Removes unused scripts.

* Android testcase works.
2018-03-15 18:12:38 +08:00
James Chen 5fcd99a151 Fix compilation error after merging from upstream. 2018-03-12 16:05:11 +08:00
James Chen 26e8259389 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer 2018-03-12 15:34:45 +08:00
minggo 0d483a9b07 add back network (#1141)
* add back network

* add network back on windows
2018-03-09 16:20:48 +08:00
James Chen 15370e52db ios label works.TODO: outline, bold, underline. 2018-03-09 12:37:57 +08:00
James Chen 1cd2166684 continue. 2018-03-06 10:41:10 +08:00
James Chen 88123dbb7b Updates opengl binding and module fix. 2018-03-05 11:00:02 +08:00
James Chen d6a8e1ca34 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer
# Conflicts:
#	cocos/scripting/js-bindings/event/EventDispatcher.cpp
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
2018-03-02 11:07:11 +08:00
James Chen 235ad32f5e Updates opengl bindings 2018-03-02 11:02:13 +08:00
James Chen 8fe4aabe20 don't invoke tick now. 2018-03-01 17:20:16 +08:00
minggo cd0e15cd7f refactor android with new renderer (#1133) 2018-02-28 14:55:33 +08:00
James Chen f001d1135d Adds swapBuffer to GLView, bunny test works again on Mac. (#1129) 2018-02-24 14:22:06 +08:00
minggo 93090fea87 can run js on iOS and Mac (#1124) 2018-02-24 10:27:31 +08:00