Commit Graph

180 Commits

Author SHA1 Message Date
pandamicro 476edcc8c5 Merge pull request #9232 from cocos-creator/develop
Merge develop to v3.4
2021-08-23 15:36:16 +08:00
Santy-Wang abb8222ec9 Merge pull request #9223 from cocos-creator/v3.3.1
sync V3.3.1
2021-08-21 14:26:32 +08:00
Santy-Wang 69d7e74d19 Merge pull request #9222 from cocos-creator/v3.3.0
sync V3.3.0
2021-08-21 14:25:48 +08:00
Yun Hsiao Wu f09a8e4449 fix webgl uniform array upload (#9202) 2021-08-20 11:26:47 +08:00
Leslie Leigh (李的序) 16ca1acee5 Upgrade internal primitives.fbx to use newer FBX importer (#9188) 2021-08-18 13:48:51 +08:00
Santy-Wang 93889feac4 Merge pull request #9187 from cocos-creator/v3.3.0
sync V3.3.0
2021-08-16 17:19:58 +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
pandamicro 3f615ab647 Add dt threshold (#9181)
* Add dt threshold

* Fix ci

* Fix game.step and add time unit comments

* Fix adjusted frame time
2021-08-14 23:22:03 +08:00
黄森斌 8c4e850df4 fix resizeObserver loop limit exceeded (#9159) 2021-08-11 14:30:04 +08:00
pandamicro 248d674c2a Update effects (#9149) 2021-08-06 22:16:45 +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
lawrence-liuyue fbd92ab01f apply deferred pipeline to Framegraph (#9083)
* framegraph, port from dpc

* fix sspr bug in android + vulkan

* Revert "fix sspr bug in android + vulkan"

This reverts commit dc8fad8bc8aec686888ec176d97809a102223a42.
2021-08-06 12:01:41 +08:00
黄森斌 6c53d88327 V3.3.0 add scene-2d template for 2d project (#9145)
* add scene-2d template

* Update editor/assets/default_file_content/ts

Co-authored-by: SijieWang <itharbors@outlook.com>

Co-authored-by: SijieWang <itharbors@outlook.com>
2021-08-06 11:28:46 +08:00
Leslie Leigh (李的序) 5b41c11fc7 Update asset metadata (#9110) 2021-08-03 10:26:38 +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
jk20012001 5c9a6b3a6b RGBE Use High Precision Decoder (#9089) 2021-07-29 16:34:57 +08:00
zxx43 699c29ca1b V3.3 rotation fix (#9076)
* fix rotation of VerticalBillboard & HorizontalBillboard

* combine the same condition
2021-07-27 19:35:05 +08:00
zxx43 7a2dda149d Particle rotation fix (#8920)
* fix rotation bug

* fix circular dependency

* add R2D constant & reuse renderMode

* fix r2d

* remove mat3 import

* remove error import

* add some remarks & simplify some statements

* sync gpu with cpu render

* fromEuler use degree

* remove useless statements

* fix spell problem

* sync shader with cpu

* update build shader

* fix some spell bug
2021-07-23 22:17:18 +08:00
cary ca61c1f479 Update deferred lighting effect. (#9037) 2021-07-23 14:24:09 +08:00
黄森斌 56377bab71 V3.3.0 when create typescript asset , predefined some variales (#9024)
* add ts template Predefined variables

* change variable name
2021-07-22 17:04:21 +08:00
zxx43 a17dbe28db V3.3 fix range bug & modify default alpha key to 0 & FrameOverTime mode to curve (#8981)
* fix range bug & modify default gradient alpha key to 0 & TextureAnimation FrameOverTime mode to curve

* set default alpha to 255
2021-07-21 13:40:40 +08:00
黄森斌 afdf2e9fb9 update prefab meta files (#9012) 2021-07-20 13:22:07 +08:00
ChiaNing a70f818ffa update builtin UI texture wrapMode (#8986) 2021-07-16 11:52:55 +08:00
黄森斌 e4c5e354fe modify hideInEditor to editor.hide (#8979) 2021-07-15 14:56:55 +08:00
黄森斌 712ce4c79a update internal db prefab meta (#8980) 2021-07-15 14:51:07 +08:00
troublemaker52025 9854f33225 fix shadow problem for v3.3.0 (#8916) 2021-07-14 09:26:38 +08:00
santy-wang 4c92a4ba5e Merge branch 'v3.1.2' of https://gitlab.cocos.net/publics/engine into v3.3-validate 2021-07-12 17:42:21 +08:00
troublemaker52025 2714fe6dbe fix low phone do not support vector property self-multiplication for… (#8957)
* fix  low phone do not support vector property self-multiplication for v3.1.2

* update
2021-07-12 17:06:24 +08:00
santy-wang c5dd05fbf1 Merge branch 'v3.1.2' of github.com:cocos-creator/engine into v3.3-merge 2021-06-28 14:40:34 +08:00
troublemaker52025 80655bee84 add SOFT_2X sampler for Native PCF shadow v3.1.2 (#8888)
* add SOFT_2X sampler for Native PCF shadow v3.1.2

* update
2021-06-25 14:49:46 +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
troublemaker52025 c356e37ac2 add Native Pcf for v3.1.2 (#8867)
* add Native Pcf for v3.1.2

* fix circular dependency

* update

* delete x25 sample

* rename Hard & Soft,default sampler use Filter.POINT

* add TODO
2021-06-24 16:59:09 +08:00
cary dbfcdd04e7 Merge SSPR to v3.3. (#8780) 2021-06-08 11:23:51 +08:00
Yun Hsiao Wu 35e4cb81ec take over native device initialization (#8767) 2021-06-07 11:10:17 +08:00
黄森斌 804e540907 V3.1.1 allow create prefab asset (#8657)
* allow create prefab asset

(cherry picked from commit d26ec3d68cef0625cce3ea8f10d2e0a37d2ddd17)

* update  graphics component layer use UI_2D
2021-05-14 16:14:40 +08:00
黄森斌 e5b16e3f2d V3.1 [editor] fix inspector edit some component undo bug (#8618)
* fix inspector edit some component undo bug

* update fbx meta file in internal-db
2021-04-30 17:02:30 +08:00
cary 3ba49cb35e Fix the render error of particle and spine on metal. (#8593)
* Fix the render error of particle and spine on metal.

* Move transparent render of deferred to lighting stage.
2021-04-29 18:52:15 +08:00
Yun Hsiao Wu 0f0905c381 opt memory pool bound checking (#8585) 2021-04-28 21:46:41 +08:00
黄森斌 bd53bb1610 V3.1 optimise inspector edit asset (#8561)
* optimise inspector edit asset

* update internal-db meta file

* change mark
2021-04-26 22:22:16 +08:00
zheng han cd9c495552 fix light gizmo color (#8560) 2021-04-26 20:17:21 +08:00
jiaxin.lai 6b9778dafd refactor the splash screen to support automatic resizing (#8535)
* refactor splash screen

* update splash screen effect

* docs

* words

* flush commands before submit

* adapt for Android Vulkan

* fix logo width scale
2021-04-25 20:23:27 +08:00
GengineJS d9a08ea128 [Feature] deferred rt adapter (#8542)
* [Feature] deferred rt adapter

* [Feature] change deferred quad calculation

* [Remove] Removed pipeline offscreen judgment
2021-04-25 16:17:50 +08:00
Yun Hsiao Wu f904d11935 fix fog header (#8521) 2021-04-22 16:16:08 +08:00
Myway 621a039dc0 fix terrain lighting map shader compile error (#8497)
Co-authored-by: Myway3D1 <404793124@qq.com>
2021-04-20 15:39:33 +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
zheng han b11dff577f add lock to label under button by defautl (#8481) 2021-04-19 15:12:34 +08:00
cary 52c090e18a Fix the lighting problem of the deferred rendering material scene. (#8393)
* Fix the lighting problem of the deferred rendering material scene.

* fix terrain effect

* fix terrain scene crash

* fix conflict

* fix conflict
2021-04-19 15:10:52 +08:00
Myway 6b13ecc1f9 fix terrain lighting map shader compile error (#8480)
Co-authored-by: Myway3D1 <404793124@qq.com>
2021-04-19 12:28:43 +08:00
Myway 92bed0170e lightmap use rgbe format (#8468)
Co-authored-by: Myway3D1 <404793124@qq.com>
2021-04-16 18:55:33 +08:00