Commit Graph

4804 Commits

Author SHA1 Message Date
James Chen 8294fd9776 tex[Sub]Image2D supports passing nullptr as data. 2018-04-16 15:56:41 +08:00
James Chen a0543f099c Renderer also uses cached version of bindBuffer, bindTexture, activeTexture, deleteBuffer, deleteTexture 2018-04-16 11:43:17 +08:00
James Chen fde80e75b2 flushCommands -> _flushCommands 2018-04-14 21:16:51 +08:00
James Chen c1a0786234 remove unused comments, register gl functions inside __gl variable. 2018-04-14 20:53:00 +08:00
James Chen 58310293f2 more cache fix. 2018-04-14 15:59:18 +08:00
James Chen fb0eb1bd48 ENABLE GL STATE CACHE by default. Uses JSB_GL_CHECK_VOID in glFlushCommand 2018-04-14 15:15:42 +08:00
James Chen 3dfe05f4cc glBindXXX glActiveTexture cache. 2018-04-14 13:43:44 +08:00
James Chen 746dc35354 Uses custom framebufferRenderbuffer, renderbufferStorage. 2018-04-13 14:25:54 +08:00
minggo 4e43879c52 improve performance of binding codes of VertexBuffer::setFormat() (#1193) 2018-04-13 14:24:32 +08:00
minggo 59d24e1fdc fix memory leaks (#1192) 2018-04-12 16:07:21 +08:00
James Chen 22c9dd2b5a FPS output., file:// scheme check. glTexSubImage2D binding fix. 2018-04-12 14:57:34 +08:00
minggo 3113af6176 optimize performance (#1191) 2018-04-12 11:44:11 +08:00
minggo ba8944c72a Optimize (#1190)
* h5 adapt

* don't bind Technique, Effect, Pass and Model
2018-04-11 11:32:33 +08:00
James Chen f9f1228e51 bindFramebuffer fix. 2018-04-10 19:05:06 +08:00
James Chen 508f7aabdd Adds gl optimaization support. 2018-04-10 17:39:57 +08:00
James Chen 29ac7a11a4 Reverts glViewPoint binding. 2018-04-09 13:57:42 +08:00
James Chen 912eb6bf33 setCanvasBufferUpdateCallback should be private method. 2018-04-09 13:57:06 +08:00
James Chen b6a3153435 [android] Fix CanvasRenderingContext2D. Call fillData after recreateBuffer. System Font is displayed correctly on Android now. 2018-04-09 13:56:40 +08:00
James Chen 0f4535fb93 [ios] Fix CanvasRenderingContext2D. 2018-04-09 13:55:48 +08:00
James Chen 00675026d9 [mac] Fix CanvasRenderingContext2D. 2018-04-09 13:55:36 +08:00
wuzhiming 5a6464ac1c use gzip to decompress js content 2018-04-09 11:37:43 +08:00
James Chen a750c0ec4c More standard WebGL Binding.
WebGLRenderingContext, WebGLTexture, WebGLBuffer, WebGLRenderBuffer, WebGLFramebuffer, WebGLProgram, WebGLShader.
2018-04-08 21:32:43 +08:00
Jare Guo 2f9970fb55 assign particle texture after init (#1187) 2018-04-08 09:58:17 +08:00
Joseph Pan 86607a472e avoid a NullPointerException when domain is null (#1186)
* avoid a NullPointerException when domain is null

* catch NullPointerException for new URI operation
2018-04-08 09:44:29 +08:00
吴智明 173588b4ae remove proj.android folder and remove config from cocos-project-template.json (#1182) 2018-04-04 18:11:50 +08:00
Joseph Pan 036c13ea94 Fix local reference table overflow error problem. (#1178)
* Fix local reference table error problem.

* Modify the patch according to review comment.

* Fix a variable name.
2018-04-04 18:06:06 +08:00
James Chen b7aee9e605 Fix local reference table overflow error problem. (#1184)
* Fix local reference table error problem.

* Modify the patch according to review comment.

* Fix a variable name.
2018-04-04 18:05:05 +08:00
Jare Guo 58f7ea35c4 Merge v1.8 into develop 2018-04-04 17:09:49 +08:00
Jare Guo a2e165fce0 Merge pull request #1093 from dumganhar/fix/best-gradle-config
Best gradle configuration for Android.
2018-04-04 17:07:53 +08:00
James Chen ed017b2e01 Merge branch 'runtime' into new-renderer
# Conflicts:
#	cocos/renderer/gfx/Texture2D.cpp
2018-04-03 21:04:15 +08:00
Joseph Pan a3c7423c37 Fix local reference table overflow error problem. (#1178)
* Fix local reference table error problem.

* Modify the patch according to review comment.

* Fix a variable name.
2018-04-03 20:01:27 +08:00
James Chen 4397330777 [runtime, android] Fix local reference table overflow error problem in CCCanvasRenderingContext2D-android.cpp. (#1180) 2018-04-03 14:34:48 +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
James Chen 0bd5c94c84 updates buildTooVersion to 27.0.3. Uses implementation instead of compile. (#1177) 2018-03-31 20:26:17 +08:00
minggo 2ba3e815d2 h5 adapt (#1176) 2018-03-30 17:57:38 +08:00
James Chen 8dc0f35714 [ios] Fixes bugs about multisampling and GL_DEPTCH_STENCIL_ATTACHMENT (#1175)
* [ios] Fixes bugs about multisampling.

* [ios] Should use opengl es2

* Fixes compilation issues in DeviceGraphics after switching back to opengles2.

* glFramebufferRenderbuffer GL_DEPTH_STENCIL_ATTACHMENT fix in webgl binding.

* Comment some code of invoking opengles3.0 methods in gfx/Texture2D.cpp.
2018-03-30 17:44:08 +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 3c1da2db6c alphabetic textBaseline support. (#1173) 2018-03-29 16:24:36 +08:00
James Chen 73eb73c690 [android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D. (#1172)
* [android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D.

* bug fix in CanvasRenderingContext2DImpl.java

* java version 1.8
2018-03-29 15:50:38 +08:00
James Chen a668496b8e Comments initializing DeviceGraphics and textAlign supports middle. (#1171)
* Comments initializing DeviceGraphics since runtime doesn't need renderer stuff temporarily.

* textAlign supports middle.

* reverts.
2018-03-28 21:26:08 +08:00
minggo f4e3f9e8f6 adapt h5 (#1170) 2018-03-28 09:47:05 +08:00
James Chen deda8af50a premultiply alpha works. (#1169)
* premultiply alpha works.

* GL_UNPACK_COLORSPACE_CONVERSION_WEBGL isn't supported.
2018-03-27 15:38:47 +08:00
James Chen 5d0f97697e Fixed some webgl binding issues. (#1168)
* Fixes wrong conversion, lots of opengl should pass in `float` but we passed `int` value.

* [ios] Initialize Application should be in firstStart: method.

* Implements unpackFlipY for GL_RGBA & GL_RGB format texture.

* FIxed some webgl binding issues.
2018-03-26 18:23:20 +08:00
Jare Guo fe87896bb3 fix simulator link error (#1162) 2018-03-23 16:03:38 +08:00
James Chen 9c0e2291a9 Updates auto binding code. 2018-03-23 15:58:58 +08:00
James Chen fa440b83c2 getImageInfo -> loadImage, compatible with new renderer. 2018-03-23 15:51:22 +08:00
James Chen 4ee7981630 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
# Conflicts:
#	cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm
#	cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp
2018-03-23 15:42:12 +08:00
minggo 0be49352d0 H5 adapt merge (#1164)
* h5 adpator

* adapt to h5 engine
2018-03-23 15:26:09 +08:00
James Chen fd0f172b41 Supports faster TypedArray operation for iOS lower than 10. Uses some code in Ejecta. (#1163) 2018-03-23 14:59:18 +08:00
James Chen c341d94d1a Adds missing function implementation. (#1161) 2018-03-22 16:16:10 +08:00