Commit Graph

137 Commits

Author SHA1 Message Date
pandamicro 61422450d3 Fix circular dependencies 2023-07-26 13:50:04 +08:00
pandamicro 41a16d7322 Fix ci 2023-07-26 12:07:22 +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 802a1f0959 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/core/utils/x-deprecated.ts
	cocos/physics/bullet/instantiated.ts
	cocos/physics/framework/components/character-controllers/character-controller.ts
	cocos/render-scene/scene/shadows.ts
	cocos/rendering/render-shadow-map-batched-queue.ts
	cocos/spine/lib/instantiated.ts
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton.ts
	native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/cocos/editor-support/spine-wasm/spine-wasm.cpp
	native/external-config.json
2023-07-12 16:02:10 +08:00
hyde zhou 1aed1fe8b7 fix effect.bin serialization (#15690) 2023-07-12 12:27:32 +08:00
GengineJS 4b62d5d813 [Remove] Remove the discard check of the managed resource (#15685) 2023-07-12 10:45:43 +08:00
hyde zhou 99faec005f remove TextDecoder (#15648) 2023-07-07 16:24:43 +08:00
minggo 7ef995b655 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/3d/lights/spot-light-component.ts
	cocos/animation/event/event-emitter.ts
	cocos/physics-2d/box2d/physics-contact.ts
	cocos/physics-2d/box2d/physics-world.ts
	cocos/physics-2d/box2d/platform/physics-contact-listener.ts
	cocos/physics-2d/builtin/builtin-world.ts
	cocos/physics/framework/components/constraints/configurable-constraint.ts
	cocos/spine/assembler/simple.ts
	cocos/spine/skeleton.ts
	native/cocos/editor-support/spine-wasm/spine-model.cpp
	native/cocos/editor-support/spine-wasm/spine-model.h
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/external-config.json
2023-07-03 15:25:13 +08:00
hyde zhou 35f64816f3 V3.8.0 pipeline api document (#15529) 2023-06-29 12:35:28 +08:00
minggo f148e66fab fix compiling error 2023-06-27 14:21:01 +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
troublemaker52025 34e6f8900a fix csm ubo data in custom pipeline (#15502) 2023-06-21 11:46:20 +08:00
hyde zhou 235dbc7a29 sync generated code with 3.8.1 (#15490) 2023-06-20 16:59:29 +08:00
hyde zhou a12777abc3 V3.8.0 pipeline (#15487) 2023-06-20 13:02:21 +08:00
hyde zhou 69668e5f0b 'Custom' and 'Forward' pipeline is defaulted to PostProcessBuilder (#15466) 2023-06-20 10:56:09 +08:00
minggo 06f136f5c4 Merge branch 'v3.8.0' into merge-3.8.0 2023-06-19 15:26:26 +08:00
troublemaker52025 98d9bf87d9 add skin JSB binding (#15464) 2023-06-19 15:16:50 +08:00
徐兵 7776fab6df fix toon outline thickness issue with vulkan (#15458) 2023-06-19 14:27:06 +08:00
hyde zhou e06bb6cdb4 [V3.8.0 pipeline] add deferred pipeline (#15452) 2023-06-16 17:35:18 +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
GengineJS 36fbed88a0 [Delete]Remove post-processing configuration items (#15413) 2023-06-14 10:05:35 +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: 8843bfe54cd3f8e6f84432948716c8d130ecb233  (#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 c26c5b75ca V3.8.0 pipeline (#15398) 2023-06-09 16:10:56 +08:00
jk20012001 b3f8838e68 performance optimization for tone mapping pass and rename function (#15395) 2023-06-09 12:25:37 +08:00
hyde zhou 119d787796 V3.8.0 pipeline (#15383) 2023-06-08 18:47:41 +08:00
Jiujiang Liu fbc9f0bf17 Update the type returned by get worldBounds (#15378) 2023-06-08 18:38:38 +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
jk20012001 fc24875be6 fix hbao with fog and skin depth (#15340) 2023-06-07 13:27:14 +08:00
troublemaker52025 28d675e58f The globalStandardSkin setting is placed on the meshRenderer component (#15274) 2023-06-02 22:13:00 +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
jk20012001 2bbaebf30f fix post processing shader flip Y (#15205) 2023-05-26 18:00:31 +08:00
jk20012001 4910bea1ce use post-process pipeline instead of custom pipeline (#15168) 2023-05-24 17:39:19 +08:00
hyde zhou 9e00d512ae render pipeline add subpass (#15141) 2023-05-24 14:27:28 +08:00
hyde zhou 8a7586c925 [develop pipeline] add resolve (#15121) 2023-05-23 10:11:44 +08:00
徐兵 4fcb25c669 support reflection probe for postprocess pipeline (#15138) 2023-05-22 18:18:54 +08:00
徐兵 d8b6b774d7 custom pipeline support planar reflection (#15130) 2023-05-22 15:21:15 +08:00
jk20012001 3277c3d5ef fix light component UI slider range (#15100) 2023-05-18 22:22:32 +08:00
hyde zhou 34a5022096 develop pipeline interface change (#15083) 2023-05-18 13:00:23 +08:00
jk20012001 cfc95fa4ce add hbao and skin to custom pipeline, and float output support (#15069) 2023-05-16 17:48:35 +08:00
hyde zhou ae5d25924e Develop pipeline (#15030) 2023-05-16 13:03:28 +08:00
troublemaker52025 6a11716308 add hbao (#14981) 2023-05-11 18:57:38 +08:00
troublemaker52025 20f80926b1 add Separable-SSS skin (#14948) 2023-05-11 18:24:45 +08:00
徐兵 0c31bb88a8 add new postprocess component -- bloom and fxaa (#15005) 2023-05-10 18:29:03 +08:00
hyde zhou 6cbad38241 pipeline changes after v3.7.3 (#14998) 2023-05-10 17:46:45 +08:00