Commit Graph

588 Commits

Author SHA1 Message Date
jk20012001 3cf9aaee4e arrange chunks (#11551)
* arrange chunks

* update compiled shaders

* code style
2022-06-16 22:14:09 +08:00
SijieWang 934d94c68b [Optimize] Reflection Convolution: shortcuts on scene (#11421)
* [Optimize] Reflection Convolution: shortcuts on scene

* review code

* review code
2022-06-16 18:35:50 +08:00
jk20012001 2a122bfc68 builtin\internal-functions rename to builtin\functionalities (#11546) 2022-06-16 15:51:03 +08:00
godIsAProgrammer 78a7c8d21e [Optimize] fbx animation scale display (#10861)
* Optimize fbx animation scale display

* update

Co-authored-by: caoqisen <qisen.cao@cocos.com>
2022-06-15 14:19:42 +08:00
godIsAProgrammer 4aa41cbb90 [Optimize] update inspector style (#11296)
Co-authored-by: caoqisen <qisen.cao@cocos.com>
2022-06-15 14:19:12 +08:00
jk20012001 48bd6fe0ba Fix shader compiling error (#11512)
* add native pcf for shadow-map.chunk

* update compiled shaders
2022-06-15 13:38:15 +08:00
jk20012001 589082e585 Beforemigration (#11497)
* add shadow for surface shader
fix sky effect cc_matworld

* optimize ts code
2022-06-14 20:44:51 +08:00
徐兵 214f5e3dfc add specularGlossinessMap (#11502)
* add  specularGlossinessMap

* remove diffuseScale

* specularGlossinessMap modifiy
2022-06-14 19:18:37 +08:00
jk20012001 9965af4abb add debug view mode (#11449)
* add debug view mode

* code style

* fix single mode lighting lack of gamma & tonemapping

* comment style

* move from legacyCC to render-pipeline

* fix gamma & tonemapping not matched in debug view modes

* 原生实现

* move to root

* fix CSMLayers

* pack ubo data

* fix binding

* update binding

* update shaders for debug view

* code style

* fix CI
fix fog in composite mode

* resolve conversation

* resolve conversations

* function order

* resolve conversations
2022-06-14 00:13:27 +08:00
troublemaker52025 308f051faf [v3.6.0] fix direction light shadow bias has not effective (#11458) 2022-06-10 17:00:56 +08:00
袁炜海 11d4a20367 [Optimize] feat: add markdown panel (#11442) 2022-06-10 15:17:18 +08:00
troublemaker52025 a9a68e50ae [v3.6.0] CSM panel modification (#11397)
* [v3.6.0] CSM panel modification

* update

* fix ci error

* fix  ci error

* fix ci error

* build effect

* change namespace to '_csmXxxx' && '_xxxCSM'

* modification reply

* update

* update

* update

* fix ci error

* fix ci error

* fix ci error 2

* fix ci error 2

* fix ci error 3

* fix ci error 4

* fix ci error 5
2022-06-10 14:08:10 +08:00
SijieWang 3ff171cd24 Revert "[Optimize] inspector throtle 0513 (#11093)" (#11444)
This reverts commit cc65a5a8f4.
2022-06-09 19:34:15 +08:00
袁炜海 2887980874 [Bug] feat: clear the canvas on close hook (#11321)
* feat: clear the canvas on close hook

* feat: explanatory note
2022-06-09 17:06:11 +08:00
袁炜海 c42386b683 [Optimize] feat: show delete line on the removed component name (#11109)
* feat: show delete line on the removed component name

* feat: add line-through
2022-06-09 16:57:12 +08:00
pandamicro 6d679daa57 Merge pull request #11435 from pandamicro/merge3.5
Merge 3.5.2
2022-06-09 16:37:20 +08:00
袁炜海 cc65a5a8f4 [Optimize] inspector throtle 0513 (#11093)
* feat: add debounce

* feat: add debounce
2022-06-09 16:12:22 +08:00
pandamicro 8864f2f4c7 Merge remote-tracking branch 'cocos-for-editor/v3.5.2' into merge3.5
# Conflicts:
#	cocos/core/components/renderer.ts
#	cocos/core/global-exports.ts
#	cocos/core/renderer/core/render-scene.ts
#	cocos/core/renderer/core/render-window.ts
#	cocos/core/renderer/scene/index.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/scene-globals.ts
#	package.json
2022-06-09 15:20:30 +08:00
troublemaker52025 e65a3075e4 fix csm flicker for v3.6.0 (#11413)
* fix csm flicker for v3.6.0

* update
2022-06-08 19:10:54 +08:00
袁炜海 caf8669d0c [Feature] feat: add bake reflection convolution (#11257) 2022-06-08 16:37:15 +08:00
troublemaker52025 387b994f91 Add CSM for v3.6.0 (#11120)
* Add CSM for v3.6.0

* fix CI error

* fix Ci error 2

* Limit soft shadow sampling range

* update

* add soft 5x PCF

* add warn ID

* sync CSM to native engine

* fix CI error

* add Performance Mode

* fix ci error

* fix ci error 2

* fix ci error 3

* add precisely tailored

* use CC_SHADOWMAP_FORMAT

* update

* Modify default parameters

* sync to native engine

* revert config file

* fix  ci error

* modify pr problem

* fix CI error

* fix ci error

* sync to js engine

* fix ci error

* fix cc_shadowMap not binding

* fix vulkan shadow effect error

* build effect

* fix ci error

* modify review

* fix ci error

* fix ci error 2

* delete unused interfaces

* fix ci error

* update

* update 2

* fix ci error

* delete csmDebugMode

* build effect

* use csmLeve to shadowCascadeLevel

* update
2022-06-07 14:30:49 +08:00
黄森斌 0b3594e100 fix needless saving data dialog when editing fbx material in node component (#11284) 2022-06-06 15:37:57 +08:00
jk20012001 a83ad12022 fix surface shader runtime macros don't match attribute and uniform define (#11319)
* fix surface shader runtime macro doesn't match
fix surface shader include

* fix compiling error

* fix varying location missing

* fix vk fs shadowbias binding error

* fix vk fs shadowbias binding error

* fix vulkan binding flag not match

* revert binding flags

* fix vulkan error, remove CCLocal from PS
2022-06-06 15:14:32 +08:00
minggo 1788c36852 Merge pull request #11316 from cocos/v3.5.2
V3.5.2
2022-06-01 10:59:10 +08:00
Myway ecec167eae Support rotate for terrain image brush (#11286) 2022-05-31 10:04:36 +08:00
徐兵 8a9d0d9434 code format and add sliders for parameters (#11266) 2022-05-28 15:40:51 +08:00
jk20012001 95b1837269 fix specular params with surface toon (#11265) 2022-05-28 10:20:26 +08:00
jk20012001 63878dea48 fix isnan(0.0) with webgl1.0 (#11262)
* fix isinf(0.0)==true with webgl1.0

* code style
2022-05-27 21:37:55 +08:00
minggo 77701a2d84 Merge branch 'v3.5.1' into v3.6.0-merge-v3.5.1 2022-05-27 15:23:33 +08:00
jk20012001 0ed8cca119 modify shadowmap settings in default scene (#11213) 2022-05-25 11:59:13 +08:00
徐兵 c42e5832bf roughness limit (#11209) 2022-05-24 19:16:43 +08:00
黄森斌 e0dc821529 add 2d camera prefab for editor (#11204) 2022-05-24 18:06:30 +08:00
黄森斌 a110e8f619 [Optimize] modify fbx smartMaterialEnabled attribute (#11176)
* modify fbx smartMaterialEnabled attribute

* update fbx asset new default value in meta file

* fbx asset of old version,smartMaterialEnabled default false
2022-05-24 15:47:37 +08:00
minggo 7814949998 Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1 2022-05-24 11:53:57 +08:00
徐兵 f6d686f7ce basecolor modify (#11186) 2022-05-23 21:49:40 +08:00
jk20012001 c4c95e9e59 add sky.effect with surface shader (#11156)
* add sky.effect with surface shader
surface shader code style

* get ready for chunks reorganizing

* Delete default_skybox_diffusion.png.meta

* add depth functions

* add meta
2022-05-23 15:15:17 +08:00
黄森斌 9be0225770 fix help document url 404 error (#11131) 2022-05-20 14:40:05 +08:00
黄森斌 8540874d56 [Feature] fbx editing template add smart material convesion property (#11101)
* editing fbx add property smart material

* 优化文案

* update smart material i18n config

* update i18n

* modify fbx edit

* change getConfig position
2022-05-16 16:33:28 +08:00
jk20012001 6cea6782d0 code style for surface shader (#11113) 2022-05-16 16:03:16 +08:00
jk20012001 d65fd4cc8c dcc effect rename (#11107)
* dcc effect rename

* rename

* rename
2022-05-16 12:41:24 +08:00
袁炜海 17874c6fbd feat: hide addComponent button when scene is active (#11088) 2022-05-16 10:35:00 +08:00
jk20012001 98e00acfa1 fix ndc->world with deferred shading (#11099) 2022-05-15 17:52:30 +08:00
pandamicro 1318f71c65 Improve some docs and wrong manual links (#11098) 2022-05-14 19:35:37 +08:00
袁炜海 b718018467 [Bug] feat: keep group display order (#11081) 2022-05-14 18:31:16 +08:00
zxx43 630fd4731e V3.6.0 instanced particle shader fix (#11063)
* add particle instance support

* do not change particle-system.ts

* add param type to fix eslint error

* fix memory leak

* fix native destroy error

* fix particle shader bug

* remove #else

* change attribute name

* use vec2 for texcoord

* fix shader

* fix gpu shader bug

* compile native shader
2022-05-14 15:56:37 +08:00
jk20012001 005cdf44d0 optimize anisotropy sample (#11075) 2022-05-14 10:50:10 +08:00
袁炜海 fa40be3065 [Bug] feat: update file path (#11069) 2022-05-14 10:21:34 +08:00
徐兵 6394dc083c update version (#11073) 2022-05-13 21:27:37 +08:00
jk20012001 0ecaa8db51 add surface shader (#11048)
* add surface shader

* remove unused item

* arrange main-functions

* arrange main-functions

* fix compatible lighting mode
2022-05-13 21:18:22 +08:00
徐兵 19a7ebc398 rename USE_TRANSPARENT_MAP (#11068) 2022-05-13 18:38:50 +08:00