Commit Graph

32 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
Yun Hsiao Wu 0c8ebc83bc fix flat buffer generation (#7751) 2020-11-10 19:30:22 +08:00
Yun Hsiao Wu 8d2ef1fe51 fix skybox effect (#7740)
* fix skybox

* fix subMesh.iaInfo
2020-11-09 17:55:55 +08:00
Santy-Wang d2b4736e48 update director's meta to the latest version (#7669) 2020-11-02 15:57:15 +08:00
troublemaker52025 1020378d71 update memory pool for shadow (#7606) 2020-10-30 16:19:21 +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 40d959e718 gfx: pre-rotation on android (#7586) 2020-10-26 10:31:17 +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
JoneLau b86f3ccec1 adjust the Graphics structure to support continuous data filling (#7523) 2020-10-14 11:54:15 +08:00
zheng han c8a4884d1a 3d physics 2d gizmo (#7493)
* add mask param to raycast

* refine code

* 1. add some decorator
2. export earcut

* add dashed line

* revert mainLoop modify

Co-authored-by: 2youyou2 <501251991@qq.com>
2020-10-12 15:50:07 +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 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
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 b021a20722 submit once per frame (#7401) 2020-09-18 13:38:19 +08:00
JoneLau c4606c8643 adjust the Graphics structure to support continuous data filling (#7359) 2020-09-13 23:33:07 +08:00
Yun Hsiao Wu 2f951db5e2 skybox aspect ratio should take viewport into account (#7297) 2020-09-03 17:46:11 +08:00
Yun Hsiao Wu 856c436a1f fix shadow caster shader (#7293) 2020-09-03 15:00:00 +08:00
pandamicro 3240dba206 Component rename for new standard and 2d compatibility (#7103)
* Rename ui related components

* Rename files

* Remove Useless errors

* Fix sealed names

* Fix sealed global variables

* Fix circular reference

* Refactor more component names

* Rename particle and animation related component

* export scene and models sub module in renderer

* Rename ModelComponents to Model

* Refactor LightComponents to Light

* Refactor CameraComponent to Camera

* Refactor ConstraintComponents to Constraint and rename physics comps

* Cleanup and fix issues

* Small fixes

* Refactor Model to MeshRenderer

* Final touch

* Fix data class export

* Better deprecation to cover all old usage

* Simpler and better deprecation with js.setClassAlias

* Fix ci

* Fix editor issue
2020-09-02 15:31:49 +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
yinkaile a3b3782aaa 3d v1.2 graphics (#7164)
* sync #5447 - fixed graphics square cap

* sync #6474 - support graphics antialiasing

* sync #5168

* revert unused code
2020-08-19 11:09:23 +08:00
JoneLau 173b1a52f5 ui vertex pixel alignment processing (#7138) 2020-08-17 23:05:03 +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