Commit Graph

353 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
Leslie Leigh (李的序) f1472e4453 renameObjectProperty() shall not copy non-enumerable symbol properties (#14194) 2023-05-25 10:43:50 +08:00
Leslie Leigh (李的序) 24541a82de Rename term "pose state" -> "procedural pose state" (#15171) 2023-05-24 18:42:09 +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
Santy-Wang d3a9b5a8b8 gradient misc optimization and add some helpful function (#15032)
* gradient misc optimization and add some helpful function

* keep old version and add new interface

* missing .

* mark as engineInternal
2023-05-24 13:59:29 +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
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
Leslie Leigh (李的序) 9ce1a56cb9 Animation graph: pose graph stash (#15050)
* Implement pose graph stash

* Update cocos/animation/marionette/pose-graph/stash/runtime-stash.ts

* Update cocos/animation/marionette/pose-graph/stash/runtime-stash.ts

* Rename

* Update
2023-05-23 13:00:18 +08:00
Leslie Leigh (李的序) ec2b401c73 Handle space conversion during pose graph evaluation, introduce base pose node class to modify pose (#15108)
* Process space conversion during pose graph evaluation

* Add comment
2023-05-23 12:01:31 +08:00
Leslie Leigh (李的序) 64dcd43354 Fix poseGraphOp.disconnectNode unexpected behavior (#15134) 2023-05-22 18:22:15 +08:00
Leslie Leigh (李的序) 4b2fb0baba Event binding (#15133) 2023-05-22 15:34:42 +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
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
Leslie Leigh (李的序) 018d4d68aa Animation: implement Transform.invert() (#15105) 2023-05-18 17:23:24 +08:00
Leslie Leigh (李的序) a7a16a625b Animation: lint and tweak (#15104) 2023-05-18 16:14:07 +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
Leslie Leigh (李的序) 038f386bec Lint rule: prefer interface style type definition (#15020)
* Lint rule: prefer interface style type definition

* Adapt lint

* Fix lint style
2023-05-18 13:37:54 +08:00
Leslie Leigh (李的序) 4bcd1795f2 Marionette: add test in case of states of transition yielding nullish (#14733) 2023-05-18 11:03:24 +08:00
Ling Zhan 1032bd9508 Sweep Test (#15068)
* init

# Conflicts:
#	cocos/physics/physx/physx-adapter.ts

# Conflicts:
#	cocos/physics/physx/physx-adapter.ts

* init sweepBoxClosest

# Conflicts:
#	cocos/physics/physx/physx-world.ts

* back

* physx boxCastClosest works now.

* add physx sweepAll

* init bullet sweepBoxClosest. not test yet

* add bullet sweepBox

* bullet add internal functions: sweep/sweepClosest

* init physx c++ sweepBox/sweepBoxClosest

* add sweepSphere, sweepCapsule; add unit test.

* add sweep api doc

* revert physx asm/wasm loading func

* tweaks

* add error log for builtin and cannon.js

* builtin and cannon.js use warnid when calling sweep

* tweak api doc
2023-05-17 18:37:03 +08:00
minggo 3a6e0ca2ba Merge pull request #15067 from cocos/develop
Merge develop into marionette-next
2023-05-17 14:06:57 +08:00
Leslie Leigh (李的序) 859140bf96 Reverse the arguments meaning of Transform.multiply (#15084) 2023-05-17 14:01:18 +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
Leslie Leigh (李的序) 11220129d7 Animation graph: experimentally support more types of variable (#14815)
* Animation graph: add experimental more types of variable

* Tweak
2023-05-12 14:38:25 +08:00
Leslie Leigh (李的序) 4304c05745 Complementarily implement pose graph (#14952)
* Implement pose graph

* Add test for query output node's input/outputs

* Fix isWellFormedInputKey()

* Tweak

* Use `Map` instead of `shellTag`

* Rename XNode -> PureValueNode

* Rename node input manager and node input options
2023-05-12 13:45:55 +08:00
troublemaker52025 20f80926b1 add Separable-SSS skin (#14948) 2023-05-11 18:24:45 +08:00
Leslie Leigh (李的序) b119ee5bcf Optimize warn message if state machine matched too many transitions in a frame (#15016) 2023-05-10 14:22:31 +08:00
Leslie Leigh (李的序) b8816590ae Animation graph: state machine adjustment (#14990)
* Animation graph: state machine adjustment

* Remove useless code; export factory interfaces

* Add test

* Update
2023-05-08 19:28:31 +08:00
PP 0b353b6e14 feat: support general WASM module in engine (#14974)
* support pal/wasm module

pal/wasm

* support sys.Feature.WASM and WASM_SUPPORT_MODE

# Conflicts:
#	pal/system-info/web/system-info.ts

# Conflicts:
#	pal/system-info/web/system-info.ts

# Conflicts:
#	pal/system-info/web/system-info.ts

* optimize bullet module


* update physx module

update

* revert tsconfig

* optimize WebGPU wasm import

* fix native wasm instantiate

* support wasm in EDITOR and PREVIEW

* optimize variable name

* update comment

* optimize code

* Update cocos/misc/webassembly-support.ts

* add physx wasm (#11) by yiwenxue

* add physx wasm

* update physx wasm instantiate.

* update, rename, etc.

* download external in CI

* fix physX wasm init

* move out external wasm type

* update external-config.json

* expand node max-old-space-size

* use console.debug

---------

Co-authored-by: Yiwen <15225434259xue@gmail.com>
2023-05-08 18:02:17 +08:00
pandamicro 71a11a7a14 Merge remote-tracking branch 'origin/v3.7.3' into develop
# Conflicts:
#	.github/workflows/run_test_cases.yml
#	cocos/rendering/planar-shadow-queue.ts
#	native/cocos/renderer/pipeline/PlanarShadowQueue.cpp
2023-05-08 11:55:56 +08:00
Leslie Leigh (李的序) 368e4b732f Remove duplicated test (#14975) 2023-05-05 18:52:51 +08:00
Leslie Leigh (李的序) 4a183b14c0 Fix exception in material uniform animation binding (#14764) 2023-04-28 09:22:37 +08:00
Santy-Wang cb852e6dbc Merge pull request #14927 from cocos/develop
Sync develop into marionette-next
2023-04-26 15:48:15 +08:00
Leslie Leigh (李的序) 506548c2ea Animation graph custom events listening API (#14911) 2023-04-25 10:50:02 +08:00
minggo a22d16bbe6 Merge branch 'v3.7.3' into merge_v3.7.3 2023-04-24 11:26:58 +08:00
Leslie Leigh (李的序) b12db9f12a Support more binary condition binding source (#14857)
* Binary condition

* Update

* Fix test & i18n
2023-04-23 15:11:56 +08:00
黄森斌 c2323e2160 update layers bitmask and enum (#14573)
* update layers bitmask and enum

* Layers.BitMask update

* modify testClass name
2023-04-19 20:40:12 +08:00
Leslie Leigh (李的序) 988e385e8e Animation graph: move code (#14819) 2023-04-18 15:26:01 +08:00
Leslie Leigh dbfbc9fe6b Merge remote-tracking branch 'upstream/develop' into marionette-next 2023-04-18 14:20:42 +08:00
Leslie Leigh (李的序) d76a8ae2da Improve animation graph test utils; prune Marionette files (#14541)
* Improve animation graph test utils; prune Marionette files

* Rm
2023-04-18 11:14:45 +08:00
Leslie Leigh (李的序) 8e7255a9ee Introduce pose graph, pose node and pose state (#14779)
* Introduce pose graph, pose node and pose state

* Optimize for-of

* Rename

* Doc

* Rename pose allocator -> pose stack allocator
2023-04-17 17:38:43 +08:00
Leslie Leigh (李的序) be5e2edfde Introduce auxiliary curve (#14659)
* Introduce auxiliary curve

* Rename meta value -> auxiliary curve

* Refactor auxiliary curve authoring api
2023-04-17 16:08:19 +08:00
Leslie Leigh (李的序) 06f382db95 Fix @property(PrimitiveType) (#14781) 2023-04-17 15:35:53 +08:00
zhakesi 42b704c4e1 fix set skinningRoot (#14755) 2023-04-14 18:48:29 +08:00
Leslie Leigh (李的序) eb8be7e5bb Animation blend: add algorithm "freeform directional" (#14203)
* Animation blend: add algorithm "freeform directional"

* Update comment

* Fix
2023-04-03 13:34:53 +08:00