Commit Graph

80 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) 23ca385cae Autofix physics lint problems (#16323)
* Autofix physics lint problems

* Fix lint

* Opt
2023-10-07 16:13:49 +08:00
Yiwen bde3cd4cc3 Add adv mesh functionalities. (#16009)
* stage

* update

* update

* fix physics & ray cast problem

* fix default value, clean unused code, fix lint errors

* clean code

* update meta file

* update external, license

* fix tidy, circular dep

* fix type cast

* rm unit test

* fix unit test

* update comment
2023-08-21 10:15:24 +08:00
Ling Zhan cf8ceed661 V3.8.1 cct trigger (#15613)
* physx ts 支持

# Conflicts:
#	cocos/physics/framework/components/character-controllers/character-controller.ts
#	cocos/physics/framework/components/colliders/collider.ts
#	cocos/physics/physx/physx-world.ts

* add bullet-character-controller trigger events

* physx c++ add cct trigger

* tweaks

* tweaks

* tweaks

* tweak

* tweaks

* physics jsb: emitCCTShapeEvent --> emitCCTCollisionEvent
2023-08-18 10:47:59 +08:00
Ling Zhan 1dc3142fbb [opt] when move() is called, character controller sync physics position to scene; change default stepOffset; set minimum skinWidth (#15966)
* [opt] [character controller] when move() is called, character controller sync physics position to scene immediately; change default stepOffset from 1.0 to 0.5; set minimum skinWidth 0.001

* tweak

* native

* eslint

* eslint

* eslint
2023-08-17 17:34:04 +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
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
黄森斌 6acdd0ae95 inspector interface: reserve tab style of group; support new section style; (#15586)
* reserve tab style of group; support new section style;

* add mesh-renderer section group style
2023-06-30 09:20:00 +08:00
PP 491c0cf688 [AOT] fix type for AOT engine (#15526)
* fix type

* fix readonly

fix readonly

* fix get/set type

* fix switch type

* fix eslint

* update

* optimize type in state-machine-eval
2023-06-27 15:56:32 +08:00
minggo e7c5b34e18 Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/2d/assembler/label/text-processing.ts
	cocos/physics/bullet/instantiated.ts
	cocos/profiler/profiler.ts
	cocos/rendering/custom/executor.ts
	cocos/rendering/custom/index.ts
	cocos/rendering/custom/web-pipeline.ts
	cocos/rendering/pipeline-scene-data.ts
	cocos/root.ts
	cocos/spine/assembler/simple.ts
	cocos/spine/lib/instantiated.ts
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton.ts
2023-06-27 13:35:35 +08:00
minggo 06f136f5c4 Merge branch 'v3.8.0' into merge-3.8.0 2023-06-19 15:26:26 +08:00
Ling Zhan 85ba2e6c2c [fix] add character controller doc links; replace onGround with isGrounded (#15447) 2023-06-19 10:34:02 +08:00
Yiwen 9f294ddaa3 Update constraint comments (#15422)
* [fix] add boundary to avoid physx assert error (#15321)

* update comments for physics constraint components
2023-06-13 18:35:21 +08:00
PP 509d73b27d merge branch v3.8.0-aot (#15421)
* PR1: add explicit function return type (#15311)

* PR4: add explicit function return type (#15314)

* [ci skip][AUTO]: Automated code generating update: 8843bfe54cd3f8e6f84432948716c8d130ecb233  (#15314) (#15357)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* add function return type

* fix version checking

* fix return type

---------

Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2023-06-13 18:08:45 +08:00
Ling Zhan bd2608bce7 [opt] cct api refactor (#15360)
* [opt] cct api refactor

* tweaks

* tweak
2023-06-08 12:22:27 +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
Yiwen d9401b54ac fix code style (#15310)
* fix code style

* rm getter
2023-06-05 18:00:17 +08:00
Yiwen 1cf995dd0f fix physics data type decorators (#15152)
* update external config, fix abnormal behavior

* remove help and menu tag for non-component data type
2023-05-23 20:38:31 +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
Yiwen 78c87a09d2 add new features to 3d hinge constraint (#14447)
* add new features to 3d hinge constraint
1. angular limit
2. angular drive

* add missing file

* fix native and bullet parameter error, tune parameters

* clean code

* update package and package lock

* stage

* update

* fix interface

* fix api, improve perf

* fix unit conversion

* fix unit conversion

* sync physx behavior
2023-05-18 16:36:23 +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
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
Yiwen 3713957624 collider constraint (#14068)
* collider constraint

* rm uncessary function import

* bullet doesn't prevent dynamic rigid body using simplex collider

* convex mesh with dynamic rigid body is allowed

* clear useless imports
2023-04-20 14:32:48 +08:00
pandamicro afd22296b4 MIT license update and to new year 2023 (#13927)
* Cpp MIT license update and to date
* TS MIT license update and to date
2022-12-28 11:25:12 +08:00
Ling Zhan 4cbb8dc476 [fix] collider does not use physics default material directly #12931 (#13852)
* [fix] collider does not use physics default material directly #12931

* tweaks
2022-12-20 15:52:17 +08:00
Knox a3d924e5e5 Repair the problem of non-standardized property settings (#13667)
* refine code, add default values and update types
2022-12-06 11:17:22 +08:00
Yiwen b0e9b0bda0 support fixed constraint (#13209)
* support fixed constraint

* fix typo

* fix typo

* add missing files, clean code

* update cocos/bullet version, remove unused file

* update package version

* update package lock

* fix issues
2022-11-14 10:15:45 +08:00
Ling Zhan 1aad162030 [fix] [physx-backend] Dynamically setting the convex property of the MeshCollider after rigid body generation has no effect #12048 (#13312) 2022-11-11 08:44:25 +08:00
minggo 7294de16f6 Adjust core import (#13230)
* fix import style of core module
* fix decorator usage
2022-11-07 15:01:31 +08:00
minggo 0d7c5c8f56 move cocos/core/scene-graph to cocos/scene-graph (#12868)
* move `cocos/core/scene-graph` to `cocos/scene-graph`
* move some files in `cocos/core/components` to `cocos/scene-graph`:
  - component.ts
  - component-event-handler.ts
  - component-event-handler-schema.ts
* move some files in `cocos/core/components` to `cocos/misc`: 
  - missing-script.ts
  - model-renderer.ts
  - renderer.ts
  - camera-component.ts
* move  `cocos/core/components/system.ts` to ``cocos/core/system.ts``
2022-09-26 11:02:22 +08:00
fqamic 18d2d57447 improve: update external version and remove some redundant codes (#12759)
* feat: update external version

* improve: remove redundancy code
2022-09-14 16:45:40 +08:00
QingliWang 6a8f53b186 Add features for XR developement. (#12413)
* Change Android mainloop, add global config and template projects for XR.

* Change gfx/gles device's process flow for XR, working with other PRs, waiting.

* Change gfx/Vulkan device's process flow for XR, working with other PRs, waiting.

* Change render process for XR.

* Develop XR input and events.

* Develop 3D feature of UI widgets and raycast effect for XR.

Co-authored-by: fqamic <fqamic@vip.qq.com>
2022-08-22 16:34:45 +08:00
mmyduckx df1594c8d8 Gameview editor macro (#11568)
* GameView related EDITOR macro modify

* remove debug code

* fix ci

* fix review

* fix review
2022-06-20 10:05:29 +08:00
pandamicro dba83c270d Fix multi blank lines (#11116) 2022-05-17 11:56:06 +08:00
Santy-Wang 464c9dd044 optimize api doc i18n (#10965)
* optimize api doc i18n

* refine docs

* refine

* refine

* adjust grammar error
2022-05-07 10:52:56 +08:00
Santy-Wang 23de9188ba V3.5 docs (#10898)
* adjust api docs and delete useless annotation

* delete useless annotation
2022-04-27 15:22:22 +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
jiaxin.lai 4cda45bfd9 physics unit-test and features base 3.3 (#9027)
* support ccd

* clearState after change type

* fix Instantiate rigid body with custom group

* add some extra functions

* update physics libs

* tweaks rigid body component

* add EVENT_UPDATE to PhysicsMaterial

* tweaks

* support switch physics backend

* remove redundant constants

* add config & min volume size

* update @cocos/physx to 1.0.4

* fix destroy cannon world

* correct init if manual construct physics system

* disable log info in test

* add some physics unit test

* add physics unit test

* make the config optional

* add runInEditor to selector

* pack physx js libs by default

* fix

* STASH

* stash

* tweaks

* rename

* update test

* support query trigger

* update @cocos/ammo to 1.1.6

* fix raycast with query trigger in physx

* raycast test with query trigger

* rename

* docs

* fix calculate local inertia (#8956)

* rename

* delete

* allow generate mesh/terrain collider at runtime

* tweaks

* use sap by default

* update @cocos/ammo to  1.1.8

* update @cocos/physx to 1.0.7

* update @cocos/cannon to 1.2.8

* update package-lock

* add ccd test

* remove config

* rename

* fix 2d phy sys typing

* support global allow sleep toggle for bullet

* tweaks

* use naive broadphase by default

* rename

* docs

* tweaks

* add missing jugement
2021-07-22 15:52:18 +08:00
jiaxin.lai 28d62c8393 native physx (#8455)
* Stash

* add plane/capsule shape

* add syncTo/FromNativeTransform

* support trigger/collision events

* set rigid body property on enable

* group distinguish between serialized  and lowlevel

* support trimesh-shape/mass-center

* fix cone/cylinder direction

* support cylinder/cone shape

* tweaks of pmtl

* fix setMesh

* support terrain

* support raycast

* support revolute joint

* support distance joint

* tweaks

* add some API docs

* tweaks

* optimize book and unBook

* tweaks

* tweaks
2021-04-19 20:21:29 +08:00
jiaxin.lai 47938b21d2 add physics i18n (#8334)
* add physics i18n

* ammo.js -> bullet(ammo.js)

* tweaks
2021-03-15 16:36:57 +08:00
jiaxin.lai 30cb5eb4e9 update api docs and cannon (#8224)
* DOCS

* update @cocos/cannon to 1.2.3
2021-01-28 11:45:39 +08:00
jiaxin.lai d169d90713 support constraints auto-scaling (#8015)
* lint

* cannon constraint support auto-scaling

* fix kinematic/static body

* tweaks

* remove onLoad that was not necessary

* ammo constraint support auto-scaling

* physx joint refactor

* using fastRemoveAt
2020-12-25 16:36:18 +08:00
Santy-Wang ad4bff3988 Restructure Module (#7968)
* module restructure

* refine

* restructure module

* merge

* revert

* fix ci

* update import path of unit-test

* split 2d and ui

* add more module

* change audio adapter

* rename primitive

* config wechat plugin

* merge

* add category config

* merge

* merge
2020-12-24 19:07:26 +08:00
jiaxin.lai 0dc393b884 3d physx (#8005)
* support physx physics engine

* tweaks

* stash contact event

* update @cocos/physx

* basic event impl

* stash

* support BYTEDANCE

* stash

* stash

* fix inertia

* PhysX mesh collider

* PhysX static trimesh geometry

* PhysX terrain collider

* add kinematic

* bytedance plane collider

* bytedance v2

* support trigger

* bytedance triangle mesh support

* raycast filter

* raycast support

* stash all

* stash

* center of mass

* stash

* stash fixed joint

* stash

* stash

* physx hinge joint

* physx distance joint

* tweaks

* tweaks

* bytedance raycast

* tweaks

* update mass

* tweaks

* tweaks

* joint

* stash

* bytedance adapters

* tweaks

* stash

* apply force/impulse

* add updateEventListener

* Fixed some loose usage

* add getShapeFlags/getShapeMaterials

* tweaks

* optimize bytedance adapter

* fix isStaticsOrKinematic

* support cylinder & cone

* contact normal

* update @cocos/physx to 1.0.0-beta.5

* rigid body tweaks

* add syncAfterEvents

* hinge constraint

* filter static - static

* ammo refactor

* cannon refactor

* ammo p2p constraint refactor

* update @cocos/ammo to 1.0.8

* lint ammo

* more lint

* docs

* tweaks

* avoid direct use globalThis
2020-12-24 13:45:03 +08:00
pandamicro 9b75d50b1b Improve game mainLoop safety (#7796)
* Improve game mainLoop safety

* Fix ci

* Fix ci

* Fix game pause state set

* Fix game init timing

* Fix camera component imports

* Fix eslint warnings

* allow dangling underscores

* Fix more warning
2020-12-22 18:19:40 +08:00
zheng han 720d372bf7 3d rename class under geometry namespace (#7816) 2020-11-19 11:58:33 +08:00
pandamicro b162e21a93 Update license and API language declaration (#7750)
* Update licenses

* Update license for audio

* Update license for core/3d

* Update license for animation, assets, asset-manager, components, data

* update license for event, geometry, gfx

* update license for core modules

math, memop, pipeline, platform, primitive, renderer, scene-graph, utils, value-types

* Update license for core

* Update license for particle and particle-2d

* Update license for particle part2

* Update license for physics and physics-2d

* Update license for all modules in cocos

* Update license for exports

* Fix API doc language declaration
2020-11-10 17:36:31 +08:00
jiaxin.lai 86f761c05f 3d rigidbody refactor (#7635)
* hack of visible decorator

* tweaks

* disable node chain

* using setType instead isKinematic

* fix ammo rigid body

* disable scaling of terrain shape

* twaks

* update default prefab to 1.1.22

* docs

* renaming & deprecated

* docs
2020-10-30 19:03:12 +08:00
jiaxin.lai 3c17cb9e1e refactor collision matrix (#7538)
* refactor collision matrix

* add deprecated

* tweaks
2020-10-28 14:15:20 +08:00
jiaxin.lai 4cc4808072 correct the name of physics material (#7597)
* correct the name of PhysicsMaterial

* tweaks
2020-10-27 18:25:57 +08:00