Commit Graph

47 Commits

Author SHA1 Message Date
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 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
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
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
Myway 459abdbd72 change lighting map unpack and luminance multiply (#10185) 2022-03-22 12:01:47 +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
Yun Hsiao Wu 21e4e2e0c8 update effects (#10145) 2022-02-22 16:19:15 +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
Yun Hsiao Wu 1763f2556e fix default property missing when property index is set (#9683) 2021-11-18 16:35:29 +08:00
jk20012001 5dcdb6319b Linearcolor (#9588)
* Fix #9633 color picker linear conversion in unlit shader

* Update compiled shaders

* Fix material: linear space input #9558 delete properties leads to black albedo in additive pass

* Update compiled shaders

* Revert format change

Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-11-01 22:21:00 +08:00
Yun Hsiao Wu c66ef23455 material: linear space input (#9558) 2021-10-29 11:11:50 +08:00
jk20012001 5732646608 Fix PBR lighting trick issues (#9510)
* Fix PBR lighting trick issues
Fix unlit shader in HDR mode

* Update compiled shaders
2021-10-22 10:54:13 +08:00
linshunjun 7d7a06b40d update-twoside-material (#9348)
* update-twoside-material

* update-twoside-material
2021-09-22 15:26:49 +08:00
santy-wang c87577b809 Merge branch 'v3.3.1' of https://gitlab.cocos.net/publics/engine into v3.4 2021-09-09 13:33:35 +08:00
GengineJS fd1ea41235 Fix the problem of deferred pipeline uimodel without light and metal crash (#9261)
* Fix the problem of deferred pipeline uimodel without light and metal crash

* update effect

* update comment

* update comment

* modify comment
2021-09-01 15:51:56 +08:00
Yun Hsiao Wu 4cf1350fe0 gfx: swapchain refactor (#9030)
* update effect.hideInEditor

* swapchain refactor

* webgl multi draw

* implicit depth/stencil format

* native adapt

* explicit resizable texture

* DrawInfo in InputAssembler

* device cached states

* sync defines

* gfx: empty backend

* update playground

* remove profiler camera

* update effect types

* fix pass.resetUniform
2021-08-31 19:40:50 +08:00
jk20012001 a6dfddc780 Fix spotlight shadow formerge (#9177)
* fix spotlight shadow matrix, lineardepth, selfbias error (#8483)

* Spotlight shadows: Added depthbias in viewspace units

* Remove now unnecessary UBO constants

* Add support for directional lights

* fix spotlight shadow matrix, lineardepth, selfbias error (#8483)

* Fix Spotlight light leaking in backface and compiling error

* fix dirlightview matrix error

* more accuracy for spotlight shadow bias

* Fix face normal bias

* Fix DirLight Soft/Soft2X

* improve performance for ShadowUBO divid op

* remove spotshadow linear mode(can't work with new shadow bias), fix spotshadow linear mode

* fix spot shadow linear mode

* directional light packing mode and disable linear mode

* compiled effects

Co-authored-by: Jamie Anthony Morris <Jamie.Morris@cocos.com>
2021-08-16 14:50:41 +08:00
cary 333e39d100 Fix sort scene crash of metal for IOS platform. (#9144)
* Fix sort scene crash of metal for IOS platform.

* merge branch
2021-08-06 18:18:47 +08:00
jk20012001 db8560be08 Remove SpecularIntensity in StandardSurface struct (#9099)
* RGBE Use High Precision Decoder

* Remove SpecularIntensity in StandardSurface struct

* Fix Merge Conflict

* Remove SpecularIntensity in StandardSurface struct

* Remove SpecularIntensity in StandardSurface struct
2021-07-30 15:53:40 +08:00
linshunjun 176e23e847 update_AO_SPECULAR_LINEAR-VERTEX-COLOR v3.3 (#8875)
* update_AO_SPECULAR_LINEAR-VERTEX-COLOR v3.3

* Delete_Comment
2021-06-25 14:01:56 +08:00
GengineJS 8b89c3fef2 [Feature] Rt adaptation (#8483)
* [Feature] Rt adaptation

* [Feature] Effect adds CC_HANDLE_GET_CLIP_FLIP function

* update effect

* update effects
2021-04-19 20:05:48 +08:00
troublemaker52025 0649241938 Add packing && linear depth && self-shadowing && normal bias option for v3.1 (#8397) 2021-04-19 16:56:39 +08:00
Myway 92bed0170e lightmap use rgbe format (#8468)
Co-authored-by: Myway3D1 <404793124@qq.com>
2021-04-16 18:55:33 +08:00
zheng han a5ab737a34 add slider for some props in builtin-standard.effect (#8419) 2021-04-14 13:46:45 +08:00
cary 7cb440d393 Fix render error of deferred pipeline on vulkan. (#8356) 2021-03-15 11:28:45 +08:00
cary f38fd57c0f Fix phase error of gbuffer stage. (#8318) 2021-03-03 08:50:56 +08:00
cary 8b4c2f7f5e Fix the material and resources of the deferred pipeline. (#8289) 2021-03-02 18:19:29 +08:00
Yun Hsiao Wu 6d5cf2112a unify forward/deferred material (#8267) 2021-02-22 15:56:30 +08:00
Leslie Leigh (李的序) 9ea17343b9 Fix: builtin standard effect should respect to alpha channel of vertex color (#8138)
* Fix: builtin standard effect should respect to alpha channel of vertex color

* Update
2021-01-14 15:33:40 +08:00
troublemaker52025 c94b0b5aba Optimize transparent shadows (#7918)
* Optimize transparent shadows

* use eslint

* update
2020-12-15 13:54:36 +08:00
troublemaker52025 3c669c4d9f Add spot light shadow for 3D (#7643) 2020-11-11 10:15:42 +08:00
Yun Hsiao Wu 0c8ebc83bc fix flat buffer generation (#7751) 2020-11-10 19:30:22 +08:00
troublemaker52025 1020378d71 update memory pool for shadow (#7606) 2020-10-30 16:19:21 +08:00
pandamicro 6101d772a2 Merge remote-tracking branch 'origin/3d-v1.2' into 3d
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/data/decorators/property.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/forward/scene-culling.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/ui/mesh-buffer.ts
#	cocos/core/renderer/ui/ui-vertex-format.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	cocos/ui/assembler/graphics/webgl/graphics-assembler.ts
#	cocos/ui/components/graphics.ts
#	editor/assets/default_prefab/3d/Capsule.prefab.meta
#	editor/assets/default_prefab/3d/Cone.prefab.meta
#	editor/assets/default_prefab/3d/Cube.prefab.meta
#	editor/assets/default_prefab/3d/Cylinder.prefab.meta
#	editor/assets/default_prefab/3d/Plane.prefab.meta
#	editor/assets/default_prefab/3d/Quad.prefab.meta
#	editor/assets/default_prefab/3d/Sphere.prefab.meta
#	editor/assets/default_prefab/3d/Torus.prefab.meta
#	editor/assets/default_prefab/Camera.prefab.meta
#	editor/assets/default_prefab/Terrain.prefab.meta
#	editor/assets/default_prefab/effects/Particle System.prefab.meta
#	editor/assets/default_prefab/light/Directional Light.prefab.meta
#	editor/assets/default_prefab/light/Sphere Light.prefab.meta
#	editor/assets/default_prefab/light/Spot Light.prefab.meta
#	editor/assets/default_prefab/ui/Button.prefab.meta
#	editor/assets/default_prefab/ui/Canvas.prefab.meta
#	editor/assets/default_prefab/ui/EditBox.prefab.meta
#	editor/assets/default_prefab/ui/Label.prefab.meta
#	editor/assets/default_prefab/ui/Layout.prefab.meta
#	editor/assets/default_prefab/ui/Mask.prefab.meta
#	editor/assets/default_prefab/ui/ProgressBar.prefab.meta
#	editor/assets/default_prefab/ui/ScrollView.prefab.meta
#	editor/assets/default_prefab/ui/Slider.prefab.meta
#	editor/assets/default_prefab/ui/Sprite.prefab.meta
#	editor/assets/default_prefab/ui/Toggle.prefab.meta
#	editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
#	editor/assets/default_prefab/ui/Widget.prefab.meta
2020-10-21 18:35:11 +08:00
Yun Hsiao Wu d61330ee03 discrete descriptor set layout bindings (#7536)
* allow discrete descriptor set layout bindings

* specialize local DS layout

* fix binding indices mapping

* fix shadows

* UI: update buffer after device.acquire

* update shadow phase name

* ext blend minmax support

* fix splash screen on native
2020-10-20 15:08:17 +08:00
Myway 7e1916973b fix terrain bound error, terrain support dynamic lighting (#7505)
* fix terrain bound error, terrain support dynamic lighting

* fix terrain fog

Co-authored-by: Myway3D1 <404793124@qq.com>
2020-10-12 15:14:12 +08:00
pandamicro 7481303268 Merge branch '3d-v1.2' into 3d
# Conflicts:
#	cocos/core/3d/framework/camera-component.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/components/component-event-handler.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/pipeline/define.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/instanced-buffer.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/pipeline/shadow/shadow-flow.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/scene/skybox.ts
#	cocos/core/splash-screen.ts
#	cocos/ui/components/button.ts
#	cocos/ui/components/editbox/edit-box-impl.ts
#	editor/assets/primitives.fbx
#	package-lock.json
#	package.json
2020-09-30 18:01:33 +08:00
troublemaker52025 fa6a45aa1a fix shadow draw model back (#7431)
* fix shadow draw model back

* add effect.ts
2020-09-21 17:59:38 +08:00
Yun Hsiao Wu da50b72654 pass main light handle (#7426) 2020-09-21 11:48:03 +08:00
Yun Hsiao Wu 856c436a1f fix shadow caster shader (#7293) 2020-09-03 15:00:00 +08:00
Yun Hsiao Wu c451c8a4e8 bindless textures (#7231)
* bindless textures

* unified pass UBOs

* remove gl.getActiveUniform in WebGL2
2020-08-28 10:18:34 +08:00
Myway fd777b6a02 lighting map support instancing (#7149)
Co-authored-by: Myway3D1 <404793124@qq.com>
2020-08-17 16:32:15 +08:00
Yun Hsiao Wu f45ea7928e fix shadow map generation (#7141) 2020-08-14 23:09:51 +08:00
Yun Hsiao Wu dfc3d141f2 GFX Descriptor Set (#7101)
* gfx: descriptor sets

* gfx: descriptor set, singular

* better structure

* adapt upper layers: first pass

finally all compiler errors cleared.

OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM

* adapt upper layers: second pass

THERE AND BACK AGAIN

* unified light pass & shadow shader

* gfx: descriptor set & pipeline layout

* light pass: better structure

* light pass: dynamic uniform

* even more type checking for memory pools

* Fix particleSystem and lineComponent.

* delete comment

* guard pool init param

* Fix trail module error.

* delete space

* light pass: instancing & batching support

* don't polyfill gfx stuff inside EffectAsset

* better light pass structure

* fix spot light culling

Co-authored-by: caryliu <caryliu1999@gmail.com>
2020-08-13 18:21:15 +08:00
SijieWang fbb6c52314 Move internal assets to the engine (#7093) 2020-08-06 22:09:24 +08:00