Commit Graph

122 Commits

Author SHA1 Message Date
PP ebfcbb6228 [AOT] fix ts engine compile (#15745) 2023-07-17 14:24:48 +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 8f21546ec2 [fix] assign physics system to PhysicsSystem._instance, before using it (#15320) 2023-06-06 10:21:31 +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
Ling Zhan ae724da8cf [fix] physics-enum adds doc (#15095)
* [fix] physics-enum adds doc

* tweaks

* tweaks
2023-05-17 18:56:47 +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
Ling Zhan 8bc85cc577 IPhysicsEngineId replaces ammo.js with bullet (#15070)
* IPhysicsEngineId replaces ammo.js with bullet

* put back "string"
2023-05-17 15:58:18 +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
PP 386ec2895a [cherry-pick] AOT-3: optimize uinstrict code (#14315) (#14523)
* AOT: optimize uinstrict code

- mark some unstrict code as TODO
- remove some unstrict code

* update comment

* remove ts-check
# Conflicts:
#	cocos/2d/framework/deprecated.ts
#	cocos/asset/assets/image-asset.jsb.ts
#	cocos/asset/assets/texture-base.ts
#	cocos/core/assets/image-asset.ts
#	cocos/core/math/rect.ts
#	cocos/core/scene-graph/scene-globals.jsb.ts
#	cocos/native-binding/impl.ts
#	cocos/scene-graph/node-dev.ts
#	cocos/scene-graph/scene-globals.ts
#	exports/sorting.ts
2023-03-10 13:36:45 +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
Ling Zhan 3a0df15c31 [feat] in physics settings, default material is set through file (#13464)
* [feat] in physics settings, default material is set through file
2022-11-23 10:23:28 +08:00
Ling Zhan f29b365d3e [feat] enable/disable physics system through configuration (#13455) 2022-11-21 17:30:57 +08:00
Ling Zhan 5ee54d97ff Curve raycast (#13086)
* PhysicsSystem add line-segments-raycast

* 规范接口注释

* PhysicsRayResult add id property

* tweak

* tweak

* 接口命名

* tweak

* native

* add PhysicsLineStripCastResult

* tweak

* tweak
2022-11-15 13:47:52 +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 95a76235b6 Adjust some files (#12910)
`cocos/core` should not depend other modules, so move some files out of `cocos/core`:
- move some files from `cocos/core` to `cocos/game`
  - director.ts
  - splash-screen.ts
  - game.ts
 - move `cocos/core/root.ts` to `cocos/root.ts` as there is not better module to contain `root.ts`.
 - move `cocos/core/platform/view.ts` to `cocos/ui/view.ts` as screen related logic is moved to `cocos/core/platform/screen.ts`
2022-09-28 09:34:35 +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
santy-wang f33523227f sync v3.6.1 to develop 2022-09-19 14:00:54 +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
minggo 2f10f48c15 adjust some folders (#12712)
move cocos/core/asset-manager to cocos/asset/asset-manager
move cocos/core/assets to cocos/asset/assets
merge cocos/core/builtin to cocos/asset/asset-manager
2022-09-07 18:45:54 +08:00
PP 6e715d8b94 fix wrong CC_PHYSICS_AMMO constant (#12577) 2022-08-30 01:01:39 +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
Ling Zhan 811ed11bfa default physics material useing internal asset : default-physics-mate… (#11855)
* default physics material useing internal asset : default-physics-material.pmtl. todo: Project Setting's physics material config need to use this asset too. (#12662)

* support set default physics material value from project setting panel. It will effect the packaging processing, and scene loading(todo). this value will not be saved to default-physics-material.pmtl.

* fix physics-system unit test failure: physics system 's constructAndRegister() will directly init default physics material if the default physics material asset is ready

* minor modification of PhysicsSystem::_updateMaterial
2022-07-21 10:37:15 +08:00
Santy-Wang 7bc135e1c7 adjust initialization process (#11143)
* adjust init process

* fix bugs

* restructure

* tweak

* delete useless code

* fix ci

* support more platform and fix some bugs

* mark internal

* tweak

* add docs

* add docs and little adjustment

* fix bugs

* adjust decorator execute order

fix mesh error

* fix bugs

* revert some change

* revert auto-generated code

* revert auto-generated code
2022-07-03 21:16:09 +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
PP d749bbe1c4 remove legacyPublic tag (#10702) 2022-04-08 19:41:20 +08:00
minggo be735449af Revert "remove some deprecated api (#10656)" (#10694)
This reverts commit a1b1fc5a09.
2022-04-08 11:51:06 +08:00
minggo a1b1fc5a09 remove some deprecated api (#10656)
* remove some deprecated api
2022-04-07 16:31:02 +08:00