Commit Graph

377 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) 5eddce91f1 PoseGraph: support editor decorators on node inputs (#15819)
* PoseGraph: support editor decorators on node inputs

* Fix lint error
2023-08-01 14:50:45 +08:00
Leslie Leigh (李的序) f87d196f8d Add Vec3.generateOrthogonal (#15705) 2023-07-14 10:33:16 +08:00
minggo 802a1f0959 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/core/utils/x-deprecated.ts
	cocos/physics/bullet/instantiated.ts
	cocos/physics/framework/components/character-controllers/character-controller.ts
	cocos/render-scene/scene/shadows.ts
	cocos/rendering/render-shadow-map-batched-queue.ts
	cocos/spine/lib/instantiated.ts
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton.ts
	native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/cocos/editor-support/spine-wasm/spine-wasm.cpp
	native/external-config.json
2023-07-12 16:02:10 +08:00
troublemaker52025 50d9179bbe Optimize effect dependency and package size (#15650) 2023-07-12 11:42:17 +08:00
Leslie Leigh (李的序) 43b9fd4485 PoseGraph: fix apply transform node (#15632)
* Fix apply transform

Tweak

* Optimize
2023-07-12 11:20:25 +08:00
Leslie Leigh (李的序) a3ee06e374 Optimize unit test; support overriding constants in per-test-suite (#15628)
* Optimize unit test; support overriding constants in per-test-suite
2023-07-06 18:00:03 +08:00
Ling Zhan 08d9a34457 character controller api tweaks (#15621)
* character controller api tweaks

* tweak
2023-07-05 15:28:18 +08:00
minggo 7ef995b655 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/3d/lights/spot-light-component.ts
	cocos/animation/event/event-emitter.ts
	cocos/physics-2d/box2d/physics-contact.ts
	cocos/physics-2d/box2d/physics-world.ts
	cocos/physics-2d/box2d/platform/physics-contact-listener.ts
	cocos/physics-2d/builtin/builtin-world.ts
	cocos/physics/framework/components/constraints/configurable-constraint.ts
	cocos/spine/assembler/simple.ts
	cocos/spine/skeleton.ts
	native/cocos/editor-support/spine-wasm/spine-model.cpp
	native/cocos/editor-support/spine-wasm/spine-model.h
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
	native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/external-config.json
2023-07-03 15:25:13 +08:00
Leslie Leigh (李的序) a0e3037ae1 Add test utils: vec3, quat equality matcher and pseudo random generator (#15547)
* Add test utils: vec3 equality matcher and pseudo random generator

* Add Quat jest matcher

* Tweak

* Update
2023-06-29 11:05:39 +08:00
Leslie Leigh (李的序) 899a3a9897 Fix animation clip frame event dispatching (#15534) 2023-06-27 11:26:46 +08:00
mmyduckx d351ae7948 fix pacer-unit-test (#15461) 2023-06-19 09:44:59 +08:00
zhakesi 8534fbbfdb spine wasm version (#15309)
* spine wasm version -fix conflict

* fix build and ci test -fix conflict

* fix for code review

* support binary format

* update exernal lib

* revert license

* fix type any

* update api docs

* fix api docs
2023-06-09 15:50:32 +08:00
Leslie Leigh (李的序) 2091f4617a Marionette/StateMachine: fix any state won't match proc pose states (#15381) 2023-06-08 17:46:09 +08:00
Ling Zhan bd2608bce7 [opt] cct api refactor (#15360)
* [opt] cct api refactor

* tweaks

* tweak
2023-06-08 12:22:27 +08:00
Leslie Leigh (李的序) da23e6ae16 Refactor animation graph event dispatching mechanism (#15330)
* Refactor animation graph event mechanism

* Fix test

* Update

* Revert
2023-06-07 18:33:26 +08:00
dogeFu 09e000266d feature : add EDITOR_NOT_IN_PREVIEW marco (#15354)
* feature : add marco for editor preview and refactor code with new marco

* refactor: replace GAME_VIEW with EDITOR_PREVIEW

* Revert "refactor: replace GAME_VIEW with EDITOR_PREVIEW"

This reverts commit e28953e9e7acbb49dc5bdc650b2ff65510d4b084.

* update cc config json

* refactor code

* remove uselese parentheses

* set ccglobal to be false

* skip global variable test case
2023-06-07 17:52:51 +08:00
Leslie Leigh (李的序) 41704deb74 Marionette/Stash: fix error if reenter() the stash but updated in later (#15337)
* Marionette/Stash: fix error if reenter() the stash but updated in later

* Optimize stash evaluate state
2023-06-07 11:43:38 +08:00
pandamicro c8d3be08a3 Fix issues in Node.updateWorldTransform and UITransform.getBoundingBoxTo[World] (#15273)
* Fix transform update issue when only rotation is set to root node

* Fix UITransform.getBoundingBoxTo and UITransform.getBoundingBoxToWorld

* Improve API and test

* Fix native Node::updateWorldTransform

* Fix UITransform.getBoundingBoxTo

* Fix getBoundingBoxTo by ensuring one time rect transform

* Ignore zero sized rect for bounding box calculation

* Improve API doc
2023-06-07 11:10:28 +08:00
Leslie Leigh (李的序) 82e29f7ae5 Marionette/StateMachine: fix state motion time binding (#15308) 2023-06-05 11:54:09 +08:00
Leslie Leigh (李的序) 100167485d Marionette/PoseGraph: allow specify start time for PoseNodePlayMotion (#15306) 2023-06-05 10:05:32 +08:00
Leslie Leigh (李的序) b9964895c6 Marionette: adjust additive animation rule (#15296)
* Marionette: adjust additive animation rule

* Rename base -> ref

* Importer UI
2023-06-02 15:36:12 +08:00
Leslie Leigh (李的序) f9f379df1e Marionette/PoseGraph: fix that a pose node can be connected multi times (#15231) 2023-06-02 10:36:04 +08:00
Leslie Leigh (李的序) e86f70523b Marionette/PoseGraph: add node input option arraySyncGroupFollower (#15226) 2023-05-30 14:56:55 +08:00
Leslie Leigh (李的序) aa20a47678 Marionette: add ratio input to PoseNodeAdditivelyBlend; add tests (#15223) 2023-05-30 13:32:42 +08:00
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