Commit Graph

88 Commits

Author SHA1 Message Date
qiuguohua 06341f3037 Uncapture global mouse events. (#15834) 2023-08-02 14:20:24 +08:00
qiuguohua b6bcc12b7e Solve unchecked websocket link failure issue (#15799) 2023-07-26 10:15:45 +08:00
minggo e5802a5e9c Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton-cache.ts
	cocos/spine/skeleton.ts
:	native/external-config.json
2023-07-18 11:53:54 +08:00
Canvas c023759a1c update external version v3.8.0-17 -> v3.8.0-18. (#15744) 2023-07-15 13:41:45 +08:00
James Chen d31a3d6188 fix #15704: [swig] The generated glue code is wrong if rename an inner class (#15710) 2023-07-14 09:58:27 +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
Santy-Wang e5d61cf2a2 fix problem when skin changed and slot texture changed (#15677)
* fix problem when skin changed and slot texture changed

* update external version
2023-07-11 18:27:47 +08:00
Santy-Wang 31b10ffdc5 update external version (#15675) 2023-07-11 14:27:39 +08:00
江战 9aaee8c8f7 Update external-config.json (#15649) 2023-07-07 16:56:53 +08:00
James Chen 73776a0993 Update external to v3.8.0-14 (#15635) 2023-07-07 10:53:23 +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
Santy-Wang e653f6f953 Update external-config.json (#15598)
update spine wasm
2023-07-02 22:00:23 +08:00
zhakesi a1fa17e466 fix some bugs in spine webassembly (#15569)
* fix blend enum export

* fix convert string from ts to sp string

* update skeleton data in preload

* feature: support change slot texture web

* feature: spine change slot texture native

* fix set debug render in native

* fix some spine asset with no mesh data

* fix some interfaces

* fix change slot repeat to create middleware textures

* fix code style

* update external config
2023-06-30 15:05:16 +08:00
James Chen 324e47589e Update swig to cocos-v1.1.5 to resolve function name of glue code for overloaded constructor (#15588) 2023-06-30 11:32:04 +08:00
Ling Zhan 3afeca4d15 update native/external version v3.8.0-11 (#15546) 2023-06-27 10:41:20 +08:00
James Chen f9dd8bcbc4 Fix spine.wasm could not run in safari with iOS which version is lower than 15. (#15515)
* Fix spine.wasm could not run in safari with iOS which version is lower than 15.

* Update external config.

* Revert "fix: add WASM_FALLBACK for spine wasm module (#15511)"

This reverts commit e5dde7f37d.
2023-06-25 10:37:04 +08:00
PP e5dde7f37d fix: add WASM_FALLBACK for spine wasm module (#15511)
* fix: add WASM_FALLBACK for spine wasm module

* update external

* fix eslint
2023-06-21 16:51:16 +08:00
pandamicro 2b8d4cd2d7 Update external-config.json for new spine lib (#15483) 2023-06-19 23:33:11 +08:00
PP 31f7fb6508 optimize: load spine asm.js module with js.mem && update spine (#15469)
* optimize: load spine asm.js module with js.mem

* update spine (#12)

* support debug renderer

* fix cached mode update color

* enable Batch mode

* fix engineInternal

* fix ESLint

---------

Co-authored-by: zhakesi <zhakesi@foxmail.com>
2023-06-19 11:34:28 +08:00
qiuguohua bca35b2636 Update Harmonyos third-party library. (#15429) 2023-06-14 11:33:15 +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
Yiwen c2c3ffe73a Update external tag (#15361)
* [fix] add boundary to avoid physx assert error (#15321)

* sync external tag
2023-06-07 22:45:09 +08:00
qiuguohua 343393942c Fix harmonyos platform compilation failure. (#15262) 2023-06-02 14:55:55 +08:00
Yiwen 44b1616fb0 native external updates tag to develop-23 (#15172) 2023-05-24 18:46:44 +08:00
Yiwen 486b36319d [fix] physics constraint abnormal behavior and update external config to develop-22 (#15126) 2023-05-22 10:52:23 +08:00
Yiwen e2f9a91d89 update native external version tag (#15072) 2023-05-16 17:02:46 +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
James Chen 13d3087d9a fixed #14351: The auto-binding code for RenderEntity::STATIC_DRAW_INFO_CAPACITY is wrong (#15024)
* Update native/external-config.json, update swig.

* Update editor_support.i, don't bind unneeded classes.

* Update render-scene/scene/index.jsb.ts, add missing class variables.
2023-05-11 15:55:33 +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
江战 d963b0b21d Update external-config.json (#14652) 2023-03-24 15:18:35 +08:00
qiuguohua e68506916c Develop branch adapts to openharmony (#14582) 2023-03-20 14:18:52 +08:00
qiuguohua ee86fc40bd Native platform modifies exit process (#14141) 2023-02-15 17:11:28 +08:00
MoHai cc300827d5 [v3.7.1] update external to v3.7.1-2 (#14158)
* add stop interface to fix ar session error

* move armodule to .a lib and adjust interfaces

* fix parameter widthInMeters errror

* update external to v3.7.1-1

* upgrade external for ar ios lib fix
2023-02-07 16:05:50 +08:00
MoHai 2a194a2732 [v3.7.1] adjust ARModule (#14143)
* add stop interface to fix ar session error

* move armodule to .a lib and adjust interfaces

* fix parameter widthInMeters errror

* update external to v3.7.1-1
2023-02-05 13:34:39 +08:00
MoHai c1c1fa61e9 feat: update external config (#13973) 2022-12-30 13:35:13 +08:00
江战 5139110ea4 update license (#13950) 2022-12-29 15:55:28 +08:00
James Chen ed87e01520 Update swig version info. (#13847) 2022-12-19 15:09:08 +08:00
MoHai c7fba8b93c feat: update external config (#13771) 2022-12-09 14:57:15 +08:00
fqamic 0200d8da85 feat: update external config (#13751) 2022-12-09 10:47:50 +08:00
James Chen 04b15e44a5 Fix pass states could not be changed in material inspector panel and update swig template (#13707)
* Add se::Class::defineStaticProperty(const char *name, const Value &value, PropertyAttribute attribute = PropertyAttribute::NONE);
2022-12-07 15:18:23 +08:00
fqamic d4055f7e32 new basic capabilities of supporting handset ar and webxr (#13420)
* feat: add the basic capability of handset ar native

* feat: add handset input device, for ar camera pose

* feat: native pack tool supports xr platform name

* feat: web gl context supports webxr

* feat: webxr has been converted to screen coordinates via camera

* fix: pr ts-expect-error undefined xr

* feat: support webxr, and remove ar redundant code

* fix:xr-spaces gradlew permission error

* feat: revert redundant ar engine feature

* fix: eslint check error

* feat: remove redundant code

* fix: eslint check warning

* adjust armodule process in forward stage, mtl texture and jsb

* fix: exlint warning, and add license

* adjust ar lib and interfaces

* change webxr check interface

* merge external arlib header and move it to engine

* improve: update native external version

* move ar background stage to xr/rendering and move its init to webxr device in xr plugin

* fix format error

* fix format error

* adjust jsb_ar_manual, ARModule, ARBackground

* adjust arbackground

Co-authored-by: Parryzhai <1306895355@qq.com>
Co-authored-by: MoHai <1192652394@qq.com>
2022-11-24 13:33:50 +08:00
yangchao 81424d9d8c update external config (#13515)
* update external config
2022-11-23 18:13:10 +08:00
James Chen d8e1a1ee95 Fix crash if invoking binding code of cc::Device::getSafeAreaEdge() (#13445) 2022-11-21 13:35:25 +08:00
James Chen 32a6aba4fb Fix some swig warnings and fix the issue that Node::mobility is not bound, update swig to 4.1.0 release (#13425)
* Update swig config, fix some warnings

* Update TextureBase.h, don't make _width, _height public

* Revert genbindings.js

* Update external to develop-8
2022-11-18 11:56:09 +08:00
James Chen cf8675a949 fixed #13232: [feature] Support to pass commandline arguments to JS (#13268)
* [feature] Support to pass arguments to execution file and export them to JS ( native.process.argv ) .
2022-11-10 09:47:28 +08:00
santy-wang 91c884362d Merge branch 'v3.6.2' of github.com:cocos-creator/engine into v3.6.1-sync 2022-10-11 20:12:14 +08:00
bofeng-song 8f40d29372 refine: remove appCompat's dependency (#12854)
* refine: remove appCompat's dependency
2022-09-30 10:21:10 +08:00
Zeqiang Li e4930f3332 a compatible way of data copy & default buffer size for uniform buffer (#12935)
* a compatible way of data copy & default buffer size for uniform buffer

* update external config
2022-09-28 16:22:06 +08:00
Zeqiang Li 097e29b2c2 Export texture info for wgpu WGPU_CI_ON (#12926)
* export texture info for wgpu

* missing js file

* update external config

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
2022-09-28 10:23:05 +08:00
Zeqiang Li f730a810a1 wgpu: remove reinit on same object (#12799) 2022-09-27 10:33:51 +08:00