Commit Graph

1057 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) 09586e82a9 Animation graph: fix embedded play evaluation (#15198) 2023-05-26 11:22:51 +08:00
SijieWang 820128d09a Merge pull request #15175 from cocos/marionette-next
Pose Graph
2023-05-25 11:45:53 +08:00
黄森斌 5b087f68a5 optimize inspector interface (#15177)
* format node.js

* fix inspector getName utils bug

* fix inspector node.js interface bug

* fix inspector particle-3d interface bug

* fix inspector edit asset interface bug

* add material fault tolerance
2023-05-25 11:12:18 +08:00
Jiujiang Liu 1b1da88dde Update code to adapt to memory leaks in the editor scene as a prerequisite task (#14594)
* revert code

* update code
2023-05-25 11:02:25 +08:00
袁炜海 f8f19ffe5e feat: inspector: fbx/animator add import_all_animator config (#15159)
* feat: inspector: fbx/animator  add import_all_animator config

* feat: rename

* Update editor/i18n/en/assets.js

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

* Update editor/i18n/zh/assets.js

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

* feat: model change to animation

---------

Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
2023-05-25 10:57:15 +08:00
Leslie Leigh (李的序) 5ec884161c [Bug] Pose graph: i18n menu (#15180) 2023-05-25 10:40:09 +08:00
Gin 97a091b61c fix: node, asset title text overflow in inspector (#15176)
- show ellipsis when title text has exceeded its parent container
2023-05-25 10:26:07 +08:00
AFeiYA e7871254b3 Import gltf use vertex color set default to false (#15155) 2023-05-24 18:59:03 +08:00
Leslie Leigh (李的序) 523a38d892 Add engine feature "procedural animation" (#15174) 2023-05-24 18:58:47 +08:00
Leslie Leigh (李的序) cfd9bddacb Pose graph: fix import path and tweak (#15173) 2023-05-24 18:42:33 +08:00
Leslie Leigh (李的序) 24541a82de Rename term "pose state" -> "procedural pose state" (#15171) 2023-05-24 18:42:09 +08:00
jk20012001 4910bea1ce use post-process pipeline instead of custom pipeline (#15168) 2023-05-24 17:39:19 +08:00
Leslie Leigh (李的序) 75e07f86a0 Pose graph: add motion playing and sampling node (#15143)
* Add PlayMotionNode, SampleMotionNode

* Fix
2023-05-24 17:33:09 +08:00
Leslie Leigh (李的序) cee74cba32 Pose graph: add variable getting nodes (#15151)
* Pose graph: add variable getting nodes

* Fix unit test
2023-05-24 14:48:02 +08:00
hyde zhou 9e00d512ae render pipeline add subpass (#15141) 2023-05-24 14:27:28 +08:00
Leslie Leigh (李的序) c1304cd11b Add editor api to stash pose graph; Config some nodes' editor behavior (#15148) 2023-05-24 14:24:47 +08:00
changhua cf3e2a8afc [Optimize] optimize style of LOD in inspector (#15160)
* optimize style of LOD in inspector

* update label color
2023-05-24 10:02:48 +08:00
jk20012001 ae01a2e59b add leaf shader (#15156) 2023-05-23 22:57:19 +08:00
袁炜海 a3f348ab89 feat: use index and phase as the effect pass`s name on inspector panel (#15147)
* feat: pass name add phase

* feat: remove default
2023-05-23 17:57:29 +08:00
yinkaile 1913ee9edf fixed transparency pass with post process pipeline (#15139) 2023-05-23 15:45:01 +08:00
Leslie Leigh (李的序) 8b3d59d02c Pose graph: add pose modifying nodes (#15144)
* Add pose modifying nodes

* Update

* i18n
2023-05-23 15:21:54 +08:00
jk20012001 c1b82a7097 add unlit lighting model for surface shader (#15131) 2023-05-23 15:11:42 +08:00
Leslie Leigh (李的序) 31d3e9206c Pose graph: add state machine node (#15145)
* Pose graph: add state machine node

* Import

* Add i18n
2023-05-23 15:01:36 +08:00
Leslie Leigh (李的序) cf4d799a4d Pose graph: add blending pose nodes (#15142)
* Add blending nodes and choosing nodes

* i18n
2023-05-23 14:31:46 +08:00
Gin 89b5744c05 feat: new property decorator radioGroup & improve properties rendering (#14600)
* feat: new property decorator `radioGroup`

- For enum type data, it provides the ability to control the ui component(select, button, checkbox) used in inspector
- https://github.com/cocos/3d-tasks/issues/8715

* update: rendering of align properties in label

- use `ui-radio-group` and `ui-radio-button` instead of `ui-tab`
2023-05-23 14:21:52 +08:00
Gin 606ef3e0fa improve: effect select option label naming and grouping (#14539) 2023-05-23 14:21:15 +08:00
Leslie Leigh (李的序) da8d1979d0 Pose graph copy paste operation (#15132) 2023-05-22 13:45:41 +08:00
Leslie Leigh (李的序) f84baf24c5 Animation graph: pose graph i18n related change (#15117) 2023-05-22 10:50:11 +08:00
Leslie Leigh 4dc852f61e Merge remote-tracking branch 'upstream/develop' into marionette-next 2023-05-19 19:56:41 +08:00
Leslie Leigh (李的序) 6b2a2d1859 Enhance i18n configuration (#15119)
* Enhance i18n configuration

* Fix
2023-05-19 19:48:44 +08:00
AFeiYA 51c41ead20 Use uuid for remap (#15001) 2023-05-19 17:15:20 +08:00
AFeiYA adc0a95ae7 Add default vertex color (#15021) 2023-05-19 17:12:26 +08:00
jk20012001 31c0e880f1 fix ao map should affected by ao intensity (#15112) 2023-05-19 14:30:04 +08:00
Yiwen 5330e7ee5a Configurable constraint (#14778)
* add support to configurable constraint

* add missing files

* update packages

* fix PhysX bugs,update error info

* fix exports, deserialization.

* just stage

* Revert "just stage"

This reverts commit 41dc157afec00bfeb077b12e64c45a951ab1f894.

* fix problems

* improve perf

* tweak

* fix merge errors

* update errormap
2023-05-19 11:28:09 +08:00
pandamicro 12fe7525f9 Merge pull request #15113 from cocos/develop
Merge remote-tracking branch 'upstream/develop' into marionette-next
2023-05-19 10:42:41 +08:00
changhua de9c885b5e fixing import errors with LOD sometimes (#15097) 2023-05-19 09:53:25 +08:00
黄森斌 6a198ca5b3 [Bug] fix inspector interface (#15096)
* fix interface bug in inspector

* continue fix inspector interface

* continue optimize interface
2023-05-18 15:16:54 +08:00
Leslie Leigh 464342eb99 Merge remote-tracking branch 'upstream/develop' into marionette-next 2023-05-18 14:46:30 +08:00
Leslie Leigh (李的序) 17cb4796f1 Animation graph: optimize some evaluation structures (#15049)
* Optimize some evaluation structure

* Update cocos/animation/marionette/state-machine/state-machine-eval.ts
2023-05-18 13:55:00 +08:00
dogeFu 3d80581e58 [Refactor] inspector 使用新的 undo 接口 (#14942) 2023-05-18 13:53:59 +08:00
hyde zhou 34a5022096 develop pipeline interface change (#15083) 2023-05-18 13:00:23 +08:00
jk20012001 4c2bed1c76 update shader code and i18n (#15060) 2023-05-17 16:14:42 +08:00
Yiwen 923278904a Fix hinge constraint rotation (#14085)
* Fix hinge constraint rotation

1. fixed hinge constraint rotation
2. correct docs
3. add tooltip for hinge constraint

* stage

* updates

* update

* vanishing pivotB when connected to world frame

* stage

* update fixed constraint behavior when bind to world frame
2023-05-17 15:23:35 +08:00
minggo 3a6e0ca2ba Merge pull request #15067 from cocos/develop
Merge develop into marionette-next
2023-05-17 14:06:57 +08:00
Jiujiang Liu 6bcc290b5b Update mesh-preview.js (#13384)
copywriting Adjustment
2023-05-17 11:50:31 +08:00
袁炜海 2bba922b49 feat: inspector support show text-like file (#15045)
* feat:inspector support show text-like file

* feat: add common.js for importer whith *

* feat: create text-like-read.js

* feat: add renderText
2023-05-17 10:38:34 +08:00
Ling Zhan 9cd5212d18 Character Controller (#14848)
* back.boxCCT works now. capsuleCCT not collider correctly

* refactor

* cct 事件系统初步可用。todo 碰撞filter

* init cct group and mask

* queryFilterCB

* this the first working version

* tweaks

* init bullet character controller. todo: events, autoStep bug, maxSlope bug

* bullet cct onShapehit

* physx native works now. todo: BoxCharacterController

* add physx-native BoxCharacterController

* cct filters redundant events

* cct velocity

* cct detectCollision not working

* cct detectCollisions works in physx

* Character controller supports setDetectCollisions: collision detection without calling move()

* cct center

* bt.CharacterController_setContactOffset,CharacterController_setStepOffset,CharacterController_setSlopeLimit

* bullet cct collision event use last shoot

* tweaks

* cct doc

* fix bullet box-cct hit callback

* add cct export

* feat cct setOverlapRecovery

* cct delete useless code in native physics

* tweaks: cct remove useless code

* fix cct bullet group mask: update group and mask by re-adding cct to physics world. not tested

* tweaks

* tweaks

* fix bullet-cct not emit collision: add bullet updateNeedEmitCCTEvents

* tweaks

* fix cct supports enable/disable

* add cct imp null check

* cct not to expose detectCollisions and OverlapRecovery at this moment

* physx/bullet cct支持节点缩放.todo: bullet cct(setRadius/Height)还有bug 无法运行时改变,只能在初始化的时候设定。physx c++待支持。

* c++ physx cct supports node scale

* fix cct physics c++ forgets to remove cct from scene when destroyed

* [fix] physx cct set climbing mode to PxCapsuleClimbingMode.eCONSTRAINED

* add cct unit test and multiple tweaks

* multiple tweaks and add cct center for physx c++

* tweak

* tweaks

* tweaks

* external version: develop-20

* tweaks
2023-05-16 10:03:13 +08:00
changhua 81af6ebcdf [Optimize] update mipmaps for changeimage type (#14336)
* fix change mipmaps error

* update

* update
2023-05-15 16:14:51 +08:00
changhua 638fa592ba [Feature] add fbx lod template (#14967)
* fbx add lod template

* update

* 添加遮罩

* update

* update review

* update

* update

* update

* update
2023-05-15 16:13:07 +08:00
AFeiYA ac5bd644cf smart material support maya standard surface specular color (#15041) 2023-05-12 15:20:12 +08:00