Commit Graph

90 Commits

Author SHA1 Message Date
owen 8f4a486013 Native renderer
Native renderer

Native renderer

native renderer

native renderer
2019-05-26 16:34:10 +08:00
ColinCollins c4f6629174 my fault fixed the gammar error (#1680) 2019-02-15 15:51:43 +08:00
ColinCollins 9b5525bdb5 fixed the compressed texture error (#1679)
copy image data size doesn't match the compress data size
2019-02-15 14:36:36 +08:00
ColinCollins 092c0834a7 fixed the png render error (#1678) 2019-02-14 17:06:33 +08:00
ColinCollins 0141a98b32 modify the picture format convert method (#1677) 2019-02-13 12:41:42 +08:00
ColinCollins b58b27df3b add the adaptation of the png special format transform to RGBA format (#1672)
Squashed commits:
[2c579977] add the adaptation of the png special format transform to RGBA format
2019-01-29 15:54:09 +08:00
Wenhai Lin b8ae263cd2 Copy text to clipboard (#1667) 2019-01-28 10:14:34 +08:00
ColinCollins 7336ea01f1 add the adaptation of the png special format transform to RGBA format (#1668) 2019-01-28 10:07:31 +08:00
吴智明 2f6b44a2fc Change network module (#1655)
* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for ios platform

* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
leda 6af2435e20 improve error log when require failed by JSB (#1648)
* add error log when ScriptEngine::evalString failed

* improve require file not existed notify
2018-12-28 16:13:33 +08:00
Knox ce0af6d8db add get system full language (#1638) 2018-12-24 14:41:38 +08:00
Arnold 8789c8ea89 [Android] jsb_global_load_image use network::Downloader to fetch content (#1584)
* fix issue #739, use Downloader instead of HttpClient

* remove unused variable

* revert downloader, default Downloader is not required

* revert

* add empty check

* add download cache
2018-11-08 16:53:10 +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
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 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 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 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
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
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
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
W-MTZing 93101a7a0e add loadImage error callback (#1406) (#1436)
* add loadImage error callback

* fix format
2018-08-02 17:28:49 +08:00
minggo b3122ea9e5 add a function to terminate application (#1434) 2018-08-02 10:46:35 +08:00
wdzhangchukong e41cb4dcc8 Fix crash when param type error (#1390) 2018-07-13 17:07:17 +08:00
minggo e299f74392 fix editbox issue (#1389)
app will crash if missing some properties
2018-07-13 16:22:12 +08:00
minggo 91719d5d94 convert data to RGBA888 when it is not (#1388) 2018-07-13 15:28:56 +08:00
wdzhangchukong 83d9a6fbff Provide loadImage api for runtime (#1374)
* Provide loadImage api for runtime

* Declare the jsb_global_load
2018-07-06 11:52:29 +08:00
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
wuzhiming bc31a3993a use gzip to decompress js content 2018-06-19 15:44:12 +08:00
James Chen da45e32ada Removes unused files and code. (#1277) 2018-05-31 17:58:35 +08:00
James Chen 712173a8de Supports DeviceMotionEvent and removes more unused code. (#1275)
* Binds Device class

* Removes ccFPSImage.c/h

* Updates Android.mk

* Supports DeviceMotionEvent and removes more unused code.

* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo 7235644283 Editbox support (#1270)
can work on Android
2018-05-28 17:09:57 +08:00
James Chen a95dc1b889 jsb.loadImage supports to parse http URL and CCDownloader-android.cpp fix. (#1269)
* jsb.loadImage supports to parse http URL.

* CCDownloader-android.cpp fix.
2018-05-28 14:56:42 +08:00
James Chen 287f085c0d Sync 1.9 changes, se::Object::clearPrivateData takes a parameter 'clearMapping' to indicate whether to clearMapping in this function. (#1265)
* Adds TODO in restartVM bindings.

* Sync 1.9 changes, se::Object::clearPrivateData takes a parameter 'clearMapping' to indicate whether to clearMapping in this function.

* Removes unused function recreate_seval_by_native_ptr.
2018-05-24 16:50:21 +08:00
James Chen 1bb1806099 Supports Compressed Textures. (#1260)
* Updates CCConfiguration.h/.cpp.

* Supports Compressed Textures.

* Constructs Configuration singleton in Application constructor.

* Move Configuration::getInstance after createView.
2018-05-23 19:10:49 +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 07cc734c8c setAnimationInterval -> setPreferredFramesPerSecond and binds setPreferredFramesPerSeconds. (#1244)
* setAnimationInterval -> setPreferredFramesPerSecond.

* Binds setPreferredFramesPerSeconds.

* typo fix in CCApplication-win32.cpp
2018-05-16 18:06:26 +08:00
James Chen 727a4911d4 [runtime] Adds jsb.openURL, __getOSVersion, __getCurrentLanguage interfaces. (#1238) 2018-05-11 16:03:17 +08:00
James Chen 57f8268e14 Display whether GL Opt mode is enabled! (#1216) 2018-04-26 16:46:40 +08:00
James Chen ae5c569345 Adds jsb.openDebugView interface, supports to display JSB invocation count. (#1214)
* Adds jsb.openDebugView interface, supports to display JSB invocation count.

* Removes unused log in JniImp.cpp.

* Removes unused log in Cocos2dxRenderer.java
2018-04-26 15:59:20 +08:00
minggo 87a4301d8f unify js_loadImage (#1210)
* fix Texture2D::addSubImage()

* unify the logic of js_loadImage

* simplify codes
2018-04-24 16:27:03 +08:00
James Chen 4d9d82ecee fix memory issue in jsb.loadImage. (#1206) 2018-04-20 19:32:13 +08:00
James Chen f944be8574 Adds DebugView support. (#1203) 2018-04-20 14:53:16 +08:00
James Chen a1321302b4 Rename __gl to __ccgl to avoid conflict. Memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog (#1201)
* Revert "Removes FPS display code in Cocos2dxRenderer.java."

This reverts commit 71984ef41c.

* Rename __gl to __ccgl to avoid conflict.

* memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog

* Adds FIXME for FPS display in Cocos2dxRenderer.java.
2018-04-20 10:35:33 +08:00
James Chen c1a0786234 remove unused comments, register gl functions inside __gl variable. 2018-04-14 20:53:00 +08:00
James Chen 22c9dd2b5a FPS output., file:// scheme check. glTexSubImage2D binding fix. 2018-04-12 14:57:34 +08:00
James Chen a750c0ec4c More standard WebGL Binding.
WebGLRenderingContext, WebGLTexture, WebGLBuffer, WebGLRenderBuffer, WebGLFramebuffer, WebGLProgram, WebGLShader.
2018-04-08 21:32:43 +08:00
James Chen 016553cdf3 [mac] Shader version should be at least 120 to fix "GLSL 110 does not allow sub- or super-matrix constructors" issue. (#1179)
* Don't use regex match for getting base64 string. Uses string pointer offset instead.

* [mac] Shader version should be at least 120 to fix "GLSL 110 does not allow sub- or super-matrix constructors" issue.

* bug fix of shaderSource.find("#version", ...);
2018-04-03 10:09:13 +08:00