Commit Graph

536 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) f1f0fbaf16 [WIP] Feature: NewGenAnim (#9331)
* NewGenAnim

* Fix/Optimize simple directional blending

* Class transition by type (#29)

* Transition & Gradient transition (#30)

* The default ExitCondition should be 1.0

* Do correct graph eval

* Fix PoseSubgraph connect() signature order (#31)

* Graph defaults test (#32)

* Conditions (#33)

* Trigger (#34)

* Transition should only be considered when satemachine exited (#35)

* Add layer.name (#36)

* Fix some behaviours; add API to query poses and transition (#37)

Fix single frame exit condition behaviours; Fix pose -> subgraph behaviours

* Support self transition; refactor sub state machine implementation (#38)

* Temp

* Flat whole layer statemachine

* Add test for test reset triggers

* Allow self transition

* Self transition test

* Fix deserialize (#39)

* update animgraph template (#40)

* The inheritance of any state (#41)

* StateMachine events (#42)

* Fix state machine events; Allow multiple transitions between two nodes (#43)

* Transition priority test (#44)

* Optimize variable bind (#45)

* Fix variable bind errors (#46)

* Expose blend algorithm to editor (#47)

* Cont (#48)

* update animgraph template (#49)

* update animgraph template

* update animgraph template

* Pose speed (#50)

* blend tree add EditorExtendable data (#51)

* Correct pose blend duration (#52)

* Export some types (#53)

* animation pose EditorExtendable (#54)

(cherry picked from commit d5dd5f32c9dbacb68c016ff8ba56d383c781a021)

* Implement clone() (#55)

* Fix trigger condition serialization (#56)

* Add variable type: integer (#57)

* Optimize 0 weight case (#58)

* Relative duration (#59)

* update_hdr_skybox (#9230)

* Rename.. (#60)

* Optimize animation blend item export (#61)

* Fix Type (#62)

* modify aniamtion graph template data (#63)

* modify aniamtion graph template data

* add animation graph component template

* Fix serialize issue (#64)

* Optimize (#65)

* Remove MotionState.startRatio, loop (#66)

* Update (#67)

* Fix circular reference (#68)

* CR (#69)

* Fix exit time greater than 1 (#70)

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com>
2021-10-14 10:28:23 +08:00
zheng han af35870013 add axis text (#9454) 2021-10-09 19:35:43 +08:00
Yun Hsiao Wu abce086677 rename reserved names (#9450) 2021-10-08 17:32:07 +08:00
Yun Hsiao Wu 942ec32463 update local bindings (#9447) 2021-10-08 13:41:31 +08:00
zhangxin 33944c7c34 show tips when no model (#9435)
* show tips when no model

* update i18n
2021-10-04 15:50:41 +08:00
lawrence-liuyue 6b764d2e33 Enable Subpass in deferred pipeline (#9419)
* enable subpass in deferred pipeline

* subpass fix compile error in opengl

* build effects
2021-10-03 17:22:54 +08:00
ChiaNing ab4f952ade GPUDriven i18n add (#9438) 2021-09-30 20:02:27 +08:00
zhangxin d5fd85ed40 update material preview when custom panel change (#9340)
* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* update material preview when custom panel change

fixed https://github.com/cocos-creator/3d-tasks/issues/8663

* Update material.js
2021-09-30 16:37:20 +08:00
zhangxin 32d0e60156 hide model when fbx mutiple-select (#9400) 2021-09-30 11:39:50 +08:00
黄森斌 2d192edb60 Retain the previously modified data when switching pass (#9173) 2021-09-30 10:24:52 +08:00
DolaMay a785144943 cluster ts engine v340 code (#9405)
* cluster ts engine v340 code

* add macro to enable/disable cluster feature

* fix cluster switch bug
2021-09-30 10:16:53 +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 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
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
Kun Lin 9b6bb5151e Bloom (#9413)
* Bloom

* Fix for code review
2021-09-29 11:44:25 +08:00
troublemaker52025 248dda7868 fix error (#9411) 2021-09-28 16:32:25 +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
黄森斌 6c83c322d2 fix image-preview style bug (#9409) 2021-09-28 09:00:03 +08:00
黄森斌 375500098e allow fbx preview show other model (#9392) 2021-09-26 18:47:51 +08:00
pandamicro 78905bae3e Merge pull request #9381 from holycanvas/v3.4-sync
sync v3.3.2
2021-09-24 12:21:55 +08:00
santy-wang 6391b5705a Merge branch 'v3.3.2' of github.com:cocos-creator/engine into v3.4.0-physx 2021-09-24 12:11:48 +08:00
Yun Hsiao Wu 8d6e75c9b7 restore resize invocation (#9379) 2021-09-24 11:50:44 +08:00
Yun Hsiao Wu 9d3c0a9eac workaround R11 vk shader driver bug (#9376) 2021-09-23 18:32:19 +08:00
Yun Hsiao Wu e2a16f44ad effect: subpass support (#9364) 2021-09-23 17:08:29 +08:00
linshunjun 7d7a06b40d update-twoside-material (#9348)
* update-twoside-material

* update-twoside-material
2021-09-22 15:26:49 +08:00
troublemaker52025 731fd344f1 update toon shader for v3.3.2 (#9354) 2021-09-22 14:26:33 +08:00
troublemaker52025 93f5fa9c2e fix receive shadow for v3.3.2 (#9347) 2021-09-18 15:57:23 +08:00
Santy-Wang b608ff8315 optimize render texture (#9342)
* optimize render texture

* refine
2021-09-18 12:04:39 +08:00
zxx43 f78395cd90 V3.4 performance (#9191)
* use start rotation as euler in shader

* do calculate start rotation once

Co-authored-by: Santy-Wang <wh19930829@qq.com>
2021-09-16 17:12:17 +08:00
zxx43 3dcc271494 V3.4.0 align (#9236)
* add particle align

* init update align

* update shaders

* add align with view

* check camera layer

* check editor camera

Co-authored-by: Santy-Wang <wh19930829@qq.com>
2021-09-16 17:02:47 +08:00
Yun Hsiao Wu 56038db50a gfx: states store hashes (#9325)
* gfx: states store hashes

* profiler uses fixed viewport
2021-09-16 10:28:27 +08:00
jiaxin.lai 5c6567f59e bullet physics optimization (#9311)
* stash

* stash

* stash

* use @cocos/bullet

* rename

* stash

* update constraint

* naming

* naming

* naming

* naming

* fix

* use compound by default

* stash

* fix

* rename and raycast

* refactor

* add state optimazation

* tweaks

* tweaks

* stash

* rename

* wechat wasm file path

* using promise

* remove @cocos/ammo

* i18n bullet(ammo.js) -> bullet

* tweaks

* update @cocos/build-engine to 4.2.11

* fix sync

* fix autosleep mechanism

* fix stability test

* fix destroy bullet world

* tweaks

* update @cocos/bullet to 1.0.0

* fix

* delete
2021-09-10 16:35:56 +08:00
Santy-Wang 8dfe080d8c Merge pull request #9308 from holycanvas/v3.4-sync
sync v3.3.1
2021-09-10 11:19:06 +08:00
媛媛 968c01765d [Bug] fix save after add events in fbx (#9303) 2021-09-09 16:02:51 +08:00
Yun Hsiao Wu 79f6ec1fcf handle swapchain resize event (#9305)
* swapchain resize accept surface transform

* rt attachment should support read back
2021-09-09 16:00:02 +08:00
santy-wang c87577b809 Merge branch 'v3.3.1' of https://gitlab.cocos.net/publics/engine into v3.4 2021-09-09 13:33:35 +08:00
ChiaNing 68c5a04416 fix mask graphics enable bug & update builtin res meta (#9301) 2021-09-08 16:30:21 +08:00
jk20012001 73ece827cf fix shadow artifacts in toon shader,synchronize modifications with builtin standard effect (#9297)
* 修复卡通渲染的阴影问题,和builtin-standard之前的修改同步

* 缩进修改
2021-09-07 15:16:05 +08:00
linshunjun e1a14c0f58 update-(shading-toon.chunk)-fix-shadow (#9287) 2021-09-06 20:15:19 +08:00
troublemaker52025 689962baeb fix spotShadow soft merge error for v3.3.1 (#9290) 2021-09-06 19:16:28 +08:00
Myway b726205bd8 submit terrain select brush (#9282) 2021-09-04 12:15:09 +08:00
troublemaker52025 c1c6885945 add soft shadow for spotLight v3.3.1 (#9162)
* add soft shadow for spotLight v3.3.1

* fix merge error
2021-09-02 11:05:47 +08:00
GengineJS fd1ea41235 Fix the problem of deferred pipeline uimodel without light and metal crash (#9261)
* Fix the problem of deferred pipeline uimodel without light and metal crash

* update effect

* update comment

* update comment

* modify comment
2021-09-01 15:51:56 +08:00
Yun Hsiao Wu 4cf1350fe0 gfx: swapchain refactor (#9030)
* update effect.hideInEditor

* swapchain refactor

* webgl multi draw

* implicit depth/stencil format

* native adapt

* explicit resizable texture

* DrawInfo in InputAssembler

* device cached states

* sync defines

* gfx: empty backend

* update playground

* remove profiler camera

* update effect types

* fix pass.resetUniform
2021-08-31 19:40:50 +08:00
zheng han d07ad2e584 fix anim preview (#9220) 2021-08-25 19:23:16 +08:00
pandamicro 476edcc8c5 Merge pull request #9232 from cocos-creator/develop
Merge develop to v3.4
2021-08-23 15:36:16 +08:00