Commit Graph

332 Commits

Author SHA1 Message Date
徐兵 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
黄森斌 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
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
徐兵 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
徐兵 e72e70c91c dcc effect (#11057) 2022-05-13 12:43:27 +08:00
jk20012001 10e1be3c13 update shader migrated meta (#11038)
update compiled shader
2022-05-12 10:53:47 +08:00
黄森斌 351a937070 correct render pipeline script template error (#10927) 2022-05-12 10:48:15 +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
ChiaNing a3387ce967 change scene2d templates for camera (#11020)
Co-authored-by: ChiaNing <sun.clooud.mo@gmail.com>
2022-05-10 17:06:36 +08:00
Leslie Leigh (李的序) b0208b65c0 Update internal FBX assets meta (#10835) 2022-04-22 12:38:47 +08:00
hyde zhou 019d35b22e [V3.5.0 deferred pipeline] fix vulkan crash problem (#10809)
* disable post-process alpha blend

* effects updated

* effects updated

* vk fix added

* disable gles3 fbf

* fix typo

* format and add comments

* add TODO

* fix TODO
2022-04-20 18:26:48 +08:00
jk20012001 7dd624f8fe remove v_bitangent, optimize vs varying data size for performance issue with metal (#10797)
* remove v_bitangent, optimize vs varying data size for performance issue with metal

* update compiled shaders
2022-04-19 15:24:20 +08:00
Leslie Leigh (李的序) b6e9df662d Optimize ts template (#10801) 2022-04-19 13:34:11 +08:00
GengineJS 3cea8e7fb8 Fix CCLocal and CCForwardLight binding error of deferred pipeline (#10778)
* Fix CCLocal and CCForwardLight binding error of deferred pipeline

* post process stage enable blend

* Modify the way post process stage alpha blending

* restore postprocess
2022-04-19 11:45:33 +08:00
黄森斌 ca5b486583 update meta files (#10799) 2022-04-19 10:16:31 +08:00
jk20012001 e240164c97 increase max normalmap intensity value (#10774)
* increase max normalmap intensity value

* rename normalStrenth
2022-04-15 18:30:28 +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 aebdeba97a Fix toggle environment lighting diffusemap failed (#10739)
* Fix toggle environment lighting diffusemap failed
Add CCGetShadowFactorSoft5X

* revert soft shadow shader code
2022-04-14 16:29:16 +08:00
SijieWang a3cd62e8c6 [Update] Update the 2D scene template (#10752)
* [Update] Update the 2D scene template

* review code

Co-authored-by: Sijie <devhacker520@hotmail.com>
2022-04-14 11:51:30 +08:00
jk20012001 e78c4c852b Fix #11925 skin instancing vertex attributes binding order for native engine (#10703) 2022-04-09 21:18:24 +08:00
hyde zhou db0ee6f1c5 disable post-process alpha blend (#10658) 2022-04-06 11:22:52 +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
黄森斌 d60a2027f4 update meta files (#10593) 2022-03-31 14:10:22 +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
黄森斌 5866b04333 V3.5.0 optimize ts templates (#10553)
* optimize ts templates

* modify ts template

* recover code, import Node from cc
2022-03-29 20:13:55 +08:00
黄森斌 f5464fd27c [Optimize] optimize ts template (#10530)
* optimize ts template

* update ts template
2022-03-27 16:39:28 +08:00
Santy-Wang 98e52e3f16 output warning info when attached to the node has zero scaling (#10524)
* output warning info when attached to the node has zero scaling

* use approx instead
2022-03-26 22:23:29 +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
Leslie Leigh (李的序) b87c185333 Marionette: layer, mask, auto trigger, pass through state (#10179)
* Marionette/3.5.0 Initial Commit

* Auto trigger default value

* import skeleton 改为选择 fbx 文件

* Rename passthrough -> empty

* Refactor Auto Trigger (#81)

* Refactor auto trigger

* Lint

* Optimize

* Update

* Migrate triggers (#82)

* Fix merge problems

* Optimize

* Optimize

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-22 15:05:45 +08:00
Myway 459abdbd72 change lighting map unpack and luminance multiply (#10185) 2022-03-22 12:01:47 +08:00
jk20012001 766b7efb2a Fix: #11580 create new light source intensity display type unknown (#10324) 2022-03-15 14:32:14 +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
Yun Hsiao Wu a291000259 update default content (#10273) 2022-03-09 18:23:43 +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
pandamicro 574976bfa1 Update internal assets and meta (#10203) 2022-02-28 16:53:23 +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
pandamicro 50a43e18e4 Shared vb accessor for spine (#10077)
* Robust updateOpacity in batcher & cleanup code

* Support Batcher2D commitIA

* Support customized buffer size for StaticVBAccessor

* Reorganize RenderData logic and prepare spine refactor

* spine realTimeTraverse using dedicated accessor

* Support spine clipping

* Fix updateOpacity in batcher 2d

* Support Spine cache mode

* Fix ci

* Use different accessor for tint spine

* Update effect

* Fix native spine and dagonbones IA range issue

* Fix spine tint accessor registartion

* Revert darkColor default value

* Fix spine accessor switching issue and render data init issue

* Shared vb accessor for dragonbones (#44)

* Shared vb accessor for dragonbones

* fix code style

* add explanation why need resize render data in realTimeTraverse

Co-authored-by: zhakesi <liqiao@cocos.com>
2022-02-18 15:24:59 +08:00