Commit Graph

2166 Commits

Author SHA1 Message Date
minggo 9d807ec642 fix tar usage (#1287) 2018-06-05 10:33:08 +08:00
minggo b1074926ab fix travis issue (#1286)
* fix extract file path

* download clang
2018-06-05 09:54:16 +08:00
minggo 160cbe8af3 template adpat (#1284) 2018-06-04 17:50:30 +08:00
minggo e356ce9225 fix bug that: (#1283)
touch outside of editbox will not close editbox
glsurface view may not has focus when finish editbox input
2018-06-04 11:06:07 +08:00
James Chen 0b85e67caf Supports text with bold. (#1282) 2018-06-02 18:46:12 +08:00
James Chen cad6cb9971 Uses the same CCCanvasRenderingContext2D for apple platforms (iOS/macOS). (#1281) 2018-06-02 17:52:54 +08:00
James Chen cf7f3770b7 Supports drawing path API and refactor CCCanvasRenderingContext2D for macOS. (#1280)
* Uses CGBitmapContextCreate instead of NSImage for macOS, the CCCanvasRenderingContext2D is similiar as which on iOS now.

* Supports drawing line API.

* Supports drawing line API for Android too.
2018-06-01 22:59:07 +08:00
minggo 5a06e1da7a send complete message when touch outside editbox (#1279) 2018-06-01 17:44:19 +08:00
minggo fbeb6dd200 Editbox ios support (#1278) 2018-06-01 14:12:03 +08:00
James Chen da45e32ada Removes unused files and code. (#1277) 2018-05-31 17:58:35 +08:00
James Chen 5245664704 Adds Device::getDeviceModel method. (#1276) 2018-05-31 14:13:28 +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 4ded383b8a fix crash of editbox on Android (#1273) 2018-05-30 14:51:56 +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
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 61accc6d11 Fixed the issue that text is probably cut. (#1268) 2018-05-28 11:45:07 +08:00
James Chen 1556a16e27 ccVertexAttribPoiner fix. (#1266) 2018-05-24 17:20:32 +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 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 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
minggo f8167e6053 fix crash when running example tests (#1259) 2018-05-23 10:33:20 +08:00
James Chen 5f4e814ade Supports mouse event for desktop platforms. (#1256) 2018-05-22 14:03:54 +08:00
minggo ef2b666f38 update binding gererator (#1255) 2018-05-22 09:49:21 +08:00
minggo ccc8691029 fix crash when parsing Effect property (#1254) 2018-05-22 09:32:06 +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 04fa653ab0 Updates bindings-generator to official repo. (#1251) 2018-05-21 14:08:20 +08:00
James Chen 391e6e536e Supports text stroke for macOS, iOS and Android. (#1250)
* Supports stroke for mac.

* Supports text stroke for ios.

* Supports text stroke for android.

* typo fix in CanvasRenderingContext2DImpl.java.
2018-05-21 11:38:05 +08:00
James Chen ee5faac763 Move logic of flipY and premultiplyAlpha from jsb_opengl_manual.cpp to CCGLUtils.cpp. (#1249)
* Native Renderer supports GL_UNPACK_FLIP_Y_WEBGL & GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL.
And adds ccFlipYOrPremultiptyAlphaIfNeeded, ccIsUnpackFlipY, ccIsPremultiplyAlpha, ccPixelStorei GL utils.

* seval_to_TextureSubImageOption: uint16_t* -> uint32_t* since width * height * 4 may bigger than 65536 bytes.

* Move logic of flipY and premultiplyAlpha from jsb_opengl_manual.cpp to CCGLUtils.cpp.

* Reverts.
2018-05-18 15:53:28 +08:00
minggo 8a76997242 adapt mac resolution (#1248) 2018-05-18 11:57:12 +08:00
minggo 7a2a9374ec Technique support setting COLOR4 and COLOR3 (#1246) 2018-05-17 16:15:51 +08:00
minggo 4a13d0e15e Downsample (#1245)
* support render texture

* use texture unit 0

* add functions to set device pixel ratio

* add ccDeleteBuffers again

* fix according comments
2018-05-17 14:05:05 +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 357d87d8bc WebGLObject inherits from cocos2d::Ref. autorelease it instead of deleting it to avoid to use invalid WebGL objects. (#1243) 2018-05-16 10:18:58 +08:00
James Chen 58361e1b2d Avoid to create canvas buffer twice. (#1242)
* Avoid to create canvas buffer twice.

* Remove unused condition code in Cocos2dxActivity.java
2018-05-15 11:00:52 +08:00
Vincent Yang 0bb96987e7 [bug] android nativeFinish don't release some object. (#1241) 2018-05-14 18:06:15 +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 6ff58a79df FlipPixelsY logic fix. (#1239) 2018-05-11 21:42:43 +08:00
James Chen 727a4911d4 [runtime] Adds jsb.openURL, __getOSVersion, __getCurrentLanguage interfaces. (#1238) 2018-05-11 16:03:17 +08:00
Vincent Yang bdb941eb4a [bug] some jni methods don't declare JNICALL modifier. (#1236) 2018-05-11 10:44:41 +08:00
Vincent Yang 4042dc6a87 [bug] CCFileUtils can't read apk's assets when apk isn't default resource root. (#1235) 2018-05-11 09:46:09 +08:00
minggo 9ca6dac357 fix musk issue (#1231) 2018-05-08 11:21:41 +08:00
James Chen 53ffc817ee Fixes JNI memory leak in CanvasRenderingContext2DImpl::fillData (#1230)
* Fixes JNI memory leak in CanvasRenderingContext2DImpl::fillData

* typo fix.
2018-05-08 10:56:48 +08:00
minggo 12676d6f2b put debug related files into debugger folder 2018-04-28 14:37:09 +08:00
James Chen 15656be8d6 Removes unused js glue code. (#1221) 2018-04-27 13:45:30 +08:00
James Chen 2e71076053 Display whether GL opt mode is enabled. (#1217) 2018-04-26 16:49:02 +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
minggo 7814c72492 fix Texture2D::addSubImage() (#1207) 2018-04-20 20:06:55 +08:00