lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-06 15:48:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,179 Commits 111 Branches 231 Tags
develop
Commit Graph

59 Commits

Author SHA1 Message Date
PP
d1afae6b17 support @base/math @pal/screen-adapter and @pal/minigame module (#16418) 2023-10-17 14:55:35 +08:00
PP
4ca69f7b84 support @base/utils module (#16329) 2023-09-26 11:33:30 +08:00
minggo
fca089c6f3 Merge branch 'v3.8.2' into develop-merge-v3.8.2 
Conflicts:
	.gitignore
	cocos/2d/components/deprecated.ts
	cocos/2d/components/label-outline.ts
	cocos/2d/components/label.ts
	cocos/3d/assets/mesh.ts
cocos/3d/misc/mesh-codec.ts
	cocos/core/geometry/geometry-native-ext.ts
cocos/core/settings.ts
	cocos/gfx/webgpu/webgpu-define.ts
	cocos/input/input.ts
	cocos/render-scene/core/pass.ts
	cocos/rendering/custom/compiler.ts
	cocos/rendering/custom/executor.ts
cocos/rendering/custom/pipeline-define.ts
	cocos/rendering/custom/web-pipeline.ts
	cocos/rendering/render-additive-light-queue.ts
	cocos/webgpu/instantiated.ts
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/cocos/platform/SDLHelper.cpp
	native/cocos/platform/SDLHelper.h
	native/external-config.json
	package-lock.json
	package.json
	pal/env/src/native/env.ts
	pal/screen-adapter/native/screen-adapter.ts
	tests/init.ts
 2023-09-21 14:40:57 +08:00
PP
909bb484b8 support @base/debug module (#16287) 2023-09-20 16:36:11 +08:00
PP
86399f2b4a support @base/global module (#16247) 2023-09-20 10:14:21 +08:00
Zeqiang Li
8a6c212c82 update web pipeline for webgpu (#16207) 2023-09-11 17:31:43 +08:00
Zach Lee
772bfcea22 fix web pipeline framebuffer resize issue. (#16157) 
* fix web pipeline framebuffer resize issue.

* fix lint.
 2023-09-01 14:07:55 +08:00
GengineJS
1df6a1095a [Restore] additive light (#16016) 2023-08-18 01:23:18 +08:00
hyde zhou
b48581d91a V3.8.1 pipeline (#15875) 2023-08-09 15:23:40 +08:00
pandamicro
381505cc28 Merge remote-tracking branch 'cocos-for-editor/v3.8.0' into v3.8.1 
# Conflicts:
#	cocos/3d/framework/mesh-renderer.ts
#	cocos/rendering/custom/executor.ts
#	cocos/rendering/post-process/passes/fxaa-pass.ts
#	cocos/spine/skeleton.ts
 2023-07-25 22:16:11 +08:00
troublemaker52025
ec88dc5160 fix invalid punctual lights for custom pipeline (#15759) 2023-07-18 16:47:15 +08:00
hyde zhou
979e3c9677 V3.8.1 msaa (#15584) 2023-07-18 11:55:05 +08:00
minggo
e7c5b34e18 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0 
Conflicts:
	cocos/2d/assembler/label/text-processing.ts
	cocos/physics/bullet/instantiated.ts
	cocos/profiler/profiler.ts
	cocos/rendering/custom/executor.ts
	cocos/rendering/custom/index.ts
	cocos/rendering/custom/web-pipeline.ts
	cocos/rendering/pipeline-scene-data.ts
	cocos/root.ts
	cocos/spine/assembler/simple.ts
	cocos/spine/lib/instantiated.ts
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton.ts
 2023-06-27 13:35:35 +08:00
GengineJS
935bab8c34 [Fixed] Modify instancing cleanup logic. (#15544) 2023-06-27 10:03:03 +08:00
GengineJS
d801230ad0 [Fixed] To resolve the abnormal display caused by "FRAMEBUFFER_INCOMPLETE_DIMENSIONS" (#15539) 2023-06-26 18:32:25 +08:00
hyde zhou
a12777abc3 V3.8.0 pipeline (#15487) 2023-06-20 13:02:21 +08:00
minggo
06f136f5c4 Merge branch 'v3.8.0' into merge-3.8.0 2023-06-19 15:26:26 +08:00
hyde zhou
820826939d V3.8.0 pipeline (#15428) 2023-06-16 09:56:57 +08:00
PP
b8a96f0080 fix type in debug.ts (#15426) 
* fix type in debug.ts
 2023-06-14 11:33:00 +08:00
PP
509d73b27d merge branch v3.8.0-aot (#15421) 
* PR1: add explicit function return type (#15311)

* PR4: add explicit function return type (#15314)

* [ci skip][AUTO]: Automated code generating update: 8843bfe54c  (#15314) (#15357)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* add function return type

* fix version checking

* fix return type

---------

Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
 2023-06-13 18:08:45 +08:00
hyde zhou
a541d35bfd Develop pipeline merge (#15374) 2023-06-08 16:31:51 +08:00
徐兵
2eb37ff0d6 reflection-probe-manager move to 3d module (#15359) 
* move to 3d module

* export probetype

* fix error
 2023-06-07 23:47:52 +08:00
hyde zhou
43b4cb30f2 develop pipeline add subpass (#15166) 
pr-test is not ready, skip it.
 2023-06-01 10:39:20 +08:00
hyde zhou
8a7586c925 [develop pipeline] add resolve (#15121) 2023-05-23 10:11:44 +08:00
hyde zhou
6cbad38241 pipeline changes after v3.7.3 (#14998) 2023-05-10 17:46:45 +08:00
李吉林
5ead7c61de delete batching (#14957) 
* delete batching
 2023-05-04 12:46:12 +08:00
minggo
a22d16bbe6 Merge branch 'v3.7.3' into merge_v3.7.3 2023-04-24 11:26:58 +08:00
hyde zhou
d1369d2ab4 V3.7.3 pipeline (#14772) 2023-04-19 23:23:43 +08:00
santy-wang
0a81bf445e Merge branch 'develop' of github.com:cocos-creator/engine into v3.7.2 2023-03-13 16:51:47 +08:00
hyde zhou
6ed4719968 pipeline update (#14486) 
* adding queue phase

* adding per phase descriptor set

* adding render phase descriptor set

* Optimize memory usage and rendering time of WebPipeline (#106)

* Pass ubo execution optimization (#107)

* adding compute shader

* add compute shader

* add compute dispatch

* add compute shader

* adding subpass

* add dummy web subpass builder

* remove present pass

* remove present pass

* adding subpass to RenderGraph

* fix unit test

* lint fix

* fix lint

* adding raster subpass

* native subpass builder added

* Complete render phase to layoutgraph (#108)

* rename RasterTag to RasterPassTag

* rename ComputePass to Compute

* subpassGraph added

* add shading rate attachment

* fix typo

* RenderSwapchain default constructible

* Optimize Execution Memory (#110)

* add storage buffer/texture support

* add storage buffer and shading rate texture

* fix lint

* fix typo

* V3.7.2 pipeline (#109)

* fix merge conflict

---------

Co-authored-by: GengineJS <476393671@qq.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com>
 2023-03-09 17:57:05 +08:00
hyde zhou
2d9446e7c4 add render phase (#14333) 2023-03-02 00:13:38 +08:00
troublemaker52025
a7b090390e [Feature] add ranged directional light (#14306) 2023-02-23 17:58:47 +08:00
troublemaker52025
682f0a25cd [Feature] add point light (#14220) 2023-02-22 10:12:21 +08:00
hyde zhou
7e9a01f5e2 refactored web profiler and native framebuffer (#14168) 2023-02-08 15:49:06 +08:00
hyde zhou
bfe9c44fdd fix web csm, barrier generation, metal buffer/descriptor upload (#14125) 
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com>
Co-authored-by: GengineJS <476393671@qq.com>
 2023-02-03 10:50:53 +08:00
hyde zhou
97b1c40941 [pipeline] add native pipeline ubo uploading (#14061) 
* merge v3.7.0-pipeline

* pass done

* fix const reference return type

* add uniform block buiding

* fix const cast

* fix const

* fix mtl const

* integrating native program library

* native pipeline workflow updated

* adding ubo binding

* Solve the problem of the version attribute of pass (#87)

* ubo upload added

* adding camera ubo

* add constant name

* update uniform buffer

* adding execution resources

* per pass ubo added

* fix bugs

* ubo added

* fix render pass bug

* bind set added

* adding ubo uploading

* shader binding overwrite added

* shader binding overwrite added

* add missing header

* draw updated

* ubo updated

* fix main light ubo

* pass ubo added

* lint

* fix custom pipeline window resize issue. (#88)

* fix lint

* fix assert

* remove texture1d

* fix constantMacros

* lint

* fixed: native custom pipeline graphics pipeline state leak. (#89)

* lint

* skybox added

* skip subpass input binding rewrite (#90)

* per pass descriptor set modified

* adding blit

* fix material

* fix fg get usage (#91)

* fix barrier fetch

* fix ios bug

* fix barrier

* support cc builtin overwrite

* try fix shadowMap

* refactor resources

* update blit

* add render graph binding

* fix shader bugs

* fix blit

* fix bugs

* remove unnessary barriers

* fix init

* fix addCameraQuad

* fix raster view order

---------

Co-authored-by: GengineJS <476393671@qq.com>
Co-authored-by: Zach Lee <bluesky013@126.com>
Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com>
 2023-02-01 18:04:12 +08:00
hyde zhou
e11bdf5775 [pipeline] update custom pipeline (#14002) 2023-01-07 12:30:44 +08:00
hyde zhou
73d8004725 [pipeline] update custom pipeline (#13890) 2022-12-30 18:22:22 +08:00
徐兵
1d226aea71 add lod culling for reflection probe (#13955) 2022-12-29 16:32:17 +08:00
pandamicro
afd22296b4 MIT license update and to new year 2023 (#13927) 
* Cpp MIT license update and to date
* TS MIT license update and to date
 2022-12-28 11:25:12 +08:00
hyde zhou
df9b49b539 [pipeline] update custom pipeline (#13744) 2022-12-22 19:09:48 +08:00
hyde zhou
9f145fffb7 [pipeline] update custom pipeline (#13580) 2022-12-01 10:13:02 +08:00
hyde zhou
baea1cb09c [develop] fix fxaa (#13491) 2022-11-23 10:03:13 +08:00
徐兵
9a740141cc reflection probe for custom pipeline (#13407) 2022-11-17 18:12:38 +08:00
hyde zhou
eb18f16823 [develop] web-pipeline updated (#13145) 2022-10-26 13:51:28 +08:00
hyde zhou
63392ed29b [develop] web-pipeline update (#13067) 2022-10-24 17:51:50 +08:00
hyde zhou
a93676d994 [develop] custom-pipeline update (#13062) 2022-10-17 17:03:28 +08:00
hyde zhou
1333ff1f43 [develop] add layout graph serialization (#13020) 2022-10-17 14:43:36 +08:00
hyde zhou
1f2eb27fa0 [develop] added default sampler and deferred layout setup (#13034) 
Co-authored-by: GengineJS <476393671@qq.com>
 2022-10-17 11:33:48 +08:00
santy-wang
a450f100d9 fix import 2022-10-11 20:39:29 +08:00