Commit Graph

81 Commits

Author SHA1 Message Date
Yun Hsiao Wu e734e1ac3d fix terrain effect (#7768) 2020-11-12 11:06:41 +08:00
Knox 8e86ab1edc updated particle default assets meta (#7762) 2020-11-11 19:14:00 +08:00
黄森斌 0ede504353 add intertnal db ui prefab assets (#7756)
(cherry picked from commit 5cd6cadb90850b6902d6ad78e56448c1ca03a479)
2020-11-11 15:20:38 +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
Knox 37f46ca8ea improve particle system 2d (#7739)
* improve particle system 2d

1.add tooltip
2.improve code

* improve code

* improve code
2020-11-10 11:58:13 +08:00
ChiaNing a6fc79acb4 change canvas z position (#7741) 2020-11-09 18:18:50 +08:00
Yun Hsiao Wu 8d2ef1fe51 fix skybox effect (#7740)
* fix skybox

* fix subMesh.iaInfo
2020-11-09 17:55:55 +08:00
cary 1610446ddc Fix the error of getter override. (#7725)
* Fix the error of getter override.

* delete property
2020-11-07 11:33:38 +08:00
黄森斌 f8f7e4acee update .rpp file template data (#7724) 2020-11-07 11:02:20 +08:00
cary 9c4bb9fd9d Add default prefab of ParticleSystem2D. (#7687)
* Add default prefab of ParticleSystem2D.

* add module export
2020-11-04 22:13:38 +08:00
Leslie Leigh (李的序) 0d20b7a38c Update *.FBX meta (#7692) 2020-11-04 16:00:23 +08:00
coulsonwang 2cdd8c6628 fix skinning-lbs chunk (#7674) 2020-11-02 17:21:54 +08:00
Santy-Wang d2b4736e48 update director's meta to the latest version (#7669) 2020-11-02 15:57:15 +08:00
pandamicro 79c941bf77 Update scrollview prefab 2020-11-02 13:11:37 +08:00
pandamicro e4c1c9add1 Merge remote-tracking branch 'origin/3d-v1.2' into 3d
# Conflicts:
#	editor/assets/default_prefab/ui/ScrollView.prefab
2020-11-02 12:51:34 +08:00
ChiaNing 6ed0e81cca new UI custom material & use hash check merge (#7649)
* new UI custom material & use hash check merge

* update

* update

* apidoc
2020-10-31 13:34:15 +08:00
jiaxin.lai 86f761c05f 3d rigidbody refactor (#7635)
* hack of visible decorator

* tweaks

* disable node chain

* using setType instead isKinematic

* fix ammo rigid body

* disable scaling of terrain shape

* twaks

* update default prefab to 1.1.22

* docs

* renaming & deprecated

* docs
2020-10-30 19:03:12 +08:00
troublemaker52025 1020378d71 update memory pool for shadow (#7606) 2020-10-30 16:19:21 +08:00
yeshao2069 a5ca4b9eb6 update default scrollview prefab (#7621) 2020-10-29 22:31:20 +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
jiaxin.lai 4cc4808072 correct the name of physics material (#7597)
* correct the name of PhysicsMaterial

* tweaks
2020-10-27 18:25:57 +08:00
cary 6bcc7933a9 Add motion streak and particle 2d. (#7588)
* Add motion streak and particle 2d.

* fix buffer error

* modify comment error

* fix ci

* fix comment

* modify some comment
2020-10-27 11:48:17 +08:00
Yun Hsiao Wu 40d959e718 gfx: pre-rotation on android (#7586) 2020-10-26 10:31:17 +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
黄森斌 2b390dab29 update internal db prefab meta version (#7556) 2020-10-21 16:21:26 +08:00
Knox 586dcded59 update default assets (#7563)
canvas node add widget component
2020-10-21 15:59:30 +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
Knox 17a8f8b54e update default prefab ScollView.prefab (#7562) 2020-10-20 14:40:55 +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
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
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
黄森斌 8ae5b52379 typescript template add document reference link (#7488) 2020-10-11 17:19:01 +08:00
Knox 1ca96f678b improve web view component (#7414)
* add web view

* add web view gizmo icon
2020-10-11 17:12:11 +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
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 fa6a45aa1a fix shadow draw model back (#7431)
* fix shadow draw model back

* add effect.ts
2020-09-21 17:59:38 +08:00
troublemaker52025 88455d9f95 shadow effect blur (#7391)
* shadow effect blur

* update

* add effects
2020-09-21 12:03:28 +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
pandamicro f85145710a Support lightmap in default primitive models (#7396) 2020-09-16 23:57:23 +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
JoneLau c4606c8643 adjust the Graphics structure to support continuous data filling (#7359) 2020-09-13 23:33:07 +08:00