Commit Graph

4804 Commits

Author SHA1 Message Date
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
minggo 45f096ead8 fix compiling error 2022-01-24 16:42:39 +08:00
minggo 1552345596 Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2
Conflicts:
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridgeWrapper.mm
	cocos/platform/ohos/jni/JniCocosAbility.cpp
	cocos/renderer/gfx-metal/MTLCommandBuffer.mm
	external/config.json
2022-01-24 15:01:01 +08:00
timlyeee 83ecd19721 Divide foreground tasks and all-time tasks (#4206)
* Add JsbBridgeWrapper for ohos

* Divide Foreground tasks and all-time tasks

* implement a taskQ class

* Add ohos support
2022-01-24 10:25:05 +08:00
timlyeee 49c57bd9c5 Add JsbBridgeWrapper for ohos (#4204) 2022-01-21 11:10:38 +08:00
Yun Hsiao Wu a360e4390a gfx: refactor binding mappings (#4195)
* gfx: refactor binding mappings

* fg: fix scissor merge

* fix genbindings on PyYAML 6.0+
2022-01-21 09:43:55 +08:00
Zeqiang Li 08dadb4fae wgpu ci sdk update to latest (#4202)
* wgpu ci

* update emsdk to latest
2022-01-21 09:43:21 +08:00
Zeqiang Li 8ffcf82748 wgpu ci (#4201) 2022-01-20 11:47:49 +08:00
Zeqiang Li aa95a22288 subpass + invalid depth binding + valid dsAttachment format (#4198)
* subpass + invalid depth binding + valid dsAttachment format

* append
2022-01-19 16:07:03 +08:00
Cocos Robot 7285dfc584 [ci skip][AUTO]: Automated genbindings update: d01d0d8f25bd376ca471ae8e48590d71a7c3645b (#4194) (#4196)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-01-19 15:20:25 +08:00
troublemaker52025 324e722f30 shadow info mifration for v3.5.0 (#4194) 2022-01-19 13:47:45 +08:00
江战 8154648490 3.4.1 Android: Java flush game thread tasks (#4193)
* fix run on game thread

* save

* just flush java tasks, do not run gameTick

* reduce timeout to 50
2022-01-19 12:40:20 +08:00
kenshin a608d90577 copy from https://github.com/cocos-creator/engine-native/pull/4170 (#4185) 2022-01-17 19:37:11 +08:00
Zeqiang Li 9cd1fd911e fix mem status (#4179) 2022-01-17 09:38:41 +08:00
Zeqiang Li 8b0c68504c m1 deferred rendering issue: fbf & write to same tex not fully support (#4174)
Co-authored-by: lyeee <timelyeee@gmail.com>
2022-01-14 15:57:55 +08:00
GengineJS 940891f274 Fix the problem of deferred pipeline multi-execution transparent queue (#4168) 2022-01-14 09:39:20 +08:00
troublemaker52025 6d3d4830a3 fix planar-shadow normal is zero for v3.4.1 (#4165) 2022-01-12 23:26:46 +08:00
Zeqiang Li 675ecb2351 camera render area (#4164) 2022-01-12 15:37:39 +08:00
timlyeee 9340b1e3cd remove local reference array (#4161) 2022-01-12 15:27:14 +08:00
DolaMay b9babc391c Fix Lighting stage feedback loop (#4157)
* fix cluster check bugs

* Position Delete & Normal Compress

* Fix Lighting stage feedback loop
2022-01-12 14:36:49 +08:00
timlyeee 952f646bc1 remove unnecessary include (#4153) 2022-01-10 17:26:21 +08:00
timlyeee 08e9f59ce9 Fix callInfo leak (#4148) 2022-01-08 18:05:34 +08:00
Cocos Robot 7660b203ee [ci skip][AUTO]: Automated genbindings update: c4714ac283 (#4138) (#4145)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-01-08 12:01:44 +08:00
minggo c4714ac283 fix compiling error 2022-01-08 11:12:16 +08:00
DolaMay 5321d81d95 Position Delete & Normal Compress: V3.4.1 native (#4135)
* fix cluster check bugs

* Position Delete & Normal Compress
2022-01-07 22:56:18 +08:00
timlyeee f78ade706e Update config.json (#4137) 2022-01-07 18:45:00 +08:00
minggo c0bdd3c0d8 Merge branch 'v3.4.1' into merge_v3.4.1
Conflicts:
	cocos/bindings/event/EventDispatcher.cpp
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridge.mm
	cocos/platform/java/jni/JniCocosOrientationHelper.cpp
	cocos/platform/win32/CanvasRenderingContext2D-win32.cpp
2022-01-07 18:36:14 +08:00
qiuguohua 6d79a24cab V3.5.0 (#4134)
* Temporarily solve the application is released, but other modules need to use application

* Solve the application is released, but other modules need to use application

* Solve some warnings about platform adaptation

* Fix the problem that the linux platform is not assigned
2022-01-07 09:47:13 +08:00
troublemaker52025 cf6e3f6ff0 Change define(CC_DIR_SHADOW) to uniform(cc_lightDir.w) for v3.4.1 (#4129)
* change-CC_DIR_SHADOW-define-v3.4.1

* fix ci error

* update
2022-01-06 23:09:15 +08:00
GengineJS cdfc12eccd Multiple Cameras support rendering to the same RenderTexture (#4132) 2022-01-06 18:42:26 +08:00
timlyeee b54225e433 Rename JsbBridgeWrapper API (#4130) 2022-01-06 16:58:37 +08:00
troublemaker52025 32ea1cbfbf Combing planar-shadow calculations for v3.4.1 (#4127) 2022-01-05 23:26:28 +08:00
timlyeee b5c40837c8 add JsbBridgeWrapper(#4125) 2022-01-04 13:38:23 +08:00
江战 73aea115e0 fix windows text alias (#4128) 2022-01-04 10:23:25 +08:00
troublemaker52025 d65a00dee7 Optimize fixedArea mode culling process for v3.4.1 (#4124) 2021-12-28 11:15:32 +08:00
Greg1129 4462b96617 issue 10384 memory leak fix (#4115)
* issue 10384 memory leak fix
2021-12-24 14:39:12 +08:00
troublemaker52025 c418fa8893 fix shadow queue performance for v3.4.1 (#4119)
* fix shadow queue performance for v3.4.1
2021-12-24 14:38:36 +08:00
jk20012001 db9b17a45e Fix #10538: Android+WebGL PS struct variables has mediump precision (#4120) 2021-12-24 11:01:58 +08:00
minggo ac2045b0e0 Merge branch 'v3.5.0' into v3.4.0 2021-12-22 10:31:27 +08:00
江战 ff533953ab allow tick() in background (#4083) 2021-12-21 15:50:45 +08:00
Zeqiang Li 4b1422a7f3 event init & mem align (#4116) 2021-12-21 11:08:11 +08:00
timlyeee c489a8a254 Remove origin code for twice call to java method. (#4114)
* remove use of cc::Device::getDeviceOrientation(), which will call java method again rather than jint rotation.
* Use switch and change it to cc::Device::Orientation, because ROTATION only defined on Android and OHOS.
2021-12-20 15:01:18 +08:00
minggo d37730e82c Merge pull request #4113 from cocos-creator/v3.4.0
Correct visibility type (#4111)
2021-12-20 10:57:25 +08:00
Cocos Robot f6e22b52da [ci skip][AUTO]: Automated genbindings update: 6fc87e9f802187bcabcc24b4c0e00b79abd27412 (#4109) (#4112)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2021-12-20 10:46:14 +08:00
troublemaker52025 4e231f4232 updateLightingmap sync to native-engine for v3.4.1 (#4109)
* updateLightingmap sync to native-engine for v3.4.1
2021-12-20 10:34:23 +08:00
pandamicro 03484abb9b Correct visibility type (#4111) 2021-12-18 18:14:57 +08:00
minggo e39502640a Merge pull request #4108 from cocos-creator/v3.4.0
Merge V3.4.0
2021-12-16 17:07:54 +08:00
江战 df01dd026a close uv_handle_t (#4106) 2021-12-16 15:27:11 +08:00
minggo 989351e2f8 Update config.json (#4105) 2021-12-16 14:03:22 +08:00
minggo 7d71483d95 Update config.json (#4107) 2021-12-16 13:41:52 +08:00