Commit Graph

1021 Commits

Author SHA1 Message Date
leda 7c93a11905 runtime require: add context2d fill/rect method for android (#1561)
* add context2d fill & rect method for android

* workaround: draw a hairline to cover the border

* fix clear&fillrect parameter error

* add empty impl on Apple

* add empty Imple in win32

* enable "SUBPIXEL_TEXT_FLAG" flag to make the text more clear on Android

* move putImageData impl to native

* add empty _fillImageData impl on win32 & apple
2018-10-26 13:44:03 +08:00
wen xing liao 61bfcce6fa webgl function complete check parameters (#1553)
* Remove duplicate parameter check

contains drawArrays, drawElements, getBufferParameter, getRenderbufferParameter

* Remove duplicate parameter check

* complete check parameters

contains getUniformLocation, getShaderParameter, getProgramParameter, getProgramInfoLog, getShaderInfoLog, getShaderSource, getAttachedShaders, getFramebufferAttachmentParameter, getUniform

* complete check parameters

contains getUniformLocation, getShaderParameter, getProgramParameter, getProgramInfoLog, getShaderInfoLog, getShaderSource, getAttachedShaders, getFramebufferAttachmentParameter, getUniform

* getRenderbufferParameter complete check parameters

* getBufferParameter complete check parameters

* getFramebufferAttachmentParameter complete check parameters

* getVertexAttrib complete check parameters

* getUniform complete check parameters

* createShader complete check parameters

* Remove invalid code

* optimization getUniform
2018-10-25 11:13:56 +08:00
Arnold 951869f9b9 [jsb] XMLHttpRequest & WebSocket API standardize (#1557)
* xmlhttprequest statusText exclude numeric code

* websocket bufferedBytes

* websocket extensions attribute

* add websocket close arguments

* responseXML

* fix ios compile

* responseType document

* getExtensions

* rollback change for responseXML

* fix arg 1005

* use const_cast instead of create tmp value
2018-10-23 11:57:23 +08:00
leda 738da04065 fix js_saveImageData memory leak (#1555) 2018-10-19 19:25:28 +08:00
leda d1c1457d2a keep alpha channel when save PNG image (#1554) 2018-10-19 17:28:12 +08:00
leda dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00
wen xing liao d432a9643e 调整WebGL函数功能 (#1544)
* [feature] add getRenderbufferParameter and getBufferParameter function

* [adjust] adjust getParameter  function

* [refine] refine getParameter function

* [adjust] adjust getParameter function

* [bug] drawElements complete check parameters

* Remove duplicate parameter check

contains drawArrays, drawElements, getBufferParameter, getRenderbufferParameter

* Remove duplicate parameter check
2018-10-18 10:30:57 +08:00
leda 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +08:00
leda 73f62c9da6 enable Proguard for release build on Android (#1545)
* enable Proguard for release build to reduce apk size

* add Proguard to default template

* consider anysdk at proguard

* remove un-used permissions

* disbale gfx & renderer binding register
2018-10-16 18:35:18 +08:00
Jare Guo ccd3c113b0 Merge branch 'v2.0-release' into v2.1-release
# Conflicts:
#	extensions/anysdk/platform/android/src/org/cocos2dx/javascript/SDKWrapper.java
2018-10-15 17:42:53 +08:00
wen xing liao a08759368b complete check parameters (#1542)
* [bug] framebuffer-test.js complete check parameters

* [bug] complete check parameters

* [bug] framebuffer-object-attachment.js complete check parameters

* [bug] tex-input-validation.js complete check parameters

* [bug] read-pixels-test.js complete check parameters

* [bug] drawArrays complete check parameters

* Remove macro definition

* Remove macro definition
2018-10-12 14:13:18 +08:00
leda 89af43e38f switch video player bind code from "manual" to "auto" (#1537)
* refine video bind, tested on iOS

* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda c8e145dadb Re-added WebView on iOS & Android for Creator 2.1 (#1535)
* init add webview files form creator 1.10

* refine header & namespace to compile works

* add webview auto bindings, need check manually

* update webview auto bind

* add setFrame interface to support set View Rect

* uniform file name with other ui modules

* adapt to iOS
2018-10-10 16:03:23 +08:00
wuzhiming 7cbee1528b add some support for instant games 2018-10-10 09:18:46 +08:00
wen xing liao 011abf499e [bug] complete check parameters (#1533)
* [bug] set getFramebufferAttachmentParameter return value according to webgl1.0

* fix Differences Between WebGL and OpenGL ES 2.0

* rename

* fix texImage2D when count is 0

* remove excess code

* [bug]  complete check parameters

* [bug] complete check parameters

* [restructure] remove SE_PRECONDITION5
2018-10-09 11:10:15 +08:00
leda c17130862c Re-added VideoPlayer on iOS & Android for Creator 2.1 (#1531)
* add video player source for ios and android.

* revert un-clearly changes

* add iOS files into project config files

* remove useless declare property on 2d-x-lite
2018-10-08 15:28:19 +08:00
wen xing liao f27e8f6761 fix null pointer exception (#1530) 2018-09-30 22:25:37 +08:00
wen xing liao 4c1dffb77a Adaptation webgl 1.0 (#1526)
* Adaptation webgl 1.0

* redefine the variable name
2018-09-29 11:00:08 +08:00
leda 8d98e7fb15 fix wrong namespace on (#1523)
Device.getDeviceMotionValue
2018-09-27 19:42:17 +08:00
Jare Guo 41e6cb4ea6 Merge pull request #1519 from cocos-creator/develop
sync branch request: from develop to 2.1 release
2018-09-27 11:47:57 +08:00
leda beb45454ad support parse waitForConnect and debugPort from simulator/config.json (#1521)
* revert v8 debugger ip to 0.0.0.0 for simulator

* parse isWaitForConnect and debug port from config.json

* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda a5391aaabd add macro to support custom v8 debug option for creator (#1518)
* add macro to support custom v8 debug option for creator

* update console with version compare fixed

* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda 674614720e add v8 optional on macOS (#1515)
* add v8 libs into mac project

* update xcode simulator project config

* add v8 header into template

* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
wdzhangchukong 4ecd996868 Declare JSB_WebSocketDelegate in hpp file (#1517) 2018-09-25 17:54:55 +08:00
Jare Guo bf7a01bdd5 Merge pull request #1508 from cocos-creator/v2.0-release
sync branch
2018-09-12 14:50:13 +08:00
leda c74745eee4 add "getSafeAreaEdge" interface to get SafeArea edge insets (#1502)
* try to resume iPhone X support

* gen binding code

* only get SafeAreaEdge on native

* add getSafeAreaEdge for others

* update binding-generator
2018-09-10 10:14:23 +08:00
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
Jare Guo 63d7ba61e8 bump to 2.1 and merge commit v2.0-release into develop 2018-09-06 15:33:43 +08:00
W-MTZing d27e5a798c remove log names about cocos (#1496) 2018-09-05 10:51:42 +08:00
CocosRobot f37a259dd8 [ci skip][AUTO]: updating jsbinding automatically (#1495) 2018-09-04 13:53:50 +08:00
wdzhangchukong 21377fdb74 Remove names about Cocos (#1494) 2018-09-04 13:41:02 +08:00
leda 0fb1c97e83 support to save render texture data by "saveImageData " (#1492)
* add jsb.savePixelsToFile to support screenshot

* add return value for
 savePixelsToFile

* rename: savePixelsToFile -> saveImageData
2018-09-03 09:38:52 +08:00
Jare Guo caee68b1ff Merge pull request #1490 from cocos-creator/v2.0-release
sync branch
2018-08-30 15:09:48 +08:00
minggo b642e0fcc7 Merge branch 'v2.0-release-rename' of github.com:cocos-creator/cocos2d-x-lite into merge-rename 2018-08-28 14:39:40 +08:00
wdzhangchukong e00113cfd6 Get jsb by __jsbObj (#1481) 2018-08-27 11:48:22 +08:00
CocosRobot 81301ca4b4 [ci skip][AUTO]: updating jsbinding automatically (#1480) 2018-08-24 20:43:09 +08:00
wdzhangchukong b44c2a68dc Change cocos2dx_auto to jsb (#1479) 2018-08-24 20:26:11 +08:00
CocosRobot 80fdcd0e74 [ci skip][AUTO]: updating jsbinding automatically (#1477) 2018-08-24 17:45:25 +08:00
Vincent Yang 3d2a9017bb [bug] loadImage don't call js callback when input path is invalid (#1478) 2018-08-24 17:42:15 +08:00
wdzhangchukong bf27fdd955 Rename cc in JSB (#1476)
* Rename __ccgl to __gl

* Rename __CCPrivateData to __PrivateData

* Change CanvasRenderingContext2D to global

* Change CanvasRenderingContext2D to global

* Change getDeviceMotionValue into Device

* Change FileUtils to global

* Change AudioEngine to global

* Change AudioEngine into Audio

* Remove cc in c++

* Remove __jsc__

* Change auto file template

* Name jsb_cocos2d_global to auto

* Reset jsb_cocos2dx_auto

* Register jsb_cocos2dx_global_auto
2018-08-24 17:03:50 +08:00
W-MTZing 935a759cf4 rename c++ call java function by macro (#1468) 2018-08-22 14:07:17 +08:00
W-MTZing e284a0efd1 rename jni function by macro (#1467)
* rename jni function by macro

* modify JNI macro name
2018-08-22 09:21:35 +08:00
Jare Guo 548ae4380d Merge branch 'v2.0-release' into next 2018-08-16 14:05:09 +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
leda 0ccc890843 added dispatchKeyboardEvent for android (#1453)
* added dispatchKeyboardEvent for android

* uniform enum class type to uint8
2018-08-13 10:40:23 +08:00
leda 19ab61b252 refine TODO & FIXME flag (#1450)
* change TODO to REFINE

* change REFINE:cjh to REFINE

* change FIXME to IDEA

* improve format
2018-08-10 12:52:00 +08:00
leda 3ea4405d44 add getCurrentStackTrace interface for v8 script engine (#1446)
* add getCurrentStackTrace interface for v8 script engine

* return empty string before script init finished, prevent crash
2018-08-08 18:09:36 +08:00
minggo 1d326a0c1b fix two issues: (#1440)
if return type is string, and return null from java to js, then it will crash
if the parameter is string, and pass null from js to java, then java will get "null" instead of null
2018-08-07 17:19:49 +08:00
W-MTZing 93101a7a0e add loadImage error callback (#1406) (#1436)
* add loadImage error callback

* fix format
2018-08-02 17:28:49 +08:00