lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-06 15:48:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,179 Commits 111 Branches 231 Tags
develop
Commit Graph

84 Commits

Author SHA1 Message Date
minggo
fca089c6f3 Merge branch 'v3.8.2' into develop-merge-v3.8.2 
Conflicts:
	.gitignore
	cocos/2d/components/deprecated.ts
	cocos/2d/components/label-outline.ts
	cocos/2d/components/label.ts
	cocos/3d/assets/mesh.ts
cocos/3d/misc/mesh-codec.ts
	cocos/core/geometry/geometry-native-ext.ts
cocos/core/settings.ts
	cocos/gfx/webgpu/webgpu-define.ts
	cocos/input/input.ts
	cocos/render-scene/core/pass.ts
	cocos/rendering/custom/compiler.ts
	cocos/rendering/custom/executor.ts
cocos/rendering/custom/pipeline-define.ts
	cocos/rendering/custom/web-pipeline.ts
	cocos/rendering/render-additive-light-queue.ts
	cocos/webgpu/instantiated.ts
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/cocos/platform/SDLHelper.cpp
	native/cocos/platform/SDLHelper.h
	native/external-config.json
	package-lock.json
	package.json
	pal/env/src/native/env.ts
	pal/screen-adapter/native/screen-adapter.ts
	tests/init.ts
 2023-09-21 14:40:57 +08:00
