Commit Graph

17466 Commits

Author SHA1 Message Date
pandamicro 9a3a897b12 Fix web canvas adaptation with resize event (#9429) 2021-09-30 09:52:58 +08:00
江战 b5a846de86 save (#3944) 2021-09-30 09:09:26 +08:00
Cocos Robot 926f112085 [ci skip][AUTO]: updating jsbinding automatically: 017f12c8 (#3947)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-30 09:09:00 +08:00
ChiaNing d5265eb565 Change GPUDriven default value to true (#9427) 2021-09-29 23:20:32 +08:00
zhangxin 7a312441ef Change the content of the panel, fix the multi-selection situation, remove the inputflag (#9426)
* Change the content of the panel, fix the multi-selection situation, remove the inputflag

Change panel content
-The ui-prop that uses this tag sets the disabled of the content-slot to the marked dump.value
- add particle-system show bounds button
- add Regenerate bounding box button
-When culling is not turned on, disable the elements in the enableCulling
catergory

Fix multiple selection
-showBounds adapts to the case of multiple selections, when changing, it sends message for each component
-The Regenerate bounding box button will be set to disabled according to the selected component enableCulling
-Fix the ui-checkbox missing invalid judgement in ui-section header
-Fix the problem that ui-prop is not set dump.values to each component when multiple-selection

Remove inputflag
-No panel uses this mark, remove the related code

* Update editor/inspector/components/particle-system.js

* Update editor/inspector/components/particle-system.js

Co-authored-by: SijieWang <itharbors@outlook.com>
2021-09-29 22:53:38 +08:00
ChiaNing 017f12c863 Add drawCall to UI batch (#3912)
* Add drawCall to UI batch

* fix DynamicOffsets bind bug

* remove uiphase in forward

* debug remove

* fix VK device _caps
2021-09-29 22:32:54 +08:00
ChiaNing 24fe3ff784 UI GPU dirven add (#9378)
* uniform

* uniform buffer add

* add dummy IA

* first working version

* misc & data structure optimize

* fix webGL1 bug

* rebase on 3.3

* add maxQuadPerDrawcall by device
现在每个DC能绘制的数量由设备返回的 uniform 数量上限决定

* add index

* index bug fix

* sliced ia add(Not finish)

* change mat4 to vec4

* change stride num

* new vec4PreUI finish

* misc fix

* size & anchor dirty add

* bug fix

* add UICapacityDirty

(cherry picked from commit 417e10c8d3422363d80828539b110b93ee4d3cb1)

* static buffer cache version

(cherry picked from commit 1ffe7e7943cdf9af085aeda5ca218c3442fa9119)

* static buffer update version

(cherry picked from commit 964d9cb5b3230963b2a535acac99a34cde7eb63c)

* cache localbuffer

(cherry picked from commit 641b956def64023e0d47be66bc0c0a37ef1e9791)

* fix setPosition event & fix DS release

* weak sliced & filp tiled mode add

* fix tiled y

* fix sliced bug

* ugly but work filled type add

* update effect

* filled mode effect

* shader fix

* RenderData dirty for render data update

* revert fillbuffer

* misc fix

* support label bmfont by meshBuffer

* fix sliced bug & commit Model

* fixed some render dirty flag bug

* cut code by macro.UI_GPU_DRIVEN

* cut code by UI_GPU_DRIVEN Macro on build

* cut file by UI_GPU_DRIVEN

* I-batcher interface add

* remove render queue cache

* file name change

* file name change

* after merge

* fix for v3.4

* useless remove

* fix texture rotation

* fix sliced when atlas rotation

* useless code remove

* native bind

* update effect

* fix DynamicOffsets bind bug

* PR review fix

* effect encapsulation

* change chunk

* update effect

* update shader

* remove color in fs

* move code

* fix UBO buffer bug

* fix ubo count to 10

* fix vk bind
2021-09-29 22:32:33 +08:00
媛媛 9353275f72 [3.4.0] Add UI_GPU_DRIVEN flag in cc.config (#9367)
* update flags

* update flags
2021-09-29 22:26:44 +08:00
zhangxin 42cce3f8eb replace utils function ,update "sortProp" function (#9425)
* replace utils function ,update  "sortProp" function

replace utils function
-  "getCustomPropElements" -> "updateCustomPropElements"
this function is use to render custom node

update  "sortProp" function
- item may be null

* Update particle-system.js
2021-09-29 22:23:51 +08:00
江战 bf39eb506b 3.4.0 run genbindings (#3937) 2021-09-29 20:18:32 +08:00
minggo 724627b6a9 fix ES2 uniform parsing (#3925) (#3945)
Co-authored-by: Yun Hsiao Wu <yunhsiaow@gmail.com>
2021-09-29 20:14:54 +08:00
Yun Hsiao Wu 0abb5828fe update swapchain size when resizing (#9420) 2021-09-29 16:10:56 +08:00
Kun Lin e2dd95f1b0 Update bloom shader (#9417) 2021-09-29 14:37:59 +08:00
zhangxin 16873bb759 Select the previously selected animation (#9401)
* Select the previously selected animation

* if selected splitInfo not exists select last splitInfo

* Deleting a selected animation will select the previous animation

* If select an animation that does not exist, the zeroth animation will be selected

* Update animation.js

* AnimationInfos may be null,so add judgement
2021-09-29 14:32:31 +08:00
Cocos Robot a588e65619 [ci skip][AUTO]: updating jsbinding automatically: 27e5a563 (#3941)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-29 14:32:04 +08:00
timlyeee 1c437eb87e js invoke JAVA and OSX function without reflection (#9344)
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-29 14:18:35 +08:00
timlyeee 85c52544a5 message channel between Native and JS (#3900)
* Invoke Native Function in JS
* Invoke JS function in Native
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-29 14:16:30 +08:00
Yun Hsiao Wu 27e5a5630f fix orientation change (#3940) 2021-09-29 14:13:16 +08:00
Yun Hsiao Wu 47dc632b4d window size should follow swapchain (#9416) 2021-09-29 12:23:56 +08:00
minggo 442422981c add binding codes (#3939) 2021-09-29 12:10:47 +08:00
pandamicro c1bc09da56 Merge pull request #9415 from holycanvas/v3.4.0-sync-3.2.1
sync 3.2.1
2021-09-29 11:57:08 +08:00
Kun Lin 78ae4e587d Bloom (#3934)
* Bloom

* Fix for code review
2021-09-29 11:44:31 +08:00
Kun Lin 9b6bb5151e Bloom (#9413)
* Bloom

* Fix for code review
2021-09-29 11:44:25 +08:00
santy-wang bd59f37ede Merge branch 'v3.2.1' of github.com:cocos-creator/engine into v3.4.0-physx 2021-09-29 10:40:26 +08:00
minggo e50258ffbc update binding codes (#3936) 2021-09-29 09:47:51 +08:00
PP 411ef58a0a support DPR changed event listener on Web platform (#9410) 2021-09-28 19:25:45 +08:00
zheng han 1314027128 expand nestedPrefab in PrefabAsset onLoad (#9205)
* load nestedPrefab in PrefabAsset onLoad

* use nestedInstanceNodes

* check to expand prefabInstance node

* rename

* fix ci

* useless import

* remove useless code

* change 'instnaceChildren' to 'nestedPrefabInstanceRoots'
2021-09-28 18:01:27 +08:00
troublemaker52025 c606096464 fix multi-light source rendering translucent material for v3.4.0 (#9374)
* fix merge error

* fix merge error

* update

* update

* Add a note

* update

* update

* update ds to globalDS

* safe  destory
2021-09-28 18:00:26 +08:00
troublemaker52025 666b8cb0c0 fix multi-light source rendering translucent material for v3.4.0 (#3910)
* fix merge error

* update

* update ds to globalDS

* safe destroy

* fix ci error

* fix ci error
2021-09-28 18:00:17 +08:00
troublemaker52025 b00ecadad6 fix spot light bug for v3.4.0 (#3933)
* fix spot light bug for v3.4.0

* fix ci error

* revert
2021-09-28 16:41:55 +08:00
troublemaker52025 248dda7868 fix error (#9411) 2021-09-28 16:32:25 +08:00
江战 b24c278f88 remove password authentication (#3932) 2021-09-28 15:03:19 +08:00
minggo 571d825a74 Fix compiling error (#3930) 2021-09-28 15:03:07 +08:00
zxx43 86e01e7cad V3.4.0 particle culling (#9349)
* add particle culling

* add get model function

* add editable particle bounding box

* do not draw bounding box when runtime

* add cull mode

* create bounding when change enable culling

* remove debug particle bounding node

* remove unused variable

* add some api explanations

* remove useless statements & add some annotations

* refine annotation

* update annotations and update bounding

* open CullingMode
2021-09-28 14:17:11 +08:00
GengineJS b12a7ed18d forwardpipeline supports fxaa (#9387)
* forwardpipeline initially supports fxaa

* fxaa completes the adaptation

* update effect

* update postprocess stage

* add comment

* update

* Pipelines run the Postprocess stage

* effect added anti-aliasing judgment

* modify fxaa effect

* update comment

* update native
2021-09-28 11:17:02 +08:00
minggo c0fa3af246 Fxaa (#3928)
* Adaptation fxaa

Co-authored-by: zhengxiangkui <476393671@qq.com>
2021-09-28 11:05:55 +08:00
黄森斌 6c83c322d2 fix image-preview style bug (#9409) 2021-09-28 09:00:03 +08:00
江战 db9babccdf V3.4.0 CI force cxx standard (#3922)
* force cxx standard

* use win2016

* use vs 20-17
2021-09-27 21:27:23 +08:00
江战 17a101227a fix path (#3927) 2021-09-27 20:50:01 +08:00
Yun Hsiao Wu 023c684b95 fix ES2 uniform parsing (#3925) 2021-09-27 17:31:25 +08:00
Yun Hsiao Wu fb3cd12061 remove block/buffer.count (#9406) 2021-09-27 16:25:45 +08:00
江战 e4e019561d remove if constexpr (#3921) 2021-09-27 09:09:52 +08:00
江战 7a14686b01 fix reflection (#9404) 2021-09-27 09:06:57 +08:00
黄森斌 375500098e allow fbx preview show other model (#9392) 2021-09-26 18:47:51 +08:00
zhakesi 7159b02cf6 add function readPixels for render-texture (#9396)
* add function readPixels for render-texture

* add function comments

* fix eslint error

* comments missing a space character
2021-09-26 18:45:22 +08:00
Yun Hsiao Wu 23a9d75bee fg: present with move if possible (#3919)
* fg: present with move if possible

* fix ia state cache
2021-09-26 17:37:28 +08:00
Santy-Wang 6166745b38 adjust phyx adapter (#9386) 2021-09-26 16:51:45 +08:00
江战 945622fbf7 remove if constexpr (#3920) 2021-09-26 16:51:24 +08:00
Yun Hsiao Wu 8f553d31ab fix ia state cache (#9399) 2021-09-26 14:45:31 +08:00
PP 28242af04c fix dispatch mouse wheel event (#9397) 2021-09-26 14:02:47 +08:00