Commit Graph

17466 Commits

Author SHA1 Message Date
pandamicro a80f700a17 Merge pull request #10258 from holycanvas/v3.5.0-merge
sync v3.4.2
2022-03-08 11:39:03 +08:00
santy-wang 10349e567d Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-03-08 10:21:39 +08:00
timlyeee bb62e41c40 fix crash when app jump to camera (#10255) 2022-03-08 09:42:23 +08:00
徐兵 62f06c6ef7 Optimized Delete Skybox Environment Map (#10248) 2022-03-06 21:15:33 +08:00
SijieWang d54dd94650 [Optimize] git update external (#10242)
* [Optimize] git update external

* review code

Co-authored-by: Sijie <devhacker520@hotmail.com>
2022-03-04 17:42:02 +08:00
ChiaNing cb721f1d81 fix atlas bug when spriteframe is null (#10239) 2022-03-04 11:57:15 +08:00
zhakesi d70256b7b5 avoid middileware-2d copping buffer from native to js (#10235)
* avoid middileware-2d copping buffer from native to js

* remove redundant function
2022-03-04 11:48:51 +08:00
troublemaker52025 273fa0162e Change planar shadow func name v3.5.0 (#10174)
* change planarShadow func name for v3.5.0

* update

* Modify semantics

* delete @range slide
2022-03-03 17:53:00 +08:00
ChiaNing 9f1a230018 fix merge batches bug when multi canvas (#10232) 2022-03-03 11:07:39 +08:00
ChiaNing bd89a7bc1a protect when texture insert to atlas (#10214) 2022-03-03 10:01:24 +08:00
timlyeee 65fcf6c0b4 Return aabb objects back to pool (#10230) 2022-03-03 09:45:42 +08:00
黄森斌 4f05432c23 Displayorder is removed from the edit template and is taken over completely by the decorator (#10165) 2022-03-02 21:14:37 +08:00
PP 36df8185ca cache system info on ByteDance platform (#10218) 2022-03-02 19:58:40 +08:00
bofeng-song 65e89c2094 fix translucent problem due to SurfaceView‘s limit (#10228) 2022-03-02 17:47:27 +08:00
timlyeee c91db1f369 Fix ios device display effect (#10184)
* Fix ios device display effect
2022-03-02 10:27:51 +08:00
Cocos Robot 25399bc1a9 [ci skip][AUTO]: Automated clang-format update: bbb83c366fce82c1d817e53907a8cdffdccd5b41 (#10096) (#10224)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-02 10:18:31 +08:00
Cocos Robot 2cfc659779 [ci skip][AUTO]: Automated clang-format update: dc993f3861cb486d66fd4de1de2bf861b0d97b96 (#10211) (#10222)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-02 10:17:46 +08:00
Cocos Robot 54cfb9f897 [ci skip][AUTO]: Automated genbindings update: dc993f3861cb486d66fd4de1de2bf861b0d97b96 (#10211) (#10223)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-02 10:17:32 +08:00
Yiwen b2ec8b022f select mipmap levels dynamically (#10096)
* draft

* fix some stupid bugs introduced in the lase commit

* fixed bug when init webgl's texture.

* draft

* fix some bugs

* fix some warnings

* fix undefined type cast

* For Vulkan device, query the storage feature through optimal tiling instead of linear tiling.

* fix some bugs appear when resize texture, clean the changes. all tests passed.

* remove debug codes, improve performance, correct the framebuffer size.

* make some input parameters readonly

* Make the gfx function's parameter's access priority the same as native engine

* remove uncessary members and interface for ES3, move getGLSampler into IWebGL2GPUSampler, delete WebGL2CmfFuncCreateSampler...
2022-03-02 10:15:34 +08:00
bofeng-song 141128f148 refine context2d, reduce call from native to js (#10211)
* reduce c++ callback to js
2022-03-02 09:56:00 +08:00
James Chen 35bb7dd261 Update .gitignore to ignore native/external dir (#10216) 2022-03-01 18:36:54 +08:00
jk20012001 e6f156c841 fix unnecessary include for surface shader (#10220) 2022-03-01 18:21:32 +08:00
fish9167 2c8fab0b89 Update native_compile_self.yml (#10219)
修改任务触发条件,native 目录下的文件发送改变才触发任务
2022-03-01 18:21:09 +08:00
PP b630ff5f47 publish build-engine (#10205)
* publish build-engine

* update
2022-03-01 17:14:55 +08:00
minggo a5c138be50 Revert "fix misuse of drawAPI on metal (#10195)" (#10213)
This reverts commit 75d96e6de4.
2022-03-01 14:53:35 +08:00
James Chen c24d75e115 [v3.5.0] Move native/external/config.json to native/external-config.json (#10208)
* Move native/external/config.json to native/external-config.json

* Update CI config.

* Update native/utils/download-deps.js

* Remove native/.github
2022-03-01 10:34:35 +08:00
江战 f2a80139a3 jsb add convert routines for size_t/long (#10198) 2022-03-01 10:29:12 +08:00
Zeqiang Li d31520c10b v3.4.2 -> V3.5.0 (#10199)
* 3.4 wgpu rebase (#4208)

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>

* spirv incorrect name on binding (#4259)

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
2022-03-01 09:55:52 +08:00
minggo 6c87457f30 Merge pull request #10136 from pandamicro/v3.5.0
Merge v3.4.2
2022-02-28 18:04:35 +08:00
pandamicro 812d3db26e Update effects 2022-02-28 17:42:06 +08:00
yangchao ff4e5784e7 update config.json (#10204) 2022-02-28 17:25:51 +08:00
pandamicro 1446db89e7 Merge branch 'v3.4.2' into v3.5.0
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
2022-02-28 17:24:02 +08:00
pandamicro 574976bfa1 Update internal assets and meta (#10203) 2022-02-28 16:53:23 +08:00
zhakesi c2d0dad3d1 fix mask invalid for spine/db (#10201) 2022-02-28 15:40:27 +08:00
Zhang mingzhen abeab77c3c wechat minigame optimization #11328 (#10159)
Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-02-28 14:56:07 +08:00
ChiaNing e378c85ab1 fix canvas camera resize bug in editor (#10164)
* fix canvas camera resize bug in editor

* event off
2022-02-28 14:25:10 +08:00
PP ceb1b90570 update editBox size when node resize (#10188) 2022-02-28 11:18:25 +08:00
Cocos Robot 6d4a51fbe7 [ci skip][AUTO]: Automated clang-format update: 678436827a04f45a277fa8ccc5e05ea9acec73b0 (#10172) (#10197)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-02-28 11:03:21 +08:00
minggo 6b89ccc3d0 fix spine binary data read issue. (#10172) 2022-02-28 10:45:09 +08:00
Zeqiang Li 75d96e6de4 fix misuse of drawAPI on metal (#10195) 2022-02-28 09:57:23 +08:00
troublemaker52025 14ada9cae3 build geometry renderer for v3.5.0 (#10189) 2022-02-25 18:26:31 +08:00
fish9167 6daf4256fe Rename native_compile_self.yal to native_compile_self.yml (#10187)
* Rename native_compile_self.yal to native_compile_self.yml

文件后缀名修改(不然无法运行GitHub action任务)

* Update native_compile_self.yml

* Update native_compile_self.yml

修改 native 对应目录

* Update native_compile_self.yml

native 对应目录修改

* Update native_compile_self.yml

修改 对应的 native 目录

* Update native_compile_self.yml

修改对应 native 目录
2022-02-25 18:13:02 +08:00
yangchao 87f795d572 fix : linux build use static link. need add sndio lib (#10186)
* fix : linux build use static link

* update config.json
2022-02-25 17:54:44 +08:00
pandamicro 2ba83f18a4 Ensure RenderData.clear won't break usability (#10177)
* Cleanup Renderable2D onDestroy and destroyRenderData

* Ensure RenderData.clear won't break usability

* Remove quad render data

* Fix Skeleton.destroyRenderData

* Small tweak

* Fix ci

* Add protection to buffer accessor size calculation

* Cleanup spine & dragonbones code

* Improve DragonBones draw list management

* Fix currRenderData state issue
2022-02-25 14:56:54 +08:00
timlyeee f175150b6c Cherry pick from v3.4.2 (#10182)
* supply a default context when surface destroyed (#4222)

* Fix loop audio would stop for ios system (#4254)

* IOS system has an uncertain state between foreground and background, and our condition sometimes miss the point to load buffers.
* Queue for 3 buffers might be too short to live, use 4 or even more instead.

* Use same mtx for write (#4220)
2022-02-25 13:52:31 +08:00
fish9167 de9ed24e78 ADD GitHub Action (#10173)
* ADD GitHub Action

使用私有机器进行编译(windows,Android)

* Update native_compile_self.yal

修改任务名称

* Update native-clang-format.yml

仓库地址修改
2022-02-25 10:49:54 +08:00
Cocos Robot a8650b60f7 [ci skip][AUTO]: Automated genbindings update: 281e09a5192e334a061f19ea55ed6e98a2cc3cbb (#10102) (#10178)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-02-25 09:57:21 +08:00
troublemaker52025 e723e5aa3a Add renderMesh bias for v3.5.0 (#10102)
* Add renderMesh bias for v3.5.0

* fix ci error

* change function name

* fix merge error

* update

* update 2

* update

* update

* update 2
2022-02-24 23:27:09 +08:00
yangchao c559839905 update config.json (#10168) 2022-02-24 15:41:08 +08:00
yangchao e9e47b9dba do not create window in server mode (#10161)
* add no window impl
* add empty win impl file
2022-02-24 14:41:04 +08:00