James Chen
d2c3429f95 Refactor Openharmony platform code to support switching between napi (ark js runtime) and v8 (#16093) 
* OH could use v8 now.

* napi addon works.

* Use Napi addon to refactor code.

* Fix compilation errors.

* tweak

* Refactor oh platform, remove some hacking for oh.

* Fix log in runScript.

* Fix the issues in napi mode.

* Revert.

* Remove an unused comment.

* Refactor log output in NapiHelper.cpp and OpenHarmonyPlatform.cpp

* Update oh template.

* Remove unused code.

* Remove unused debug log in jsb-gfx.js

* Update include

* Revert Screen::isDisplayStats.

* update OH template for v8 backend

* update

* Update CMakeLists.txt for OH

* Fix a compilation error in NapiHelper.cpp while switching to NAPI mode

* Keep the symbol of entry function.

* Add -Wl,--gc-sections and add -Wl,-s for release mode.

* Update external to 3.8.2-1

* Don't use `console.assert` directly.

* Remove oh specific methods ( getInnerWidth/Height, getWindowHandle ) in Device class.

---------

Co-authored-by: PP_Pro <chinese1236@qq.com>
 2023-09-01 16:27:08 +08:00
minggo
5663b38e33 Merge branch 'v3.8.2' into develop-merge-v3.8.2 
Conflicts:
	cocos/3d/assets/mesh.ts
	editor/inspector/contributions/node.js
	editor/inspector/utils/prop.js
	native/cocos/3d/assets/Mesh.h
	native/cocos/engine/Engine.cpp
	native/cocos/renderer/gfx-gles3/GLES3Commands.cpp
	native/cocos/renderer/pipeline/custom/NativePipeline.cpp
	native/external-config.json
 2023-08-31 14:41:18 +08:00
qiuguohua
62a9da122e Use sdl2 on mac platform (#16030) 
* Use sdl2 on mac platform
 2023-08-21 16:45:53 +08:00
oahc09
56417f35b0 improve:adjust xr begin/end render frame call's position (#16021) 
(Calculate the correct delta time)
 2023-08-18 15:11:35 +08:00
santy-wang
c9bd446e92 Merge branch 'v3.8.1' of github.com:cocos-creator/engine into develop 2023-08-03 18:41:12 +08:00
qiuguohua
6d666d2f1d Fix the problem of incorrect screen resolution after resize. (#15785) 2023-07-20 17:32:12 +08:00
江战
1d90243210 Add execution timeout detection (#15607) 
* add execution timeout detection
 2023-07-06 14:47:26 +08:00
James Chen
b4613bd1d9 Fix typo and remove unused private variables in Engine.h/.cpp (#14992) 2023-05-08 11:38:45 +08:00
qiuguohua
e68506916c Develop branch adapts to openharmony (#14582) 2023-03-20 14:18:52 +08:00
santy-wang
0a81bf445e Merge branch 'develop' of github.com:cocos-creator/engine into v3.7.2 2023-03-13 16:51:47 +08:00
Zeqiang Li
71b764ad0d frame fence (#14310) 2023-02-28 17:43:38 +08:00
qiuguohua
ee86fc40bd Native platform modifies exit process (#14141) 2023-02-15 17:11:28 +08:00
hyde zhou
857004bc00 [pipeline] refactor custom pipeline init (#14040) 2023-01-13 14:02:46 +08:00
mmyduckx
e8c214b5af fix windows launch slow when remote load resource (#14015) 2023-01-06 15:38:17 +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
江战
9f0cfdc6fe fix missing close event (#13906) 2022-12-26 17:26:08 +08:00
江战
f6854cd16e native introduce jsb.window (#13816) 2022-12-16 13:50:59 +08:00
王凯鹏
315d8e0b2d fix: native scene launch too slow (#13808) 2022-12-16 12:17:31 +08:00
江战
7ccd14e6e6 JSB export math class : Vec2/Vec3/Vec4/Quat/Mat3/Mat4/Color (#12968) 2022-10-31 17:24:54 +08:00
江战
280fd976bc Add EventTarget & EventBus (#13100) 2022-10-28 15:44:33 +08:00
林玮
eab2d646c6 Change windowHandle to windowId when EVENT_DESTROY_WINDOW (#12848) 
* Change windowHandle to windowId when EVENT_DESTROY_WINDOW

* fix: resolution issue on iOS
 2022-09-22 15:45:56 +08:00
minggo
bd0fcc67c4 move cocos/core/pipeline to cocos/rendering (#12797) 
* move cocos/core/pipeline to cocos/rendering
 2022-09-16 16:10:26 +08:00
林玮
785fd91511 Add multi-windows support (#12243) 
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com>
 2022-09-15 14:55:44 +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
minggo
5778aab354 Merge branch 'v3.6.0' into merge_v3.6 2022-08-08 10:49:46 +08:00
yangchao
2c8214c351 fix : mac server mod use loopp (#12327) 2022-08-04 13:31:05 +08:00
mmyduckx
a2323b69c0 add back HttpClient::destroyInstance in destroy to fix http no response when restart (#12236) 2022-07-28 14:09:43 +08:00
qiuguohua
9beb03ebb6 Fixed the problem that the script callback function could not be registered in game.cpp (#12190) 2022-07-26 18:34:56 +08:00
minggo
e0bfd1d380 Merge branch 'v3.6.0' into merge_v3.6 2022-07-26 12:01:26 +08:00
timlyeee
aeac69c492 Fix bug when JsbBridge test case close window (#12126) 
* .6.0-reflectionDocs: Auto stash before checking out "cocos/v3.6.0"
 2022-07-22 10:30:44 +08:00
minggo
d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
bofeng-song
113fad0259 refine: rename windowHanler to windowHandle, rename onDestory to onDestroy (#11907) 2022-07-09 13:54:18 +08:00
timlyeee
b43de1af07 V3.6.0 exit (#11856) 2022-07-07 14:07:47 +08:00
minggo
02a1eb0f55 Use raw pointer (#11804) 
* Revert "use IntrusivePtr to share object (#11729)"

This reverts commit 8caec59711.

* Framebuffer uses weak reference

* make doDestroy reentency
 2022-07-04 10:20:07 +08:00
James Chen
174ba0eff2 Add macros: CC_USE_GEOMETRY_RENDERER and CC_USE_DEBUG_RENDERER to control these debugging features. (#11740) 2022-06-30 10:25:02 +08:00
minggo
8caec59711 use IntrusivePtr to share object (#11729) 2022-06-28 18:01:47 +08:00
timlyeee
6e2421714f remove destroy() call (#11575) 2022-06-17 17:10:49 +08:00
timlyeee
ab374ba4a5 force exit engine and application (#11532) 
* force exit engine and application
 2022-06-16 16:42:40 +08:00
qiuguohua
6e693451a5 deviceevent related issues (#11308) 
* dispatchOrientationChangeEvent is not called
 2022-06-01 14:47:18 +08:00
minggo
c33a59fb94 delete/recreate all resources when restart app (#11301) 
* unify restart logic
 2022-06-01 11:41:04 +08:00
James Chen
024737aebc fixed #11195: Rename cc::optional, cc::any, cc::variant to ccstd::optional, ccstd::any, ccstd::variant (#11197) 
* Move Any.h/Optional.h/Variant.h to base/std and rename them to lowercase.

* fixed #11195: Rename cc::optional, cc::any, cc::variant to ccstd::optional, ccstd::any, ccstd::variant

* Format code.
 2022-05-24 18:47:16 +08:00
minggo
7814949998 Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1 2022-05-24 11:53:57 +08:00
mmyduckx
204543cfd8 fix restart buffer & shader leak and add prompts (#11164) 
* fix restart buffer & shader lead and add prompts
 2022-05-20 16:10:40 +08:00
minggo
9b0233cca4 Startup shutdown (#11150) 
* Adjust exit process
- detelte objects in reserve order
- delete some global objects, may refactor in future

* remove unneeded codes
 2022-05-20 10:31:39 +08:00
李吉林
25cc44e315 refactor DebugRenderer exiting (#11145) 2022-05-19 11:41:50 +08:00
minggo
ac92997d96 do not handle Root in engine (#11140) 2022-05-18 18:20:55 +08:00
minggo
fac5bf833a Subsystem startup shutdown (#11128) 
* refactor startup/shutdown process of BuiltinResMgr
* refactor startup/shutdown process of ProgramLib
 2022-05-18 11:09:55 +08:00
minggo
75dcf062c6 refactor startup/shutdown process of gfx device (#11123) 
* refactor startup/shutdown process of gfx device
 2022-05-17 17:29:09 +08:00
minggo
b33e91fb15 refactor startup/shutdown process of DebugRenderer (#11114) 
* refactor startup/shutdown process of DebugRenderer
 2022-05-16 19:32:01 +08:00