From 205a30d291b071953908fb4192db1472d39e4acf Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Mon, 27 Apr 2026 18:45:31 +0800 Subject: [PATCH] editor: narrow core host contract surface --- docs/plan/editor-core-refactor-plan.md | 44 +++++++++++------ editor/AGENTS.md | 48 ++++++++++++++----- editor/CMakeLists.txt | 10 +++- editor/app/Bootstrap/Application.cpp | 2 +- editor/app/Composition/EditorShellRuntime.cpp | 6 +-- .../EditorUtilityWindowRegistry.cpp | 3 +- .../EditorUtilityWindowRegistry.h | 3 +- .../EditorUtilityWindowRuntime.h | 4 +- .../Windowing/EditorWindowGeometry.h} | 15 ------ .../app/Core/Windowing/EditorWindowMetrics.h | 7 +++ .../Windowing}/EditorWindowTransferRequests.h | 4 +- .../EditorWorkspacePanelRuntime.h | 6 +-- editor/app/Features/Project/ProjectPanel.cpp | 4 +- .../Features/Scene/SceneViewportFeature.cpp | 2 +- .../Scene/SceneViewportToolOverlay.cpp | 2 +- .../Features/Scene/SceneViewportToolOverlay.h | 2 +- .../Interfaces}/EditorWindowContentBindings.h | 0 .../Interfaces}/EditorWindowHostCoordinator.h | 4 +- .../Interfaces}/EditorWindowHostInterfaces.h | 12 ++--- .../Interfaces}/EditorWindowHostTypes.h | 2 +- .../Interfaces}/EditorWindowPointerCapture.h | 0 .../Interfaces}/EditorWindowRenderRuntime.h | 4 +- .../Host => Host/Interfaces}/HostFwd.h | 0 .../Interfaces}/SystemInteractionService.h | 0 .../Host => Host/Interfaces}/UiTextureHost.h | 0 .../Interfaces}/ViewportRenderHost.h | 0 .../Chrome/EditorWindowChromeController.cpp | 6 ++- .../Win32/System/Win32SystemInteractionHost.h | 2 +- .../Platform/Win32/Windowing/EditorWindow.cpp | 4 +- .../Platform/Win32/Windowing/EditorWindow.h | 2 +- .../Windowing/EditorWindowHostRuntime.cpp | 2 +- .../Win32/Windowing/EditorWindowHostRuntime.h | 4 +- .../EditorWindowMessageDispatcher.cpp | 4 +- .../Windowing/EditorWindowMessageDispatcher.h | 2 +- .../Windowing/EditorWindowPointerCapture.h | 2 +- .../Win32/Windowing/EditorWindowSession.h | 2 +- .../Win32/Windowing/EditorWindowState.h | 2 +- .../Win32/Windowing/EditorWindowSupport.h | 1 - editor/app/Rendering/Assets/BuiltInIcons.cpp | 2 +- editor/app/Rendering/Assets/BuiltInIcons.h | 2 +- .../D3D12/D3D12EditorWindowRenderRuntime.h | 2 +- .../app/Rendering/D3D12/D3D12UiTextureHost.h | 2 +- .../app/Rendering/D3D12/D3D12WindowRenderer.h | 2 +- .../Viewport/ViewportHostService.cpp | 2 +- .../Rendering/Viewport/ViewportHostService.h | 2 +- .../Viewport/ViewportRenderTargets.cpp | 2 +- .../Viewport/ViewportRenderTargets.h | 2 +- editor/app/Support/EmbeddedPngLoader.cpp | 2 +- editor/app/Support/EmbeddedPngLoader.h | 2 +- .../Content/EditorWindowContentController.cpp | 2 +- .../Content/EditorWindowContentController.h | 4 +- .../EditorUtilityWindowCoordinator.cpp | 2 +- .../EditorUtilityWindowCoordinator.h | 4 +- .../EditorWindowLifecycleCoordinator.h | 2 +- .../EditorWindowWorkspaceCoordinator.cpp | 2 +- .../EditorWindowWorkspaceCoordinator.h | 4 +- .../app/Windowing/EditorWindowDiagnostics.h | 11 +++++ editor/app/Windowing/EditorWindowInstance.cpp | 3 +- editor/app/Windowing/EditorWindowInstance.h | 2 +- editor/app/Windowing/EditorWindowManager.cpp | 2 +- editor/app/Windowing/EditorWindowManager.h | 6 +-- editor/app/Windowing/EditorWindowVisuals.h | 12 +++++ .../Frame/EditorWindowFrameOrchestrator.cpp | 4 +- .../Frame/EditorWindowFrameOrchestrator.h | 2 +- editor/app/Windowing/Host/EditorWindowTypes.h | 3 -- .../Runtime/EditorWindowRuntimeController.h | 2 +- 66 files changed, 183 insertions(+), 123 deletions(-) rename editor/app/{Windowing/EditorWindowShared.h => Core/Windowing/EditorWindowGeometry.h} (53%) create mode 100644 editor/app/Core/Windowing/EditorWindowMetrics.h rename editor/app/{Windowing/Frame => Core/Windowing}/EditorWindowTransferRequests.h (93%) rename editor/app/{Windowing/Host => Host/Interfaces}/EditorWindowContentBindings.h (100%) rename editor/app/{Windowing/Host => Host/Interfaces}/EditorWindowHostCoordinator.h (92%) rename editor/app/{Windowing/Host => Host/Interfaces}/EditorWindowHostInterfaces.h (96%) rename editor/app/{Windowing/Host => Host/Interfaces}/EditorWindowHostTypes.h (94%) rename editor/app/{Windowing/Host => Host/Interfaces}/EditorWindowPointerCapture.h (100%) rename editor/app/{Rendering/Host => Host/Interfaces}/EditorWindowRenderRuntime.h (97%) rename editor/app/{Rendering/Host => Host/Interfaces}/HostFwd.h (100%) rename editor/app/{System => Host/Interfaces}/SystemInteractionService.h (100%) rename editor/app/{Rendering/Host => Host/Interfaces}/UiTextureHost.h (100%) rename editor/app/{Rendering/Host => Host/Interfaces}/ViewportRenderHost.h (100%) create mode 100644 editor/app/Windowing/EditorWindowDiagnostics.h create mode 100644 editor/app/Windowing/EditorWindowVisuals.h delete mode 100644 editor/app/Windowing/Host/EditorWindowTypes.h diff --git a/docs/plan/editor-core-refactor-plan.md b/docs/plan/editor-core-refactor-plan.md index 36e03c8a..62ef10c2 100644 --- a/docs/plan/editor-core-refactor-plan.md +++ b/docs/plan/editor-core-refactor-plan.md @@ -36,13 +36,13 @@ The reusable layer is mostly healthy: The app layer has a good directory vocabulary but enforcement is still incomplete: -- `XCEditorCore` exists, but its include surface still exposes the whole - `editor/app` root to app code. -- Feature panels no longer use `Composition/EditorContext.h` directly, but the - app include surface still needs to be narrowed before this boundary is - build-enforced. -- The direct Win32/D3D12 render-surface cross-include has been cut; broader - host include-surface cleanup remains. +- `XCEditorCore` now limits its public app include surface to + `editor/app/Core`, `editor/app/Commands`, `editor/app/State`, and + `editor/app/Host`, but the app still carries internal include-path residue + and has not yet converged on the final directory names. +- Feature panels no longer use `Composition/EditorContext.h` directly, but + app-core tests still need to be restored before the boundary is exercised + outside the executable host. - App-side tests exist but are not consistently wired into CMake; some are stale and reference removed headers. @@ -67,11 +67,21 @@ Completed boundary cuts: - Win32 now hands render startup a neutral `Rendering::Host::EditorWindowRenderRuntimeSurface` value, and D3D12 no longer includes `Platform/Win32/**` editor surface headers to obtain `HWND`. +- Neutral host-facing contracts now live under + `editor/app/Host/Interfaces`, including editor window host interfaces, + render-runtime contracts, texture/viewport host contracts, pointer-capture + contracts, and system interaction service interfaces. +- Shared window screen geometry, chrome metrics, and frame transfer requests + now live under `editor/app/Core/Windowing`, and + `XCEditorCore` no longer exports the whole `editor/app` root as a public + include directory. The root issue is not the existence of a single executable target by itself. -The root issue is that shared app contracts are stored inside concrete layer -directories, and CMake exposes the whole `editor/app` include root to all app -code. That makes the directory map advisory rather than enforceable. +The root issue was that shared app contracts were stored inside concrete layer +directories, and CMake exposed the whole `editor/app` include root through +`XCEditorCore` usage requirements. The public include surface has now been +narrowed; remaining work is to remove internal source compatibility with the +private app root and finish wiring app-core tests against the narrowed surface. ## Target Directory Shape @@ -381,16 +391,22 @@ app/Host/D3D12/ Then replace concrete Win32/D3D12 cross-includes with a neutral surface or factory contract. -Completed first cut: +Completed cuts: - The old `Win32EditorWindowRenderRuntimeSurface` concrete adapter was removed. - `EditorWindowRenderRuntimeSurface` is now a value contract in - `Rendering/Host/EditorWindowRenderRuntime.h`. + `Host/Interfaces/EditorWindowRenderRuntime.h`. - Win32 fills that neutral contract during native surface capture; D3D12 reads the native handle from the contract instead of including a Win32 editor windowing header. -- Remaining work in this phase is to move/rename host interface directories - and continue narrowing CMake include surfaces. +- Neutral host-facing contracts now live under `app/Host/Interfaces/`. +- `EditorWindowTransferRequests`, window screen geometry, and title-bar chrome + metrics now live under `app/Core/Windowing/`. +- `XCEditorCore` now keeps `editor/app` as a private implementation include + root while exposing only `app/Core`, `app/Commands`, `app/State`, and + `app/Host` through its public usage requirements. +- Remaining work in this phase is to continue converging concrete host code on + the `app/Host/Win32` and `app/Host/D3D12` directory shape. ## Phase 6: Documentation Update diff --git a/editor/AGENTS.md b/editor/AGENTS.md index ae519ce6..59d7b445 100644 --- a/editor/AGENTS.md +++ b/editor/AGENTS.md @@ -20,6 +20,9 @@ change. should be buildable without the concrete Win32/D3D12 executable host: composition, commands, state, project and scene services, feature panels, utility-window descriptors, viewport services, and editor window core. +- `XCEditorCore` does not publish the whole `editor/app` root as a usage + include directory. Its public app include surface is limited to shared + contracts under `app/Core`, `app/Commands`, `app/State`, and `app/Host`. - `XCEditor` is built when `XCENGINE_BUILD_XCUI_EDITOR_APP=ON`; that mode requires `XCENGINE_ENABLE_RENDERING_EDITOR_SUPPORT=ON`. The executable target is named `XCEditor`, but its output name is `XCEngine`. @@ -43,18 +46,21 @@ change. `Application`. - `app/Core/` contains app-level contracts and shared app model definitions that are not owned by a concrete feature or composition implementation. - Current examples are panel IDs, shared window type contracts, the - panel-facing service view, workspace-panel runtime interface, and - utility-window runtime/descriptors. + Current examples are panel IDs, shared window type contracts, host window + geometry/metrics, frame transfer requests, the panel-facing service view, + workspace-panel runtime interface, and utility-window runtime/descriptors. +- `app/Host/Interfaces/` contains neutral host-facing contracts used across + editor core and executable host code: editor window host interfaces, + render-runtime factories, UI texture hosts, viewport render hosts, and system + interaction services. - `app/Composition/` builds the editor shell asset, coordinates shell update phases, and connects app state to hosted panel runtimes. -- `app/Windowing/` owns window instances, content controllers, frame transfer - requests, lifecycle, workspace synchronization, and utility-window creation. +- `app/Windowing/` owns window instances, content controllers, lifecycle, + workspace synchronization, and utility-window creation. - `app/Platform/Win32/` owns `HWND`, message dispatch, native pointer capture, borderless chrome, DPI, placement, and Win32 system integration. -- `app/Rendering/` owns editor-window rendering hosts, D3D12 UI rendering, - built-in icons, viewport render targets, object picking, and scene viewport - passes. +- `app/Rendering/` owns built-in icons, viewport render targets, object + picking, scene viewport passes, and concrete D3D12 UI/rendering hosts. - `app/Features/` contains user-facing panels and editor tools: Hierarchy, Scene viewport, Inspector, Project, Console, Color Picker, and component UI. - `app/Features/EditorWorkspacePanelRegistry.*` is the concrete workspace @@ -78,6 +84,10 @@ change. must not include `app/**`, Win32, D3D12, or feature-panel headers. - Keep platform specifics in `app/Platform/Win32`; keep GPU-window specifics in `app/Rendering/D3D12`. +- Keep neutral host/render/system contracts in `app/Host/Interfaces` or + shared value contracts in `app/Core`. Do not add new public app contracts + under concrete `app/Windowing`, `app/Rendering`, `app/Platform`, or + `app/System` paths. - Keep shell composition and widget logic data-driven. The reusable layer should emit frames, layouts, draw data, command results, and transfer requests; the app decides how those requests affect native windows and engine services. @@ -162,6 +172,8 @@ change. Frame transfer requests are the app boundary for work that cannot be committed inside pure shell/widget code. +- The request contracts live in + `app/Core/Windowing/EditorWindowTransferRequests.h`. - `EditorWindowFrameOrchestrator` converts shell results into `EditorWindowFrameTransferRequests`. - Workspace requests currently include `beginGlobalTabDrag` and `detachPanel`. @@ -287,6 +299,10 @@ inside pure shell/widget code. - `XCEditorCore` is the app/product-core target. It exists to make the app boundary build-visible before finer-grained directories are cleaned up. +- `XCEditorCore` keeps `editor/app` as a private implementation include root + for current source compatibility, but its public usage requirements expose + only `app/Core`, `app/Commands`, `app/State`, `app/Host`, `include`, and + engine headers. - `XCEditor` is the thin executable host that wires `XCEditorCore` to concrete Win32 and D3D12 implementations. Do not move concrete platform/render host code into `XCEditorCore` without first introducing neutral host contracts. @@ -344,7 +360,9 @@ inside pure shell/widget code. - `editor/include/XCEditor/Workspace/UIEditorWindowWorkspaceController.h` - `editor/src/Workspace/UIEditorWindowWorkspaceController.cpp` - `editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp` -- `editor/app/Rendering/Host/EditorWindowRenderRuntime.h` +- `editor/app/Host/Interfaces/EditorWindowRenderRuntime.h` +- `editor/app/Host/Interfaces/EditorWindowHostInterfaces.h` +- `editor/app/Core/Windowing/EditorWindowTransferRequests.h` - `editor/app/Rendering/Viewport/ViewportHostService.h` - `tests/UI/Editor/unit/CMakeLists.txt` - `tests/UI/Editor/smoke/CMakeLists.txt` @@ -372,10 +390,9 @@ ownership rule. is owned by `app/Features/EditorUtilityWindowRegistry.*` and injected from `Application`, so `app/Windowing/**` no longer constructs concrete utility feature panels. -- Shared window category, lifecycle, chrome-policy, and native-host-policy - contracts now live under `app/Core/Windowing`; the old - `app/Windowing/Host/EditorWindowTypes.h` path is only a compatibility - forwarding header. +- Shared window category, lifecycle, chrome-policy, native-host-policy, + screen geometry, chrome metrics, and frame-transfer request contracts now + live under `app/Core/Windowing`. - Viewport rendering is routed through `ViewportHostService` and the per-window render runtime rather than directly from shell composition. - The old fine-grained app-split target residue was removed from CMake and @@ -401,3 +418,8 @@ ownership rule. now captures native render startup data into the neutral `Rendering::Host::EditorWindowRenderRuntimeSurface` value contract, so D3D12 no longer includes concrete `app/Platform/Win32/**` editor surface headers. +- Neutral host-facing contracts moved under `app/Host/Interfaces`, including + editor window host interfaces, render runtime contracts, UI texture/viewport + host contracts, pointer-capture contracts, and system interaction service. + `XCEditorCore` no longer publishes the entire `editor/app` root through its + public CMake include surface. diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index c4fdbf75..06497bf6 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -316,11 +316,17 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ${XCUI_EDITOR_CORE_SOURCES} ) - target_include_directories(XCEditorCore PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/app + target_include_directories(XCEditorCore + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/app/Core + ${CMAKE_CURRENT_SOURCE_DIR}/app/Commands + ${CMAKE_CURRENT_SOURCE_DIR}/app/State + ${CMAKE_CURRENT_SOURCE_DIR}/app/Host ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/engine/include ${CMAKE_SOURCE_DIR}/engine/third_party/stb + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/app ) target_compile_definitions(XCEditorCore PUBLIC diff --git a/editor/app/Bootstrap/Application.cpp b/editor/app/Bootstrap/Application.cpp index 889f13b7..651a4a69 100644 --- a/editor/app/Bootstrap/Application.cpp +++ b/editor/app/Bootstrap/Application.cpp @@ -1,6 +1,6 @@ #include "Bootstrap/Application.h" #include "Bootstrap/EditorResources.h" -#include "System/SystemInteractionService.h" +#include "Host/Interfaces/SystemInteractionService.h" #include "Composition/EditorContext.h" #include "Features/EditorUtilityWindowRegistry.h" #include "Features/EditorWorkspacePanelRegistry.h" diff --git a/editor/app/Composition/EditorShellRuntime.cpp b/editor/app/Composition/EditorShellRuntime.cpp index c596e987..a0739b8c 100644 --- a/editor/app/Composition/EditorShellRuntime.cpp +++ b/editor/app/Composition/EditorShellRuntime.cpp @@ -1,6 +1,6 @@ -#include "Composition/EditorShellRuntime.h" -#include "Rendering/Host/UiTextureHost.h" -#include "Rendering/Host/ViewportRenderHost.h" +#include "Composition/EditorShellRuntime.h" +#include "Host/Interfaces/UiTextureHost.h" +#include "Host/Interfaces/ViewportRenderHost.h" #include "Composition/EditorContext.h" #include #include diff --git a/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.cpp b/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.cpp index fc9e9b53..79b76636 100644 --- a/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.cpp +++ b/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.cpp @@ -1,4 +1,4 @@ -#include "Core/UtilityWindows/EditorUtilityWindowRegistry.h" +#include "UtilityWindows/EditorUtilityWindowRegistry.h" namespace XCEngine::UI::Editor::App { @@ -53,4 +53,3 @@ const EditorUtilityWindowDescriptor* ResolveEditorUtilityWindowDescriptor( } } // namespace XCEngine::UI::Editor::App - diff --git a/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.h b/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.h index e55a3d55..43778bda 100644 --- a/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.h +++ b/editor/app/Core/UtilityWindows/EditorUtilityWindowRegistry.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" namespace XCEngine::UI::Editor::App { @@ -8,4 +8,3 @@ const EditorUtilityWindowDescriptor* ResolveEditorUtilityWindowDescriptor( EditorUtilityWindowKind kind); } // namespace XCEngine::UI::Editor::App - diff --git a/editor/app/Core/UtilityWindows/EditorUtilityWindowRuntime.h b/editor/app/Core/UtilityWindows/EditorUtilityWindowRuntime.h index d8672864..dc39a991 100644 --- a/editor/app/Core/UtilityWindows/EditorUtilityWindowRuntime.h +++ b/editor/app/Core/UtilityWindows/EditorUtilityWindowRuntime.h @@ -1,7 +1,7 @@ #pragma once -#include "Core/Panels/EditorPanelServices.h" -#include "Core/Windowing/EditorWindowTypes.h" +#include "Panels/EditorPanelServices.h" +#include "Windowing/EditorWindowTypes.h" #include #include diff --git a/editor/app/Windowing/EditorWindowShared.h b/editor/app/Core/Windowing/EditorWindowGeometry.h similarity index 53% rename from editor/app/Windowing/EditorWindowShared.h rename to editor/app/Core/Windowing/EditorWindowGeometry.h index 627f1a4e..904d0cce 100644 --- a/editor/app/Windowing/EditorWindowShared.h +++ b/editor/app/Core/Windowing/EditorWindowGeometry.h @@ -1,9 +1,5 @@ #pragma once -#include "Support/EnvironmentFlags.h" - -#include - #include namespace XCEngine::UI::Editor::App { @@ -33,15 +29,4 @@ struct EditorWindowScreenRect { } }; -inline constexpr float kBorderlessTitleBarHeightDips = 28.0f; - -inline const ::XCEngine::UI::UIColor kShellSurfaceColor(0.10f, 0.10f, 0.10f, 1.0f); -inline const ::XCEngine::UI::UIColor kShellBorderColor(0.15f, 0.15f, 0.15f, 1.0f); -inline const ::XCEngine::UI::UIColor kShellTextColor(0.92f, 0.92f, 0.92f, 1.0f); -inline const ::XCEngine::UI::UIColor kShellMutedTextColor(0.70f, 0.70f, 0.70f, 1.0f); - -inline bool IsEditorWindowVerboseRuntimeTraceEnabled() { - return IsEnvironmentFlagEnabled("XCUIEDITOR_VERBOSE_TRACE"); -} - } // namespace XCEngine::UI::Editor::App diff --git a/editor/app/Core/Windowing/EditorWindowMetrics.h b/editor/app/Core/Windowing/EditorWindowMetrics.h new file mode 100644 index 00000000..8424727e --- /dev/null +++ b/editor/app/Core/Windowing/EditorWindowMetrics.h @@ -0,0 +1,7 @@ +#pragma once + +namespace XCEngine::UI::Editor::App { + +inline constexpr float kBorderlessTitleBarHeightDips = 28.0f; + +} // namespace XCEngine::UI::Editor::App diff --git a/editor/app/Windowing/Frame/EditorWindowTransferRequests.h b/editor/app/Core/Windowing/EditorWindowTransferRequests.h similarity index 93% rename from editor/app/Windowing/Frame/EditorWindowTransferRequests.h rename to editor/app/Core/Windowing/EditorWindowTransferRequests.h index 9e550603..4bed0e49 100644 --- a/editor/app/Windowing/Frame/EditorWindowTransferRequests.h +++ b/editor/app/Core/Windowing/EditorWindowTransferRequests.h @@ -4,8 +4,8 @@ #define NOMINMAX #endif -#include "Windowing/EditorWindowShared.h" -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "EditorWindowGeometry.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" #include #include diff --git a/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h b/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h index 08b321dd..0a410d10 100644 --- a/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h +++ b/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h @@ -1,8 +1,8 @@ #pragma once -#include "Commands/EditorEditCommandRoute.h" -#include "Core/Panels/EditorPanelServices.h" -#include "State/EditorSession.h" +#include "EditorEditCommandRoute.h" +#include "EditorSession.h" +#include "Panels/EditorPanelServices.h" #include #include diff --git a/editor/app/Features/Project/ProjectPanel.cpp b/editor/app/Features/Project/ProjectPanel.cpp index 2f473cea..a6256fc8 100644 --- a/editor/app/Features/Project/ProjectPanel.cpp +++ b/editor/app/Features/Project/ProjectPanel.cpp @@ -1,4 +1,4 @@ -#include "ProjectPanel.h" +#include "ProjectPanel.h" #include "Rendering/Assets/BuiltInIcons.h" #include #include @@ -6,7 +6,7 @@ #include #include #include -#include "System/SystemInteractionService.h" +#include "Host/Interfaces/SystemInteractionService.h" #include "Services/Project/EditorProjectRuntime.h" #include "State/EditorCommandFocusService.h" #include diff --git a/editor/app/Features/Scene/SceneViewportFeature.cpp b/editor/app/Features/Scene/SceneViewportFeature.cpp index 37a58354..e3f47648 100644 --- a/editor/app/Features/Scene/SceneViewportFeature.cpp +++ b/editor/app/Features/Scene/SceneViewportFeature.cpp @@ -1,7 +1,7 @@ #include "Features/Scene/SceneViewportFeature.h" #include "Core/Panels/EditorPanelIds.h" -#include "Rendering/Host/UiTextureHost.h" +#include "Host/Interfaces/UiTextureHost.h" #include "Rendering/Viewport/ViewportHostService.h" #include "Scene/EditorSceneRuntime.h" #include "State/EditorCommandFocusService.h" diff --git a/editor/app/Features/Scene/SceneViewportToolOverlay.cpp b/editor/app/Features/Scene/SceneViewportToolOverlay.cpp index 3efe9b53..5a630e71 100644 --- a/editor/app/Features/Scene/SceneViewportToolOverlay.cpp +++ b/editor/app/Features/Scene/SceneViewportToolOverlay.cpp @@ -1,6 +1,6 @@ #include "Features/Scene/SceneViewportToolOverlay.h" -#include "Rendering/Host/UiTextureHost.h" +#include "Host/Interfaces/UiTextureHost.h" #include diff --git a/editor/app/Features/Scene/SceneViewportToolOverlay.h b/editor/app/Features/Scene/SceneViewportToolOverlay.h index b6445d05..bd710c53 100644 --- a/editor/app/Features/Scene/SceneViewportToolOverlay.h +++ b/editor/app/Features/Scene/SceneViewportToolOverlay.h @@ -1,7 +1,7 @@ #pragma once #include "Scene/SceneToolState.h" -#include "Rendering/Host/HostFwd.h" +#include "Host/Interfaces/HostFwd.h" #include #include diff --git a/editor/app/Windowing/Host/EditorWindowContentBindings.h b/editor/app/Host/Interfaces/EditorWindowContentBindings.h similarity index 100% rename from editor/app/Windowing/Host/EditorWindowContentBindings.h rename to editor/app/Host/Interfaces/EditorWindowContentBindings.h diff --git a/editor/app/Windowing/Host/EditorWindowHostCoordinator.h b/editor/app/Host/Interfaces/EditorWindowHostCoordinator.h similarity index 92% rename from editor/app/Windowing/Host/EditorWindowHostCoordinator.h rename to editor/app/Host/Interfaces/EditorWindowHostCoordinator.h index 78139a5b..c94ee79f 100644 --- a/editor/app/Windowing/Host/EditorWindowHostCoordinator.h +++ b/editor/app/Host/Interfaces/EditorWindowHostCoordinator.h @@ -1,7 +1,7 @@ #pragma once -#include "Windowing/Frame/EditorWindowTransferRequests.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "EditorWindowHostInterfaces.h" +#include "Windowing/EditorWindowTransferRequests.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Windowing/Host/EditorWindowHostInterfaces.h b/editor/app/Host/Interfaces/EditorWindowHostInterfaces.h similarity index 96% rename from editor/app/Windowing/Host/EditorWindowHostInterfaces.h rename to editor/app/Host/Interfaces/EditorWindowHostInterfaces.h index 2adf512d..6892e552 100644 --- a/editor/app/Windowing/Host/EditorWindowHostInterfaces.h +++ b/editor/app/Host/Interfaces/EditorWindowHostInterfaces.h @@ -1,11 +1,11 @@ #pragma once -#include "Rendering/Host/EditorWindowRenderRuntime.h" -#include "Windowing/EditorWindowShared.h" -#include "Windowing/Frame/EditorWindowTransferRequests.h" -#include "Windowing/Host/EditorWindowHostTypes.h" -#include "Windowing/Host/EditorWindowPointerCapture.h" -#include "Windowing/Host/EditorWindowTypes.h" +#include "EditorWindowHostTypes.h" +#include "EditorWindowPointerCapture.h" +#include "EditorWindowRenderRuntime.h" +#include "Windowing/EditorWindowGeometry.h" +#include "Windowing/EditorWindowTransferRequests.h" +#include "Windowing/EditorWindowTypes.h" #include #include diff --git a/editor/app/Windowing/Host/EditorWindowHostTypes.h b/editor/app/Host/Interfaces/EditorWindowHostTypes.h similarity index 94% rename from editor/app/Windowing/Host/EditorWindowHostTypes.h rename to editor/app/Host/Interfaces/EditorWindowHostTypes.h index 776f7e1f..95a0e119 100644 --- a/editor/app/Windowing/Host/EditorWindowHostTypes.h +++ b/editor/app/Host/Interfaces/EditorWindowHostTypes.h @@ -1,6 +1,6 @@ #pragma once -#include "Windowing/Host/EditorWindowTypes.h" +#include "Windowing/EditorWindowTypes.h" #include #include diff --git a/editor/app/Windowing/Host/EditorWindowPointerCapture.h b/editor/app/Host/Interfaces/EditorWindowPointerCapture.h similarity index 100% rename from editor/app/Windowing/Host/EditorWindowPointerCapture.h rename to editor/app/Host/Interfaces/EditorWindowPointerCapture.h diff --git a/editor/app/Rendering/Host/EditorWindowRenderRuntime.h b/editor/app/Host/Interfaces/EditorWindowRenderRuntime.h similarity index 97% rename from editor/app/Rendering/Host/EditorWindowRenderRuntime.h rename to editor/app/Host/Interfaces/EditorWindowRenderRuntime.h index 197a47fb..b7db53ae 100644 --- a/editor/app/Rendering/Host/EditorWindowRenderRuntime.h +++ b/editor/app/Host/Interfaces/EditorWindowRenderRuntime.h @@ -1,7 +1,7 @@ #pragma once -#include "Rendering/Host/UiTextureHost.h" -#include "Rendering/Host/ViewportRenderHost.h" +#include "UiTextureHost.h" +#include "ViewportRenderHost.h" #include #include diff --git a/editor/app/Rendering/Host/HostFwd.h b/editor/app/Host/Interfaces/HostFwd.h similarity index 100% rename from editor/app/Rendering/Host/HostFwd.h rename to editor/app/Host/Interfaces/HostFwd.h diff --git a/editor/app/System/SystemInteractionService.h b/editor/app/Host/Interfaces/SystemInteractionService.h similarity index 100% rename from editor/app/System/SystemInteractionService.h rename to editor/app/Host/Interfaces/SystemInteractionService.h diff --git a/editor/app/Rendering/Host/UiTextureHost.h b/editor/app/Host/Interfaces/UiTextureHost.h similarity index 100% rename from editor/app/Rendering/Host/UiTextureHost.h rename to editor/app/Host/Interfaces/UiTextureHost.h diff --git a/editor/app/Rendering/Host/ViewportRenderHost.h b/editor/app/Host/Interfaces/ViewportRenderHost.h similarity index 100% rename from editor/app/Rendering/Host/ViewportRenderHost.h rename to editor/app/Host/Interfaces/ViewportRenderHost.h diff --git a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp index 76744e6f..9521b4e9 100644 --- a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp +++ b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp @@ -2,8 +2,10 @@ #include "Platform/Win32/Windowing/EditorWindow.h" #include "Platform/Win32/Windowing/EditorWindowSupport.h" -#include "Windowing/Host/EditorWindowContentBindings.h" -#include "Windowing/Host/EditorWindowHostCoordinator.h" +#include "Core/Windowing/EditorWindowMetrics.h" +#include "Host/Interfaces/EditorWindowContentBindings.h" +#include "Host/Interfaces/EditorWindowHostCoordinator.h" +#include "Windowing/EditorWindowVisuals.h" #include #include diff --git a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h index 1f2e9133..a1328204 100644 --- a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h +++ b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h @@ -1,6 +1,6 @@ #pragma once -#include "System/SystemInteractionService.h" +#include "Host/Interfaces/SystemInteractionService.h" namespace XCEngine::UI::Editor::Host { diff --git a/editor/app/Platform/Win32/Windowing/EditorWindow.cpp b/editor/app/Platform/Win32/Windowing/EditorWindow.cpp index 3ac67d87..e42be0ed 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindow.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindow.cpp @@ -4,7 +4,9 @@ #include "Platform/Win32/Windowing/EditorWindowSession.h" #include "Platform/Win32/Windowing/EditorWindowSupport.h" #include "Platform/Win32/Runtime/EditorWindowInputController.h" -#include "Windowing/Host/EditorWindowContentBindings.h" +#include "Core/Windowing/EditorWindowMetrics.h" +#include "Host/Interfaces/EditorWindowContentBindings.h" +#include "Windowing/EditorWindowDiagnostics.h" #include #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindow.h b/editor/app/Platform/Win32/Windowing/EditorWindow.h index 7f1b98ce..04ca09b4 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindow.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindow.h @@ -5,7 +5,7 @@ #endif #include "Platform/Win32/Windowing/EditorWindowSession.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp index dbfb6662..7f7c9b3f 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp @@ -4,7 +4,7 @@ #include "Platform/Win32/Chrome/EditorWindowChromeController.h" #include "Platform/Win32/Windowing/EditorFloatingWindowPlacement.h" #include "Platform/Win32/Windowing/EditorWindow.h" -#include "Windowing/Host/EditorWindowHostCoordinator.h" +#include "Host/Interfaces/EditorWindowHostCoordinator.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h index 29bc2ac4..dac609b2 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h @@ -2,8 +2,8 @@ #include "Platform/Win32/Windowing/EditorWindow.h" #include "Platform/Win32/Windowing/EditorWindowHostConfig.h" -#include "Windowing/Host/EditorWindowHostCoordinator.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Host/Interfaces/EditorWindowHostCoordinator.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp index 027aacab..95f5cd18 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp @@ -5,8 +5,8 @@ #include "Platform/Win32/Runtime/EditorWindowInputController.h" #include "Platform/Win32/Windowing/EditorWindow.h" #include "Platform/Win32/Windowing/EditorWindowPointerCapture.h" -#include "Windowing/Host/EditorWindowContentBindings.h" -#include "Windowing/Host/EditorWindowHostCoordinator.h" +#include "Host/Interfaces/EditorWindowContentBindings.h" +#include "Host/Interfaces/EditorWindowHostCoordinator.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h index 49a90e6b..288d344c 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Windowing/Frame/EditorWindowTransferRequests.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h b/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h index 9649e2d2..0881e168 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h @@ -1,3 +1,3 @@ #pragma once -#include "Windowing/Host/EditorWindowPointerCapture.h" +#include "Host/Interfaces/EditorWindowPointerCapture.h" diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowSession.h b/editor/app/Platform/Win32/Windowing/EditorWindowSession.h index bfd73176..541c070d 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowSession.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowSession.h @@ -1,7 +1,7 @@ #pragma once #include "Platform/Win32/Windowing/EditorWindowState.h" -#include "Windowing/Frame/EditorWindowTransferRequests.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowState.h b/editor/app/Platform/Win32/Windowing/EditorWindowState.h index 05c7fa87..907dbf14 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowState.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowState.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Windowing/Host/EditorWindowTypes.h" +#include "Core/Windowing/EditorWindowTypes.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h b/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h index 37ee127f..db1f5a13 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h @@ -2,7 +2,6 @@ #include "Support/StringEncoding.h" #include "Support/TextFormat.h" -#include "Windowing/EditorWindowShared.h" #include diff --git a/editor/app/Rendering/Assets/BuiltInIcons.cpp b/editor/app/Rendering/Assets/BuiltInIcons.cpp index 5624e0c1..717f6244 100644 --- a/editor/app/Rendering/Assets/BuiltInIcons.cpp +++ b/editor/app/Rendering/Assets/BuiltInIcons.cpp @@ -1,7 +1,7 @@ #include "BuiltInIcons.h" #include "Bootstrap/EditorResources.h" -#include "Rendering/Host/UiTextureHost.h" +#include "Host/Interfaces/UiTextureHost.h" #include "Support/EmbeddedPngLoader.h" #include "Support/StringEncoding.h" diff --git a/editor/app/Rendering/Assets/BuiltInIcons.h b/editor/app/Rendering/Assets/BuiltInIcons.h index 39bf145f..3d33a2a1 100644 --- a/editor/app/Rendering/Assets/BuiltInIcons.h +++ b/editor/app/Rendering/Assets/BuiltInIcons.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Host/HostFwd.h" +#include "Host/Interfaces/HostFwd.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h index 6e2add14..e0984a24 100644 --- a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h +++ b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h @@ -9,7 +9,7 @@ #include "Rendering/D3D12/D3D12UiTextureHost.h" #include "Rendering/D3D12/D3D12WindowRenderLoop.h" #include "Rendering/D3D12/D3D12WindowRenderer.h" -#include "Rendering/Host/EditorWindowRenderRuntime.h" +#include "Host/Interfaces/EditorWindowRenderRuntime.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12UiTextureHost.h b/editor/app/Rendering/D3D12/D3D12UiTextureHost.h index af5412de..590a52ae 100644 --- a/editor/app/Rendering/D3D12/D3D12UiTextureHost.h +++ b/editor/app/Rendering/D3D12/D3D12UiTextureHost.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Rendering/Host/UiTextureHost.h" +#include "Host/Interfaces/UiTextureHost.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12WindowRenderer.h b/editor/app/Rendering/D3D12/D3D12WindowRenderer.h index 7e1bfeae..f4093952 100644 --- a/editor/app/Rendering/D3D12/D3D12WindowRenderer.h +++ b/editor/app/Rendering/D3D12/D3D12WindowRenderer.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Rendering/Host/ViewportRenderHost.h" +#include "Host/Interfaces/ViewportRenderHost.h" #include "D3D12HostDevice.h" #include "D3D12ShaderResourceDescriptorAllocator.h" #include "D3D12WindowCapture.h" diff --git a/editor/app/Rendering/Viewport/ViewportHostService.cpp b/editor/app/Rendering/Viewport/ViewportHostService.cpp index 269b8424..b0bebe42 100644 --- a/editor/app/Rendering/Viewport/ViewportHostService.cpp +++ b/editor/app/Rendering/Viewport/ViewportHostService.cpp @@ -1,6 +1,6 @@ #include "ViewportHostService.h" -#include "Rendering/Host/ViewportRenderHost.h" +#include "Host/Interfaces/ViewportRenderHost.h" #include diff --git a/editor/app/Rendering/Viewport/ViewportHostService.h b/editor/app/Rendering/Viewport/ViewportHostService.h index 6e3f06c5..ddf78d56 100644 --- a/editor/app/Rendering/Viewport/ViewportHostService.h +++ b/editor/app/Rendering/Viewport/ViewportHostService.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Host/HostFwd.h" +#include "Host/Interfaces/HostFwd.h" #include "Rendering/Viewport/ViewportContentRenderer.h" #include "ViewportRenderTargets.h" diff --git a/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp b/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp index 54495507..8c76e538 100644 --- a/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp +++ b/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp @@ -1,6 +1,6 @@ #include "Rendering/Viewport/ViewportRenderTargets.h" -#include "Rendering/Host/ViewportRenderHost.h" +#include "Host/Interfaces/ViewportRenderHost.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Rendering/Viewport/ViewportRenderTargets.h b/editor/app/Rendering/Viewport/ViewportRenderTargets.h index 9e575178..11cff62b 100644 --- a/editor/app/Rendering/Viewport/ViewportRenderTargets.h +++ b/editor/app/Rendering/Viewport/ViewportRenderTargets.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Host/HostFwd.h" +#include "Host/Interfaces/HostFwd.h" #include "ViewportRenderTargetUtils.h" #include diff --git a/editor/app/Support/EmbeddedPngLoader.cpp b/editor/app/Support/EmbeddedPngLoader.cpp index f7d1c2d8..b7324a1d 100644 --- a/editor/app/Support/EmbeddedPngLoader.cpp +++ b/editor/app/Support/EmbeddedPngLoader.cpp @@ -1,6 +1,6 @@ #include "Support/EmbeddedPngLoader.h" -#include "Rendering/Host/UiTextureHost.h" +#include "Host/Interfaces/UiTextureHost.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Support/EmbeddedPngLoader.h b/editor/app/Support/EmbeddedPngLoader.h index 775b2761..d137a4c3 100644 --- a/editor/app/Support/EmbeddedPngLoader.h +++ b/editor/app/Support/EmbeddedPngLoader.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Host/HostFwd.h" +#include "Host/Interfaces/HostFwd.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentController.cpp b/editor/app/Windowing/Content/EditorWindowContentController.cpp index 1314c247..1d40aade 100644 --- a/editor/app/Windowing/Content/EditorWindowContentController.cpp +++ b/editor/app/Windowing/Content/EditorWindowContentController.cpp @@ -1,7 +1,7 @@ #include "Windowing/Content/EditorWindowContentController.h" #include "Composition/EditorContext.h" -#include "Windowing/EditorWindowShared.h" +#include "Windowing/EditorWindowVisuals.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentController.h b/editor/app/Windowing/Content/EditorWindowContentController.h index 71fdebe9..5581aea4 100644 --- a/editor/app/Windowing/Content/EditorWindowContentController.h +++ b/editor/app/Windowing/Content/EditorWindowContentController.h @@ -1,7 +1,7 @@ #pragma once -#include "Windowing/Frame/EditorWindowTransferRequests.h" -#include "Windowing/Host/EditorWindowContentBindings.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" +#include "Host/Interfaces/EditorWindowContentBindings.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp index 7c884bf9..3c91bdc2 100644 --- a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp +++ b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp @@ -7,7 +7,7 @@ #include "Windowing/EditorWindowManager.h" #include "Windowing/Runtime/EditorWindowRuntimeController.h" -#include +#include #include #include diff --git a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h index 0899b62f..2c2cb816 100644 --- a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h @@ -1,7 +1,7 @@ #pragma once -#include "Windowing/Frame/EditorWindowTransferRequests.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h index 5a9e20c9..5ac69386 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h @@ -1,6 +1,6 @@ #pragma once -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp index bfd89e1e..6128f18a 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp +++ b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp @@ -6,7 +6,7 @@ #include "Windowing/EditorWindowManager.h" #include "Windowing/Runtime/EditorWindowRuntimeController.h" -#include +#include #include #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h index d658e85e..7dbf701b 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h @@ -4,8 +4,8 @@ #define NOMINMAX #endif -#include "Windowing/Frame/EditorWindowTransferRequests.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Windowing/EditorWindowDiagnostics.h b/editor/app/Windowing/EditorWindowDiagnostics.h new file mode 100644 index 00000000..57ae6a34 --- /dev/null +++ b/editor/app/Windowing/EditorWindowDiagnostics.h @@ -0,0 +1,11 @@ +#pragma once + +#include "Support/EnvironmentFlags.h" + +namespace XCEngine::UI::Editor::App { + +inline bool IsEditorWindowVerboseRuntimeTraceEnabled() { + return IsEnvironmentFlagEnabled("XCUIEDITOR_VERBOSE_TRACE"); +} + +} // namespace XCEngine::UI::Editor::App diff --git a/editor/app/Windowing/EditorWindowInstance.cpp b/editor/app/Windowing/EditorWindowInstance.cpp index ce83b38c..fa0f2412 100644 --- a/editor/app/Windowing/EditorWindowInstance.cpp +++ b/editor/app/Windowing/EditorWindowInstance.cpp @@ -1,8 +1,9 @@ #include "Windowing/EditorWindowInstance.h" #include "Support/StringEncoding.h" -#include "Windowing/Host/EditorWindowContentBindings.h" +#include "Host/Interfaces/EditorWindowContentBindings.h" #include "Windowing/Runtime/EditorWindowRuntimeController.h" +#include "Windowing/EditorWindowVisuals.h" #include #include diff --git a/editor/app/Windowing/EditorWindowInstance.h b/editor/app/Windowing/EditorWindowInstance.h index ca07ac65..6f0df178 100644 --- a/editor/app/Windowing/EditorWindowInstance.h +++ b/editor/app/Windowing/EditorWindowInstance.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Windowing/Host/EditorWindowHostInterfaces.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Windowing/EditorWindowManager.cpp b/editor/app/Windowing/EditorWindowManager.cpp index a20e47e4..f480101c 100644 --- a/editor/app/Windowing/EditorWindowManager.cpp +++ b/editor/app/Windowing/EditorWindowManager.cpp @@ -8,7 +8,7 @@ #include "Windowing/EditorWindowInstance.h" #include "Windowing/Runtime/EditorWindowRuntimeController.h" -#include +#include #include diff --git a/editor/app/Windowing/EditorWindowManager.h b/editor/app/Windowing/EditorWindowManager.h index 25670f06..f38f96c9 100644 --- a/editor/app/Windowing/EditorWindowManager.h +++ b/editor/app/Windowing/EditorWindowManager.h @@ -5,9 +5,9 @@ #endif #include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" -#include "Windowing/Host/EditorWindowHostCoordinator.h" -#include "Windowing/Host/EditorWindowHostInterfaces.h" -#include "Windowing/Host/EditorWindowHostTypes.h" +#include "Host/Interfaces/EditorWindowHostCoordinator.h" +#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Host/Interfaces/EditorWindowHostTypes.h" #include "Windowing/EditorWindowInstance.h" #include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" #include diff --git a/editor/app/Windowing/EditorWindowVisuals.h b/editor/app/Windowing/EditorWindowVisuals.h new file mode 100644 index 00000000..b1fe211f --- /dev/null +++ b/editor/app/Windowing/EditorWindowVisuals.h @@ -0,0 +1,12 @@ +#pragma once + +#include + +namespace XCEngine::UI::Editor::App { + +inline const ::XCEngine::UI::UIColor kShellSurfaceColor(0.10f, 0.10f, 0.10f, 1.0f); +inline const ::XCEngine::UI::UIColor kShellBorderColor(0.15f, 0.15f, 0.15f, 1.0f); +inline const ::XCEngine::UI::UIColor kShellTextColor(0.92f, 0.92f, 0.92f, 1.0f); +inline const ::XCEngine::UI::UIColor kShellMutedTextColor(0.70f, 0.70f, 0.70f, 1.0f); + +} // namespace XCEngine::UI::Editor::App diff --git a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp index e9078303..e15bf92b 100644 --- a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp +++ b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp @@ -3,7 +3,9 @@ #include "Composition/EditorContext.h" #include "Composition/EditorShellRuntime.h" #include "Composition/EditorShellVariant.h" -#include "Windowing/EditorWindowShared.h" +#include "Core/Windowing/EditorWindowMetrics.h" +#include "Windowing/EditorWindowDiagnostics.h" +#include "Windowing/EditorWindowVisuals.h" #include #include diff --git a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h index d13095b9..e1f196ff 100644 --- a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h +++ b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h @@ -1,6 +1,6 @@ #pragma once -#include "Windowing/Frame/EditorWindowTransferRequests.h" +#include "Core/Windowing/EditorWindowTransferRequests.h" #include diff --git a/editor/app/Windowing/Host/EditorWindowTypes.h b/editor/app/Windowing/Host/EditorWindowTypes.h deleted file mode 100644 index e53ea3b6..00000000 --- a/editor/app/Windowing/Host/EditorWindowTypes.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "Core/Windowing/EditorWindowTypes.h" diff --git a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h index 31183f28..954cf756 100644 --- a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h +++ b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h @@ -7,7 +7,7 @@ #include "Windowing/Content/EditorWindowContentController.h" #include "Windowing/Runtime/EditorWindowScreenshotController.h" -#include +#include #include