From d87262deaddc50d04795756c060064bd9d98f03a Mon Sep 17 00:00:00 2001 From: yangchao <1162485779@qq.com> Date: Wed, 25 May 2022 09:39:16 +0800 Subject: [PATCH 1/2] V3.5.1 ds servermode (#11207) --- cocos/core/root.ts | 6 +- native/CMakeLists.txt | 96 ++++++++++--------- native/cocos/platform/BasePlatform.cpp | 8 +- .../cocos/platform/empty/modules/System.cpp | 66 +------------ .../platform/empty/modules/SystemWindow.cpp | 16 +++- .../platform/empty/modules/SystemWindow.h | 6 +- native/cocos/platform/linux/LinuxPlatform.cpp | 10 +- native/cocos/platform/mac/MacPlatform.mm | 10 +- .../cocos/platform/win32/WindowsPlatform.cpp | 9 +- native/cocos/renderer/GFXDeviceManager.h | 2 + .../cocos/renderer/gfx-base/GFXSwapchain.cpp | 2 + .../cocos/renderer/gfx-empty/EmptyDevice.cpp | 1 - native/templates/windows/main.cpp | 11 ++- 13 files changed, 115 insertions(+), 128 deletions(-) diff --git a/cocos/core/root.ts b/cocos/core/root.ts index 183adebb2f..2b95e0649d 100644 --- a/cocos/core/root.ts +++ b/cocos/core/root.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { JSB } from 'internal:constants'; +import { JSB, SERVER_MODE } from 'internal:constants'; import { builtinResMgr } from './builtin'; import { Pool } from './memop'; import { RenderPipeline, createDefaultPipeline, DeferredPipeline } from './pipeline'; @@ -448,7 +448,9 @@ export class Root { legacyCC.director.emit(legacyCC.Director.EVENT_BEFORE_COMMIT); cameraList.sort((a: Camera, b: Camera) => a.priority - b.priority); - this._pipeline.render(cameraList); + if (!SERVER_MODE) { + this._pipeline.render(cameraList); + } this._device.present(); } diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index d386255c73..985b75df0e 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -353,12 +353,6 @@ cocos_source_files( ) ############ main -if(USE_SERVER_MODE) - cocos_source_files( - cocos/main/EmptyMain.cpp - ) -endif() - if(NOT USE_SERVER_MODE AND (WINDOWS OR LINUX)) cocos_source_files( cocos/platform/SDLHelper.h @@ -374,12 +368,7 @@ cocos_source_files( cocos/platform/UniversalPlatform.cpp cocos/platform/UniversalPlatform.h ) -if(USE_SERVER_MODE) - cocos_source_files( - cocos/platform/empty/EmptyPlatform.cpp - cocos/platform/empty/EmptyPlatform.h - ) -elseif(WINDOWS) +if(WINDOWS) cocos_source_files( cocos/platform/win32/WindowsPlatform.cpp cocos/platform/win32/WindowsPlatform.h @@ -474,40 +463,34 @@ endif() ############ platform : Interface implementation of windows -if(USE_SERVER_MODE) - cocos_source_files( - cocos/platform/empty/modules/Accelerometer.cpp - cocos/platform/empty/modules/Accelerometer.h - cocos/platform/empty/modules/Battery.cpp - cocos/platform/empty/modules/Battery.h - cocos/platform/empty/modules/Screen.cpp - cocos/platform/empty/modules/Screen.h - cocos/platform/empty/modules/Network.cpp - cocos/platform/empty/modules/Network.h - cocos/platform/empty/modules/Vibrator.cpp - cocos/platform/empty/modules/Vibrator.h - cocos/platform/empty/modules/System.cpp - cocos/platform/empty/modules/System.h - cocos/platform/empty/modules/SystemWindow.cpp - cocos/platform/empty/modules/SystemWindow.h - ) -elseif(WINDOWS) +if(WINDOWS) cocos_source_files( cocos/platform/win32/modules/Accelerometer.cpp cocos/platform/win32/modules/Accelerometer.h cocos/platform/win32/modules/Battery.cpp cocos/platform/win32/modules/Battery.h - cocos/platform/win32/modules/Screen.cpp - cocos/platform/win32/modules/Screen.h cocos/platform/win32/modules/Network.cpp cocos/platform/win32/modules/Network.h cocos/platform/win32/modules/Vibrator.cpp cocos/platform/win32/modules/Vibrator.h cocos/platform/win32/modules/System.cpp cocos/platform/win32/modules/System.h - cocos/platform/win32/modules/SystemWindow.cpp - cocos/platform/win32/modules/SystemWindow.h ) + if(USE_SERVER_MODE) + cocos_source_files( + cocos/platform/empty/modules/Screen.cpp + cocos/platform/empty/modules/Screen.h + cocos/platform/empty/modules/SystemWindow.cpp + cocos/platform/empty/modules/SystemWindow.h + ) + else() + cocos_source_files( + cocos/platform/win32/modules/Screen.cpp + cocos/platform/win32/modules/Screen.h + cocos/platform/win32/modules/SystemWindow.cpp + cocos/platform/win32/modules/SystemWindow.h + ) + endif() elseif(ANDROID OR OHOS) cocos_source_files( cocos/platform/java/modules/Accelerometer.cpp @@ -526,9 +509,8 @@ elseif(ANDROID OR OHOS) cocos/platform/java/modules/SystemWindow.h ) endif() -if (USE_SERVER_MODE) -#nothing -elseif(ANDROID) + +if(ANDROID) cocos_source_files( cocos/platform/android/modules/Screen.cpp cocos/platform/android/modules/Screen.h @@ -548,17 +530,28 @@ elseif(MACOSX) cocos/platform/mac/modules/Accelerometer.h cocos/platform/mac/modules/Battery.mm cocos/platform/mac/modules/Battery.h - cocos/platform/mac/modules/Screen.mm - cocos/platform/mac/modules/Screen.h cocos/platform/mac/modules/Network.mm cocos/platform/mac/modules/Network.h cocos/platform/mac/modules/Vibrator.mm cocos/platform/mac/modules/Vibrator.h cocos/platform/mac/modules/System.mm cocos/platform/mac/modules/System.h - cocos/platform/mac/modules/SystemWindow.mm - cocos/platform/mac/modules/SystemWindow.h ) + if(USE_SERVER_MODE) + cocos_source_files( + cocos/platform/empty/modules/Screen.cpp + cocos/platform/empty/modules/Screen.h + cocos/platform/empty/modules/SystemWindow.cpp + cocos/platform/empty/modules/SystemWindow.h + ) + else() + cocos_source_files( + cocos/platform/mac/modules/Screen.mm + cocos/platform/mac/modules/Screen.h + cocos/platform/mac/modules/SystemWindow.mm + cocos/platform/mac/modules/SystemWindow.h + ) + endif() elseif(IOS) cocos_source_files( cocos/platform/ios/modules/Accelerometer.mm @@ -582,17 +575,28 @@ elseif(LINUX) cocos/platform/linux/modules/Accelerometer.h cocos/platform/linux/modules/Battery.cpp cocos/platform/linux/modules/Battery.h - cocos/platform/linux/modules/Screen.cpp - cocos/platform/linux/modules/Screen.h cocos/platform/linux/modules/Network.cpp cocos/platform/linux/modules/Network.h cocos/platform/linux/modules/Vibrator.cpp cocos/platform/linux/modules/Vibrator.h cocos/platform/linux/modules/System.cpp cocos/platform/linux/modules/System.h - cocos/platform/linux/modules/SystemWindow.cpp - cocos/platform/linux/modules/SystemWindow.h ) + if(USE_SERVER_MODE) + cocos_source_files( + cocos/platform/empty/modules/Screen.cpp + cocos/platform/empty/modules/Screen.h + cocos/platform/empty/modules/SystemWindow.cpp + cocos/platform/empty/modules/SystemWindow.h + ) + else() + cocos_source_files( + cocos/platform/linux/modules/Screen.cpp + cocos/platform/linux/modules/Screen.h + cocos/platform/linux/modules/SystemWindow.cpp + cocos/platform/linux/modules/SystemWindow.h + ) + endif() endif() ############ module log @@ -2481,4 +2485,4 @@ elseif(LINUX) ${LINUX_GRAPHIC_LIBS} ${CC_EXTERNAL_LIBS} ) -endif() \ No newline at end of file +endif() diff --git a/native/cocos/platform/BasePlatform.cpp b/native/cocos/platform/BasePlatform.cpp index 9b0003da91..a42a2a4c80 100644 --- a/native/cocos/platform/BasePlatform.cpp +++ b/native/cocos/platform/BasePlatform.cpp @@ -24,9 +24,7 @@ ****************************************************************************/ #include "platform/BasePlatform.h" -#if defined(CC_SERVER_MODE) - #include "platform/empty/EmptyPlatform.h" -#elif (CC_PLATFORM == CC_PLATFORM_WINDOWS) +#if (CC_PLATFORM == CC_PLATFORM_WINDOWS) #include "platform/win32/WindowsPlatform.h" #elif (CC_PLATFORM == CC_PLATFORM_ANDROID) #include "platform/android/AndroidPlatform.h" @@ -55,9 +53,7 @@ BasePlatform::~BasePlatform() { } BasePlatform* BasePlatform::createDefaultPlatform() { -#if defined(CC_SERVER_MODE) - static EmptyPlatform platform; -#elif (CC_PLATFORM == CC_PLATFORM_WINDOWS) +#if (CC_PLATFORM == CC_PLATFORM_WINDOWS) static WindowsPlatform platform; #elif (CC_PLATFORM == CC_PLATFORM_ANDROID) static AndroidPlatform platform; diff --git a/native/cocos/platform/empty/modules/System.cpp b/native/cocos/platform/empty/modules/System.cpp index b8e9f53f22..2516596cdb 100644 --- a/native/cocos/platform/empty/modules/System.cpp +++ b/native/cocos/platform/empty/modules/System.cpp @@ -25,10 +25,8 @@ #include "platform/empty/modules/System.h" #include -#include namespace cc { - using OSType = System::OSType; OSType System::getOSType() const { @@ -40,31 +38,11 @@ std::string System::getDeviceModel() const { } System::LanguageType System::getCurrentLanguage() const { - char* pLanguageName = getenv("LANG"); - if (!pLanguageName) { - return LanguageType::ENGLISH; - } - strtok(pLanguageName, "_"); - if (!pLanguageName) { - return LanguageType::ENGLISH; - } - - return getLanguageTypeByISO2(pLanguageName); + return LanguageType::ENGLISH; } std::string System::getCurrentLanguageCode() const { - static char code[3] = {0}; - char* pLanguageName = getenv("LANG"); - if (!pLanguageName) { - return "en"; - } - strtok(pLanguageName, "_"); - if (!pLanguageName) { - return "en"; - } - strncpy(code, pLanguageName, 2); - code[2] = '\0'; - return code; + return "en"; } std::string System::getSystemVersion() const { @@ -79,44 +57,6 @@ System::LanguageType System::getLanguageTypeByISO2(const char* code) const { // this function is used by all platforms to get system language // except windows: cocos/platform/win32/CCApplication-win32.cpp LanguageType ret = LanguageType::ENGLISH; - - if (strncmp(code, "zh", 2) == 0) { - ret = LanguageType::CHINESE; - } else if (strncmp(code, "ja", 2) == 0) { - ret = LanguageType::JAPANESE; - } else if (strncmp(code, "fr", 2) == 0) { - ret = LanguageType::FRENCH; - } else if (strncmp(code, "it", 2) == 0) { - ret = LanguageType::ITALIAN; - } else if (strncmp(code, "de", 2) == 0) { - ret = LanguageType::GERMAN; - } else if (strncmp(code, "es", 2) == 0) { - ret = LanguageType::SPANISH; - } else if (strncmp(code, "nl", 2) == 0) { - ret = LanguageType::DUTCH; - } else if (strncmp(code, "ru", 2) == 0) { - ret = LanguageType::RUSSIAN; - } else if (strncmp(code, "hu", 2) == 0) { - ret = LanguageType::HUNGARIAN; - } else if (strncmp(code, "pt", 2) == 0) { - ret = LanguageType::PORTUGUESE; - } else if (strncmp(code, "ko", 2) == 0) { - ret = LanguageType::KOREAN; - } else if (strncmp(code, "ar", 2) == 0) { - ret = LanguageType::ARABIC; - } else if (strncmp(code, "nb", 2) == 0) { - ret = LanguageType::NORWEGIAN; - } else if (strncmp(code, "pl", 2) == 0) { - ret = LanguageType::POLISH; - } else if (strncmp(code, "tr", 2) == 0) { - ret = LanguageType::TURKISH; - } else if (strncmp(code, "uk", 2) == 0) { - ret = LanguageType::UKRAINIAN; - } else if (strncmp(code, "ro", 2) == 0) { - ret = LanguageType::ROMANIAN; - } else if (strncmp(code, "bg", 2) == 0) { - ret = LanguageType::BULGARIAN; - } return ret; } -} // namespace cc \ No newline at end of file +} // namespace cc diff --git a/native/cocos/platform/empty/modules/SystemWindow.cpp b/native/cocos/platform/empty/modules/SystemWindow.cpp index 5c1c1dc8ea..7a1bc567df 100644 --- a/native/cocos/platform/empty/modules/SystemWindow.cpp +++ b/native/cocos/platform/empty/modules/SystemWindow.cpp @@ -39,7 +39,7 @@ namespace { } // namespace namespace cc { -SystemWindow::SystemWindow() { +SystemWindow::SystemWindow(IEventDispatch* delegate) { } SystemWindow::~SystemWindow() { @@ -56,8 +56,20 @@ void SystemWindow::copyTextToClipboard(const std::string &text) { //TODO } +int SystemWindow::init() { + return 0; +} + +void SystemWindow::pollEvent(bool* quit) { + return; +} + +void SystemWindow::swapWindow() { + return; +} + SystemWindow::Size SystemWindow::getViewSize() const { return Size{static_cast(_width), static_cast(_height)}; } -} // namespace cc \ No newline at end of file +} // namespace cc diff --git a/native/cocos/platform/empty/modules/SystemWindow.h b/native/cocos/platform/empty/modules/SystemWindow.h index 36b50e71a5..b86a4441a0 100644 --- a/native/cocos/platform/empty/modules/SystemWindow.h +++ b/native/cocos/platform/empty/modules/SystemWindow.h @@ -33,7 +33,7 @@ namespace cc { class CC_DLL SystemWindow : public ISystemWindow { public: - explicit SystemWindow(); + explicit SystemWindow(IEventDispatch* delegate); ~SystemWindow() override; uintptr_t getWindowHandler() const override; @@ -45,6 +45,10 @@ public: void setCursorEnabled(bool value) override; void copyTextToClipboard(const std::string& text) override; + int init(); + void pollEvent(bool* quit); + void swapWindow(); + private: int _width{0}; int _height{0}; diff --git a/native/cocos/platform/linux/LinuxPlatform.cpp b/native/cocos/platform/linux/LinuxPlatform.cpp index 246b031cb9..8d15ab5562 100644 --- a/native/cocos/platform/linux/LinuxPlatform.cpp +++ b/native/cocos/platform/linux/LinuxPlatform.cpp @@ -33,11 +33,17 @@ #include "modules/Accelerometer.h" #include "modules/Battery.h" #include "modules/Network.h" -#include "modules/Screen.h" #include "modules/System.h" -#include "modules/SystemWindow.h" #include "modules/Vibrator.h" +#if defined(CC_SERVER_MODE) + #include "platform/empty/modules/Screen.h" + #include "platform/empty/modules/SystemWindow.h" +#else + #include "modules/Screen.h" + #include "modules/SystemWindow.h" +#endif + namespace { } // namespace diff --git a/native/cocos/platform/mac/MacPlatform.mm b/native/cocos/platform/mac/MacPlatform.mm index 586208b7c1..1d54c272b3 100644 --- a/native/cocos/platform/mac/MacPlatform.mm +++ b/native/cocos/platform/mac/MacPlatform.mm @@ -30,11 +30,17 @@ #include "modules/Accelerometer.h" #include "modules/Battery.h" #include "modules/Network.h" -#include "modules/Screen.h" #include "modules/System.h" -#include "modules/SystemWindow.h" #include "modules/Vibrator.h" +#if defined(CC_SERVER_MODE) + #include "platform/empty/modules/Screen.h" + #include "platform/empty/modules/SystemWindow.h" +#else + #include "modules/Screen.h" + #include "modules/SystemWindow.h" +#endif + #import extern int cocos_main(int argc, const char** argv); diff --git a/native/cocos/platform/win32/WindowsPlatform.cpp b/native/cocos/platform/win32/WindowsPlatform.cpp index 4ffda82553..27ce9cbaf6 100644 --- a/native/cocos/platform/win32/WindowsPlatform.cpp +++ b/native/cocos/platform/win32/WindowsPlatform.cpp @@ -32,9 +32,14 @@ #include "modules/Accelerometer.h" #include "modules/Battery.h" #include "modules/Network.h" -#include "modules/Screen.h" #include "modules/System.h" -#include "modules/SystemWindow.h" +#if defined(CC_SERVER_MODE) + #include "platform/empty/modules/Screen.h" + #include "platform/empty/modules/SystemWindow.h" +#else + #include "modules/Screen.h" + #include "modules/SystemWindow.h" +#endif #include "modules/Vibrator.h" namespace { diff --git a/native/cocos/renderer/GFXDeviceManager.h b/native/cocos/renderer/GFXDeviceManager.h index 8f2083d077..fdad07b981 100644 --- a/native/cocos/renderer/GFXDeviceManager.h +++ b/native/cocos/renderer/GFXDeviceManager.h @@ -122,9 +122,11 @@ private: device = CC_NEW(gfx::DeviceAgent(device)); } +#if !defined(CC_SERVER_MODE) if (CC_DEBUG > 0 && !FORCE_DISABLE_VALIDATION || FORCE_ENABLE_VALIDATION) { device = CC_NEW(gfx::DeviceValidator(device)); } +#endif if (!device->initialize(info)) { CC_SAFE_DELETE(device); diff --git a/native/cocos/renderer/gfx-base/GFXSwapchain.cpp b/native/cocos/renderer/gfx-base/GFXSwapchain.cpp index 191ac3d118..fd8a5e9d5e 100644 --- a/native/cocos/renderer/gfx-base/GFXSwapchain.cpp +++ b/native/cocos/renderer/gfx-base/GFXSwapchain.cpp @@ -37,7 +37,9 @@ Swapchain::Swapchain() Swapchain::~Swapchain() = default; void Swapchain::initialize(const SwapchainInfo &info) { +#if !defined(CC_SERVER_MODE) CCASSERT(info.windowHandle, "Invalid window handle"); +#endif _windowHandle = info.windowHandle; _vsyncMode = info.vsyncMode; diff --git a/native/cocos/renderer/gfx-empty/EmptyDevice.cpp b/native/cocos/renderer/gfx-empty/EmptyDevice.cpp index 7b9b4b67ba..2dd71f0170 100644 --- a/native/cocos/renderer/gfx-empty/EmptyDevice.cpp +++ b/native/cocos/renderer/gfx-empty/EmptyDevice.cpp @@ -73,7 +73,6 @@ bool EmptyDevice::doInit(const DeviceInfo & /*info*/) { _formatFeatures.fill(static_cast(-1)); // allow all usages for all formats _formatFeatures[toNumber(Format::UNKNOWN)] = FormatFeature::NONE; - _formatFeatures[toNumber(Format::COUNT)] = FormatFeature::NONE; CC_LOG_INFO("Empty device initialized."); diff --git a/native/templates/windows/main.cpp b/native/templates/windows/main.cpp index f16fa21df3..8b6dd66cbd 100644 --- a/native/templates/windows/main.cpp +++ b/native/templates/windows/main.cpp @@ -26,8 +26,17 @@ #include #include "platform/BasePlatform.h" + +#if defined(CC_SERVER_MODE) +#include +int WINAPI +WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) { + START_PLATFORM(0, nullptr); +} +#else #include "sdl2/SDL_main.h" int SDL_main(int argc, char** argv) { START_PLATFORM(argc, (const char**)argv); -} \ No newline at end of file +} +#endif \ No newline at end of file From f17ab5d950e2f28af0719b0a674bfe97ce1e7d87 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Wed, 25 May 2022 18:43:25 +0800 Subject: [PATCH 2/2] cherry-pick ds branch (#11219) * uniquify uuid of comp and node in prefab * support component add/remove event * use option to control id serialization --- cocos/core/scene-graph/base-node.ts | 2 + cocos/core/scene-graph/node-event.ts | 16 +++++++ cocos/core/scene-graph/node.ts | 3 ++ cocos/core/utils/prefab/utils.ts | 15 +++++++ tests/core/node.test.ts | 63 +++++++++++++++++++++++++++- 5 files changed, 98 insertions(+), 1 deletion(-) diff --git a/cocos/core/scene-graph/base-node.ts b/cocos/core/scene-graph/base-node.ts index e9b5659fb7..9aede9f349 100644 --- a/cocos/core/scene-graph/base-node.ts +++ b/cocos/core/scene-graph/base-node.ts @@ -996,6 +996,7 @@ export class BaseNode extends CCObject implements ISchedulable { EditorExtends.Component.add(component._id, component); } } + this.emit(NodeEventType.COMPONENT_ADDED, component); if (this._activeInHierarchy) { legacyCC.director._nodeActivator.activateComp(component); } @@ -1249,6 +1250,7 @@ export class BaseNode extends CCObject implements ISchedulable { if (EDITOR && EditorExtends.Component) { EditorExtends.Component.remove(component._id); } + this.emit(NodeEventType.COMPONENT_REMOVED, component); } else if (component.node !== (this as unknown as BaseNode)) { errorID(3815); } diff --git a/cocos/core/scene-graph/node-event.ts b/cocos/core/scene-graph/node-event.ts index dd08cd665c..e8fb6ef8d3 100644 --- a/cocos/core/scene-graph/node-event.ts +++ b/cocos/core/scene-graph/node-event.ts @@ -222,4 +222,20 @@ export enum NodeEventType { * 注意:此节点激活时,此事件仅从最顶部的节点发出。 */ ACTIVE_IN_HIERARCHY_CHANGED = 'active-in-hierarchy-changed', + + /** + * @en + * The event occur when node add a new component. + * @zh + * 当节点上增加组件时触发的事件 + */ + COMPONENT_ADDED = 'component-added', + + /** + * @en + * The event occur when node remove a component. + * @zh + * 当节点上移除组件时触发的事件 + */ + COMPONENT_REMOVED = 'component-removed', } diff --git a/cocos/core/scene-graph/node.ts b/cocos/core/scene-graph/node.ts index e1ef808c1e..4cae0d9646 100644 --- a/cocos/core/scene-graph/node.ts +++ b/cocos/core/scene-graph/node.ts @@ -525,6 +525,9 @@ export class Node extends BaseNode implements CustomSerializable { serializationOutput.writeProperty('_objFlags', this._objFlags); serializationOutput.writeProperty('_parent', this._parent); serializationOutput.writeProperty('_prefab', this._prefab); + if (context.customArguments.keepNodeUuid) { + serializationOutput.writeProperty('_id', this._id); + } // TODO: editorExtrasTag may be a symbol in the future serializationOutput.writeProperty(editorExtrasTag, this[editorExtrasTag]); } else { diff --git a/cocos/core/utils/prefab/utils.ts b/cocos/core/utils/prefab/utils.ts index 3958ef6442..aa00280bdd 100644 --- a/cocos/core/utils/prefab/utils.ts +++ b/cocos/core/utils/prefab/utils.ts @@ -401,6 +401,7 @@ export function expandPrefabInstanceNode (node: Node, recursively = false) { const prefabInstance = prefabInfo?.instance; if (prefabInstance) { createNodeWithPrefab(node); + applyNodeAndComponentId(node, node.uuid); const targetMap: Record = {}; prefabInstance.targetMap = targetMap; @@ -431,3 +432,17 @@ export function expandNestedPrefabInstanceNode (node: BaseNode) { }); } } + +export function applyNodeAndComponentId (node: Node, rootId: string) { + const { components, children } = node; + for (let i = 0; i < components.length; i++) { + const comp = components[i]; + comp._id = `${rootId}${comp.__prefab?.fileId}`; + } + for (let i = 0; i < children.length; i++) { + const child = children[i]; + // @ts-expect-error private member access + child._id = `${rootId}${child._prefab?.fileId}`; + applyNodeAndComponentId(child, rootId); + } +} diff --git a/tests/core/node.test.ts b/tests/core/node.test.ts index f621fdf19a..95c02ea779 100644 --- a/tests/core/node.test.ts +++ b/tests/core/node.test.ts @@ -1,8 +1,9 @@ import { Node, Scene } from "../../cocos/core/scene-graph" import { Mat4, Quat, Vec3 } from "../../cocos/core/math" -import { director } from "../../cocos/core"; +import { Component, director, game } from "../../cocos/core"; import { NodeEventType } from "../../cocos/core/scene-graph/node-event"; import { NodeUIProperties } from "../../cocos/core/scene-graph/node-ui-properties"; +import { ccclass } from "../../cocos/core/data/decorators"; describe(`Node`, () => { @@ -145,4 +146,64 @@ describe(`Node`, () => { expect(node2.worldMatrix.equals(worldMat)).toBeFalsy(); expect(Mat4.determinant(node2.worldMatrix)).toBeCloseTo(0, 6); }); + + test('component event', () => { + let onLoadCalled = false; + let onDestroyCalled = false; + @ccclass('TestComponent') + class TestComponent extends Component { + onLoad () { + onLoadCalled = true; + } + + onDestroy () { + onDestroyCalled = true; + } + } + + const scene = new Scene(''); + director.runSceneImmediate(scene); + const node = new Node(); + let compParam; + const addCb = jest.fn((tempComp) => { compParam = tempComp; expect(onLoadCalled).toBeFalsy(); }); + const removeCb = jest.fn((tempComp) => { + compParam = tempComp; + if (onLoadCalled) { + expect(onDestroyCalled).toBeTruthy(); + } else { + expect(onDestroyCalled).toBeFalsy(); + } + }); + node.on(NodeEventType.COMPONENT_ADDED, addCb); + node.on(NodeEventType.COMPONENT_REMOVED, removeCb) + let comp = node.addComponent(TestComponent); + expect(addCb).toBeCalledTimes(1); + expect(comp).toBe(compParam); + expect(onLoadCalled).toBeFalsy(); + node.removeComponent(comp); + game.step(); + expect(removeCb).toBeCalledTimes(1); + expect(comp).toBe(compParam); + expect(onDestroyCalled).toBeFalsy(); + scene.addChild(node); + comp = node.addComponent(TestComponent); + expect(addCb).toBeCalledTimes(2); + expect(comp).toBe(compParam); + expect(onLoadCalled).toBeTruthy(); + comp.destroy(); + game.step(); + expect(removeCb).toBeCalledTimes(2); + expect(comp).toBe(compParam); + expect(onDestroyCalled).toBeTruthy(); + + onLoadCalled = onDestroyCalled = false; + comp = node.addComponent(TestComponent); + expect(addCb).toBeCalledTimes(3); + expect(comp).toBe(compParam); + expect(onLoadCalled).toBeTruthy(); + comp._destroyImmediate(); + expect(removeCb).toBeCalledTimes(3); + expect(comp).toBe(compParam); + expect(onDestroyCalled).toBeTruthy(); + }); });