From fee0b8fb7baf39c9af64e13bec1614fcd216e49a Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 27 Jun 2025 02:58:39 +0800 Subject: [PATCH] =?UTF-8?q?InputEvent=E7=9B=B8=E5=85=B3=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E3=80=81=E5=8F=98=E9=87=8F=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMCore | 2 +- CMPlatform | 2 +- example/common/VulkanAppFramework.h | 8 ++++---- inc/hgl/WorkManager.h | 4 ++-- src/SceneGraph/RenderFramework.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMCore b/CMCore index 71b459c0..9eabdaf1 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 71b459c0246d70d0bba5dd49662b5534c579251e +Subproject commit 9eabdaf1d1bca692b2b0c9755d7661274493a0c8 diff --git a/CMPlatform b/CMPlatform index f0ff2142..b283cb4b 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit f0ff214289a1265898feecbdbbd2ddf50bff5dca +Subproject commit b283cb4befdf4835b5aec5803e288cc209c9da2c diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index b5ab7a07..d5df2a49 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -88,7 +88,7 @@ public: { CloseShaderCompiler(); - win->Unjoin(this); + win->UnregistryEventDispatch(this); SAFE_CLEAR(db); SAFE_CLEAR_OBJECT_ARRAY_OBJECT(cmd_buf,swap_chain_count); @@ -154,7 +154,7 @@ public: InitCommandBuffer(); - win->Join(this); + win->RegistryEventDispatch(this); { vp_info.Set(w,h); @@ -403,8 +403,8 @@ public: ckc=new CameraKeyboardControl(camera_control); cmc=new CameraMouseControl(camera_control); - win->Join(ckc); - win->Join(cmc); + win->RegistryEventDispatch(ckc); + win->RegistryEventDispatch(cmc); RefreshCameraInfo(camera_control->GetCameraInfo(),&vp_info,camera); diff --git a/inc/hgl/WorkManager.h b/inc/hgl/WorkManager.h index d2782408..eb6d1f7e 100644 --- a/inc/hgl/WorkManager.h +++ b/inc/hgl/WorkManager.h @@ -29,12 +29,12 @@ namespace hgl { render_framework=rf; - rf->Join(this); + rf->RegistryEventDispatch(this); } virtual ~WorkManager() { - render_framework->Unjoin(this); + render_framework->UnregistryEventDispatch(this); SAFE_CLEAR(cur_work_object); } diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index d090763a..09adac45 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -111,7 +111,7 @@ bool RenderFramework::Init(uint w,uint h) if(!device) return(false); - win->Join(this); + win->RegistryEventDispatch(this); module_manager=new GraphModuleManager(this); @@ -160,8 +160,8 @@ void RenderFramework::CreateDefaultRenderer() auto ckc=new CameraKeyboardControl(fpcc); auto cmc=new CameraMouseControl(fpcc); - this->Join(ckc); - this->Join(cmc); + this->RegistryEventDispatch(ckc); + this->RegistryEventDispatch(cmc); default_camera_control=fpcc;