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
PP
b2c2bc406b
fix bmfont kerning parsing bug ( #1234 )
2018-05-14 17:49:22 +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
Jare Guo
e628bd2d97
Merge branch 'v1.9' into develop
2018-05-14 11:12:39 +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
James Chen
2fec8318f8
Fix incorrect assertion if creating GLProgram in JS. ( #1233 )
2018-05-11 10:46:02 +08:00
Vincent Yang
bdb941eb4a
[bug] some jni methods don't declare JNICALL modifier. ( #1236 )
2018-05-11 10:44:41 +08:00
chenxianyin
96b84fd2c0
when a null spriteFrame was set, the old sriteFrame must be free. ( #1225 )
...
* when a null spriteFrame was set, the old sriteFrame must be free.
* when Scale9SpriteV2 set a null spriteFrame, reset the _contentSize to cocos2d::Size::ZERO.
2018-05-11 09:49:22 +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
James Chen
6df1923235
[jswrapper] Object::defineFunction fix for SpiderMonkey port, the function must be able to be enumrated and permanent. ( #1232 )
2018-05-08 18:14:35 +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
Jare Guo
b27bf8fef3
fix compile error ( #1220 )
2018-04-27 11:00:13 +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
CocosRobot
8d52f3d544
[ci skip][AUTO]: updating jsbinding automatically ( #1213 )
2018-04-26 09:50:51 +08:00
Jare Guo
0524a6ba14
Merge pull request #1212 from umbrellaPP/develop
...
修改tiledMap tsx文件的解析方式
2018-04-26 09:37:59 +08:00
PP
f8b0961755
reimplement tiledmap xmlFile parsing
...
commit
commit
2018-04-26 09:34:42 +08:00
Markmark@gamekon.com
a6093a6f1c
Throw args away rather than raising an error. ( #1198 )
...
Throw args away rather than raising an error.
2018-04-25 13:40:03 +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
James Chen
4d9d82ecee
fix memory issue in jsb.loadImage. ( #1206 )
2018-04-20 19:32:13 +08:00
minggo
6fd4846eea
Optimize ( #1205 )
...
* fix some bugs
* fix binding codes of Texture2D::updateSubImage()
* optimize memory usage
2018-04-20 19:25:23 +08:00
James Chen
ad94db2c71
Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v. ( #1204 )
...
* Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v.
* FPS uses integer.
* revert.
* Removes unused import package.
2018-04-20 17:25:10 +08:00
James Chen
f944be8574
Adds DebugView support. ( #1203 )
2018-04-20 14:53:16 +08:00
minggo
d98484654f
Optimize ( #1202 )
...
* fix some bugs
* fix binding codes of Texture2D::updateSubImage()
2018-04-20 14:31:52 +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
71984ef41c
Removes FPS display code in Cocos2dxRenderer.java.
2018-04-19 13:55:37 +08:00
James Chen
2794f40efa
Merge branch 'runtime' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
...
# Conflicts:
# cocos/platform/android/jni/JniImp.cpp
2018-04-19 13:50:34 +08:00
James Chen
a6c1a1301f
Removes glClear fixme.
2018-04-19 13:47:16 +08:00
James Chen
b34b517435
DeviceGraphics::getInstance fix.
2018-04-19 13:41:08 +08:00
James Chen
1fa4ea0e6f
Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
...
# Conflicts:
# cocos/renderer/gfx/IndexBuffer.cpp
# cocos/renderer/gfx/VertexBuffer.cpp
2018-04-19 11:23:36 +08:00
James Chen
64c4caa896
fillRectWithColor returns directly if getting an error.
2018-04-19 11:18:04 +08:00
James Chen
669f3cecb3
cocos_android_app_init returns Application*.
2018-04-19 11:17:18 +08:00
James Chen
6b4594f666
Adds fixme to CCGLUtils.cpp.
2018-04-19 10:59:26 +08:00
James Chen
144175449f
ccDeleteBuffers should consider CC_ENABLE_GL_STATE_CACHE.
2018-04-19 10:57:29 +08:00
minggo
0505ee928a
Optimize ( #1199 )
...
* optimize performace
* optimize performance
2018-04-18 17:47:46 +08:00
James Chen
207605bbff
Bind getVertexAttrib & getVertexAttribOffset
2018-04-17 23:10:25 +08:00
Vincent Yang
425033df4b
Add nativeFinish JNI for destruct game script env. ( #1197 )
...
Add nativeFinish JNI for destruct game script env.
2018-04-17 11:38:59 +08:00