Commit Graph

26 Commits

Author SHA1 Message Date
Yun Hsiao Wu e734e1ac3d fix terrain effect (#7768) 2020-11-12 11:06:41 +08:00
troublemaker52025 3c669c4d9f Add spot light shadow for 3D (#7643) 2020-11-11 10:15:42 +08:00
coulsonwang 2cdd8c6628 fix skinning-lbs chunk (#7674) 2020-11-02 17:21:54 +08:00
JoneLau 351b6480e4 add image stencil in mask (#7598)
* add image stencil in mask

* update
2020-10-28 12:13:53 +08:00
Yun Hsiao Wu a318283a41 fix pre-rotation adaptation (#7607) 2020-10-28 10:28:21 +08:00
Yun Hsiao Wu c53d9f0ffb update effects (#7585) 2020-10-22 17:34:59 +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
Jare Guo 0319477911 fix decorator warning of ValueTypes (#7553)
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
2020-10-21 16:31:41 +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
troublemaker52025 82cc28847b add terrain shadow (#7500)
* add terrain shadow

* update

* update

* update

* delete temp source code

* Optimize the auto shadow

* shadow 和 0 号对齐

* add reciveshadow control

* cancel

* fix shadow effect display error

* update

* use 1.0, doesnt use 1 in glsl

* update effects

* change bbMin  && bbMax use Number.MAX_VALUE && Number.MIN_VALUE

* update

* update
2020-10-15 16:48:44 +08:00
Myway 0b1f4d316e 3d v1.2 terrain support dynamic lighting (#7510)
* fix terrain bound error, terrain support dynamic lighting

* fix terrain fog

* standard surface add lighting map info

* Revert pcf filter

Co-authored-by: Myway3D1 <404793124@qq.com>
2020-10-13 18:01:03 +08:00
troublemaker52025 3375a5cf15 Shadow optimization (#7459)
* toon receives shadow

* fix gfx state cache

* 背面消影

* merge cc_ShadowPCF && cc_ShadowMapSize to cc_ShadowInfo;  add bias to shader and editor

* update

* merge pr #7452

https://github.com/cocos-creator/engine/pull/7452

* reomve atten; use NL

Co-authored-by: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
2020-09-30 15:36:01 +08:00
Leslie Leigh (李的序) 21a6bb135a Optimize morph rendering (#7436) 2020-09-30 15:24:29 +08:00
troublemaker52025 e7ada483a8 Shadow range culling for 3d-v1.2 (#7439)
* shadowMap range culling

* fix the light follows the position of the model

* using light node matrix
2020-09-22 14:26:56 +08:00
troublemaker52025 88455d9f95 shadow effect blur (#7391)
* shadow effect blur

* update

* add effects
2020-09-21 12:03:28 +08:00
Leslie Leigh (李的序) 3384e300a4 Fix decode32 precision issue (#7371)
* Fix decode32 precision issue

* Typo


Typo


Typo
2020-09-14 17:52:34 +08:00
Leslie Leigh (李的序) 6803722fc8 Fix morph issue on some platforms (#7268)
* Fix morph issue on platforms with shader >= 300 && having not float texture

* Fix

* Update

* Optimize

* Typo
2020-09-02 10:27:33 +08:00
Yun Hsiao Wu 18574abab4 misc fixes (#7245)
* fix IBL mip level

* fix decode include order

* better UBO size calc

* fix PSO manager hashing
2020-08-30 21:51:36 +08:00
troublemaker52025 c99525cb7f Repair shadow matrix for 3d-v1.2 (#7223)
* calculate sphere

* calculate shadowCamera matirx

* update

* add pcf shadow

* update

* Modify shadowUI style

* Solve the error

* use else if

* add pcf sampler to x25 times
2020-08-28 11:14:16 +08:00
Yun Hsiao Wu e7ef53bd50 fix decode header (#7225) 2020-08-26 18:29:21 +08:00
troublemaker52025 b8b1cdec71 repair general-vs.chunk (#7187) 2020-08-20 16:13:39 +08:00
Myway fd777b6a02 lighting map support instancing (#7149)
Co-authored-by: Myway3D1 <404793124@qq.com>
2020-08-17 16:32:15 +08:00
ChiaNing 1cdc95853e UI sharedMaterial (#7112)
* ui update pass

* change UI default mat

* builtin effect fallback

* MaterialType fallback

* fix blendfunc

* updateBlendFunc for custom material

* fix mask & graphics comp

* useless code remove

* update code

* update stencil

* useless code remove

* useless remove

* graphics useless remove

* rebase

* UI sprite texture becomes local descriptor

* rename & add chunk

* update effect
2020-08-17 16:30:00 +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