Commit Graph

136 Commits

Author SHA1 Message Date
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
jk20012001 98e00acfa1 fix ndc->world with deferred shading (#11099) 2022-05-15 17:52:30 +08:00
jk20012001 005cdf44d0 optimize anisotropy sample (#11075) 2022-05-14 10:50:10 +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
jk20012001 10e1be3c13 update shader migrated meta (#11038)
update compiled shader
2022-05-12 10:53:47 +08:00
Myway 60e44f7564 terrain and model automatic choose lightmap shader (#11006)
* terrain and model automatic choose lightmap shader

* fix eslint error
2022-05-12 01:43:32 +08:00
jk20012001 c559cab440 Fix instancing performance issue with new chips on metal (#10765)
* Fix instancing performance issue with new chips on metal

* Fix shadow bias with Batching
Update compiled shaders
2022-04-14 17:02:55 +08:00
jk20012001 e78c4c852b Fix #11925 skin instancing vertex attributes binding order for native engine (#10703) 2022-04-09 21:18:24 +08:00
jk20012001 9f83fb1ae9 Add specular intensity for DCC effects (#10613)
* Add specular intensity for DCC effects
effect data migrates for include decode-base and specular intensity

* update compiled shaders
2022-03-31 18:25:03 +08:00
jk20012001 5f75e3a206 add constants for surface shaders (#10590)
* make sure shader include

* add constants
2022-03-30 17:37:13 +08:00
jk20012001 6e93a0e10f Fix #11796 using cc_shadowbias without batching macro (#10587)
* Fix #11796 using cc_shadowbias without batching macro

* code style
2022-03-30 15:01:41 +08:00
jk20012001 80ceb1c6eb Fix punctual lights luminance * PI (#10480)
* Fix punctual lights luminance * PI

* code style
2022-03-24 18:13:19 +08:00
jk20012001 d5f172b782 Fix fog accumulated error with multiple local lights (#10445)
* Fix fog accumulated error with multiple local lights

* add standard exposure value for lightmap
2022-03-23 17:43:43 +08:00
Myway 459abdbd72 change lighting map unpack and luminance multiply (#10185) 2022-03-22 12:01:47 +08:00
jk20012001 6e4d4a30ac code style for surface shader (#10326) 2022-03-15 14:31:41 +08:00
jk20012001 d6cc1a4094 deferred shading code revert to 3.4.2 (#10339)
* deferred shading code revert to 3.4.2

* code style
2022-03-14 20:11:47 +08:00
jk20012001 48e45ce2d7 fix compiling error with merged code (#10332)
* fix compiling error with merged code

* code style
2022-03-14 17:53:06 +08:00
jk20012001 e6f156c841 fix unnecessary include for surface shader (#10220) 2022-03-01 18:21:32 +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
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
troublemaker52025 bdd36a59da update chunk.mate for v3.5.0 (#10148) 2022-02-22 18:01:25 +08:00
Yun Hsiao Wu 21e4e2e0c8 update effects (#10145) 2022-02-22 16:19:15 +08:00
jk20012001 2549157630 Rearrange IA input variables and functions for surface shader (#10123)
* Rearrange IA input variables and functions for surface shader
Fix default_skybox.meta missing

* Update compiled shaders

* Fix code style
2022-02-17 17:16:00 +08:00
ChiaNing 8f87cbd483 useless UI_GPU code delete (#10048) 2022-01-25 19:14:41 +08:00
jk20012001 dbc22fe878 fix shader code style (#10039) 2022-01-24 18:18:24 +08:00
santy-wang 995f5b2d41 Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge 2022-01-24 15:56:49 +08:00
zxx43 6e32470a71 fix particle switch cpu / gpu bug caused by alignment space (#9952)
* fix particle switch cpu / gpu bug caused by alignment space

* ensure sqrt quaternion to be > 1
2022-01-11 23:18:55 +08:00
DolaMay c6cda96170 Position Delete & Normal Compress: 3.4.1 (#9939)
* Position Delete & Normal Compress

* delete some debug codes

* code review fix
2022-01-07 22:56:14 +08:00
troublemaker52025 39ff7f0798 Change define(CC_DIR_SHADOW) to uniform(cc_lightDir.w) for v3.4.1 (#9921)
* change define(CC_DIR_SHADOW) to cc_lightDir.w uniform for v3.4.1

* update

* update 2

* update effect

* update

* update effect 2
2022-01-06 23:08:39 +08:00
santy-wang 7ffe1bc031 Merge branch 'v3.4.1' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-01-06 14:41:28 +08:00
troublemaker52025 17e0e7ea7b Combing planar-shadow calculations for v3.4.1 (#9903)
* Combing planar-shadow calculations for v3.4.1

* update

* update
2022-01-05 23:26:23 +08:00
jk20012001 0c19b9a883 fix define syntax error (#9870)
* fix define syntax error

* fix toon shader syntax error
2021-12-24 17:36:47 +08:00
jk20012001 eb883997a1 Fix #10538: Android+WebGL PS struct variables has mediump precision (#9863)
* Fix #10538: Android+WebGL PS struct variables has mediump precision

* update compiled shaders

* review modification

* update compiled shaders
2021-12-24 11:01:54 +08:00
jk20012001 c1146b813c Fix skeleton model receive shadow macro error and toon shadow display errors (#9836)
* 修复骨骼模型接受阴影的开关无效 及 toon shadow计算的错误

* toon精确判断背光面及强制所有面接受阴影

* toon使用参数来调节接受阴影的区域
2021-12-23 17:18:34 +08:00
santy-wang 5899123ce0 Merge branch 'v3.4.1' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-12-22 10:31:17 +08:00
zxx43 7ece432cbc Improve gpu particle performance (#9847)
* improve gpu particle performance

* fix eslint error
2021-12-21 17:50:34 +08:00
santy-wang 2355247db0 Merge branch 'v3.4.1' of github.com:cocos-creator/engine into v3.5.0 2021-12-17 11:06:22 +08:00
pandamicro d2c42d02c6 Merge branch 'v3.4.0' into v3.4.1
# Conflicts:
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
2021-12-16 14:51:39 +08:00
jk20012001 497769947f Fix #10433: 打开safari webgl1 ddx ddy指令的扩展 (#9820) 2021-12-15 16:37:59 +08:00
santy-wang d3d84673d3 Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-12-10 19:20:01 +08:00
troublemaker52025 afe53d9d71 fix shadowMap sampler accuracy loss for v3.4.0 (#9794) 2021-12-10 18:16:05 +08:00
Yun Hsiao Wu c8efc1491d fix texture lod extension (#9761) 2021-12-06 09:59:33 +08:00
santy-wang 6cde877e5b Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-11-24 14:23:21 +08:00
jk20012001 2cbc8a3ed5 Fix effect blend state syntax error (#9708)
* Fix effect blend state syntax error
Add isNan function

* code style
2021-11-23 14:28:02 +08:00
jk20012001 d3fe96f5cc Fix linear color in other effects (#9665)
* Fix linear color in other effects

* Update compiled shaders

* Fix name
2021-11-16 17:48:38 +08:00
zxx43 781ae1a6dc V3.4 vulkan shader fix (#9663)
* fix pseudoRandom vulkan compatible issue

* refine shader

* add comment for this issue
2021-11-15 20:03:39 +08:00
jk20012001 4f3d85ab78 Fix fog macro->function arguments type error (#9637)
* Fix fog macro->function arguments type error
Fix fog color linear conversion

* Fix eslint warning
2021-11-10 14:31:09 +08:00
zhakesi 7e8c6639de revert fix skinning instancing animation (#9598) 2021-11-02 14:36:31 +08:00
jk20012001 56515cc84f Code style: replace macros to functions (#9572)
* Code style: replace macros to functions

* Update compiled shaders
2021-10-29 18:16:47 +08:00
jk20012001 05bfe29cc2 Fog on big plane #7907 (#9561)
* Add accurate fog (pixel fog), add fog start support to exp fog

* Update compiled shaders

* effects support accurate fog
2021-10-29 10:22:46 +08:00