From 8353da05e55e9ef25d85d2674e6d482cafa305c8 Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Mon, 27 Apr 2026 19:16:08 +0800 Subject: [PATCH] Remove editor app include root --- docs/plan/editor-core-refactor-plan.md | 23 +++++++++---- editor/AGENTS.md | 16 +++++++--- editor/CMakeLists.txt | 23 +++++++++++-- editor/app/Bootstrap/Application.cpp | 32 +++++++++---------- editor/app/Bootstrap/EditorApp.rc | 2 +- .../app/Commands/EditorHostCommandBridge.cpp | 2 +- editor/app/Commands/EditorHostCommandBridge.h | 6 ++-- editor/app/Composition/EditorContext.cpp | 6 ++-- editor/app/Composition/EditorContext.h | 22 ++++++------- .../Composition/EditorShellAssetBuilder.cpp | 4 +-- .../app/Composition/EditorShellAssetBuilder.h | 2 +- .../Composition/EditorShellDrawComposer.cpp | 6 ++-- .../EditorShellHostedPanelCoordinator.cpp | 6 ++-- .../EditorShellInteractionEngine.cpp | 4 +-- .../EditorShellInteractionEngine.h | 2 +- editor/app/Composition/EditorShellRuntime.cpp | 8 ++--- editor/app/Composition/EditorShellRuntime.h | 18 +++++------ .../EditorShellSessionCoordinator.cpp | 6 ++-- .../EditorShellSessionCoordinator.h | 2 +- editor/app/Composition/WorkspaceEventSync.cpp | 4 +-- editor/app/Composition/WorkspaceEventSync.h | 2 +- .../Features/ColorPicker/ColorPickerPanel.cpp | 4 +-- .../Features/ColorPicker/ColorPickerPanel.h | 2 +- editor/app/Features/Console/ConsolePanel.h | 2 +- .../Features/EditorUtilityWindowRegistry.cpp | 6 ++-- .../Features/EditorUtilityWindowRegistry.h | 2 +- .../Features/EditorWorkspacePanelRegistry.cpp | 20 ++++++------ .../Features/EditorWorkspacePanelRegistry.h | 2 +- .../app/Features/Hierarchy/HierarchyModel.cpp | 2 +- .../app/Features/Hierarchy/HierarchyPanel.cpp | 8 ++--- .../app/Features/Hierarchy/HierarchyPanel.h | 2 +- .../Features/Inspector/AddComponentPanel.cpp | 8 ++--- .../Features/Inspector/AddComponentPanel.h | 2 +- .../AudioListenerInspectorComponentEditor.h | 2 +- .../AudioSourceInspectorComponentEditor.h | 2 +- .../BoxColliderInspectorComponentEditor.h | 2 +- .../CameraInspectorComponentEditor.h | 2 +- .../CapsuleColliderInspectorComponentEditor.h | 2 +- .../ColliderInspectorComponentEditorUtils.h | 2 +- .../Components/IInspectorComponentEditor.h | 2 +- .../InspectorBindingComponentEditor.cpp | 2 +- .../InspectorBindingComponentEditor.h | 4 +-- .../InspectorComponentEditorRegistry.cpp | 28 ++++++++-------- .../LightInspectorComponentEditor.h | 2 +- .../MeshFilterInspectorComponentEditor.h | 2 +- .../MeshRendererInspectorComponentEditor.h | 2 +- .../RigidbodyInspectorComponentEditor.h | 2 +- .../SphereColliderInspectorComponentEditor.h | 2 +- .../TransformInspectorComponentEditor.cpp | 2 +- .../TransformInspectorComponentEditor.h | 2 +- .../VolumeRendererInspectorComponentEditor.h | 2 +- .../app/Features/Inspector/InspectorPanel.cpp | 16 +++++----- .../app/Features/Inspector/InspectorPanel.h | 6 ++-- .../Inspector/InspectorPresentationModel.cpp | 10 +++--- .../Inspector/InspectorPresentationModel.h | 2 +- .../Features/Inspector/InspectorSubject.cpp | 4 +-- .../app/Features/Inspector/InspectorSubject.h | 2 +- editor/app/Features/Project/ProjectPanel.cpp | 8 ++--- editor/app/Features/Project/ProjectPanel.h | 6 ++-- .../Features/Scene/SceneEditCommandRoute.cpp | 4 +-- .../Features/Scene/SceneEditCommandRoute.h | 2 +- .../Scene/SceneViewportController.cpp | 10 +++--- .../Features/Scene/SceneViewportController.h | 6 ++-- .../Features/Scene/SceneViewportFeature.cpp | 12 +++---- .../app/Features/Scene/SceneViewportFeature.h | 4 +-- .../Scene/SceneViewportSceneOverlay.cpp | 8 ++--- .../Scene/SceneViewportToolOverlay.cpp | 4 +-- .../Features/Scene/SceneViewportToolOverlay.h | 4 +-- .../Scene/SceneViewportTransformGizmo.cpp | 8 ++--- .../SceneViewportTransformGizmoSupport.cpp | 2 +- .../Chrome/EditorWindowChromeController.cpp | 14 ++++---- .../Chrome/EditorWindowChromeController.h | 4 +-- .../Win32/Diagnostics/Win32CrashTrace.cpp | 2 +- .../Runtime/EditorWindowInputController.cpp | 2 +- .../Runtime/EditorWindowInputController.h | 4 +-- .../System/Win32SystemInteractionHost.cpp | 4 +-- .../Win32/System/Win32SystemInteractionHost.h | 2 +- .../EditorFloatingWindowPlacement.cpp | 2 +- .../Platform/Win32/Windowing/EditorWindow.cpp | 18 +++++------ .../Platform/Win32/Windowing/EditorWindow.h | 4 +-- .../Windowing/EditorWindowHostRuntime.cpp | 12 +++---- .../Win32/Windowing/EditorWindowHostRuntime.h | 8 ++--- .../EditorWindowMessageDispatcher.cpp | 16 +++++----- .../Windowing/EditorWindowMessageDispatcher.h | 2 +- .../Windowing/EditorWindowPointerCapture.h | 2 +- .../Win32/Windowing/EditorWindowSession.cpp | 4 +-- .../Win32/Windowing/EditorWindowSession.h | 4 +-- .../Win32/Windowing/EditorWindowState.h | 2 +- .../Win32/Windowing/EditorWindowSupport.h | 4 +-- editor/app/Rendering/Assets/BuiltInIcons.cpp | 8 ++--- editor/app/Rendering/Assets/BuiltInIcons.h | 2 +- .../D3D12/D3D12EditorWindowRenderRuntime.cpp | 2 +- .../D3D12/D3D12EditorWindowRenderRuntime.h | 12 +++---- editor/app/Rendering/D3D12/D3D12UiRenderer.h | 2 +- .../app/Rendering/D3D12/D3D12UiTextureHost.h | 4 +-- .../Rendering/D3D12/D3D12WindowRenderLoop.h | 4 +-- .../app/Rendering/D3D12/D3D12WindowRenderer.h | 2 +- .../Viewport/Passes/SceneViewportGridPass.cpp | 4 +-- .../Viewport/Passes/SceneViewportGridPass.h | 2 +- .../SceneViewportSelectedHelpersPass.cpp | 2 +- .../Passes/SceneViewportSelectedHelpersPass.h | 2 +- .../SceneViewportSelectionOutlinePass.cpp | 6 ++-- .../SceneViewportSelectionOutlinePass.h | 2 +- .../SceneViewportRenderPassBundle.cpp | 2 +- .../Viewport/SceneViewportRenderPassBundle.h | 8 ++--- .../Viewport/SceneViewportRenderPlan.h | 6 ++-- .../Viewport/SceneViewportRenderService.cpp | 2 +- .../Viewport/SceneViewportRenderService.h | 8 ++--- .../Viewport/ViewportContentRenderer.h | 2 +- .../Viewport/ViewportHostService.cpp | 2 +- .../Rendering/Viewport/ViewportHostService.h | 4 +-- .../Viewport/ViewportObjectPickerService.h | 2 +- .../Viewport/ViewportRenderTargetUtils.cpp | 2 +- .../Viewport/ViewportRenderTargets.cpp | 4 +-- .../Viewport/ViewportRenderTargets.h | 2 +- editor/app/Scene/EditorSceneBridge.cpp | 2 +- editor/app/Scene/EditorSceneRuntime.cpp | 2 +- editor/app/Scene/EditorSceneRuntime.h | 10 +++--- .../Services/Project/EditorProjectRuntime.cpp | 2 +- .../Services/Project/EditorProjectRuntime.h | 6 ++-- .../app/State/EditorColorPickerToolState.cpp | 2 +- editor/app/State/EditorCommandFocusService.h | 2 +- editor/app/State/EditorSelectionService.h | 4 +-- editor/app/State/EditorSession.cpp | 4 +-- .../State/EditorUtilityWindowRequestState.cpp | 2 +- .../State/EditorUtilityWindowRequestState.h | 2 +- editor/app/Support/EmbeddedPngLoader.cpp | 4 +-- editor/app/Support/EmbeddedPngLoader.h | 2 +- .../EditorUtilityWindowContentController.cpp | 6 ++-- .../EditorUtilityWindowContentController.h | 2 +- .../Content/EditorWindowContentController.cpp | 6 ++-- .../Content/EditorWindowContentController.h | 4 +-- .../Content/EditorWindowContentFactory.cpp | 6 ++-- .../Content/EditorWindowContentFactory.h | 4 +-- ...EditorWorkspaceWindowContentController.cpp | 2 +- .../EditorWorkspaceWindowContentController.h | 6 ++-- .../EditorUtilityWindowCoordinator.cpp | 16 +++++----- .../EditorUtilityWindowCoordinator.h | 4 +-- .../EditorWindowLifecycleCoordinator.cpp | 4 +-- .../EditorWindowLifecycleCoordinator.h | 2 +- .../EditorWindowWorkspaceCoordinator.cpp | 14 ++++---- .../EditorWindowWorkspaceCoordinator.h | 4 +-- .../app/Windowing/EditorWindowDiagnostics.h | 2 +- editor/app/Windowing/EditorWindowInstance.cpp | 10 +++--- editor/app/Windowing/EditorWindowInstance.h | 2 +- editor/app/Windowing/EditorWindowManager.cpp | 18 +++++------ editor/app/Windowing/EditorWindowManager.h | 12 +++---- .../Frame/EditorWindowFrameOrchestrator.cpp | 14 ++++---- .../Frame/EditorWindowFrameOrchestrator.h | 2 +- .../Runtime/EditorWindowRuntimeController.cpp | 8 ++--- .../Runtime/EditorWindowRuntimeController.h | 6 ++-- .../EditorWindowScreenshotController.cpp | 4 +-- editor/app/main.cpp | 2 +- .../unit/test_editor_host_command_bridge.cpp | 10 +++--- .../unit/test_editor_project_runtime.cpp | 4 +-- .../test_editor_shell_asset_validation.cpp | 2 +- .../unit/test_hierarchy_scene_binding.cpp | 4 +-- .../unit/test_inspector_presentation.cpp | 10 +++--- .../unit/test_project_browser_model.cpp | 2 +- tests/UI/Editor/unit/test_project_panel.cpp | 6 ++-- .../unit/test_scene_viewport_render_plan.cpp | 2 +- .../unit/test_scene_viewport_runtime.cpp | 14 ++++---- .../unit/test_structured_editor_shell.cpp | 2 +- .../unit/test_ui_editor_panel_registry.cpp | 2 +- 164 files changed, 472 insertions(+), 436 deletions(-) diff --git a/docs/plan/editor-core-refactor-plan.md b/docs/plan/editor-core-refactor-plan.md index 62ef10c2..acfc22d0 100644 --- a/docs/plan/editor-core-refactor-plan.md +++ b/docs/plan/editor-core-refactor-plan.md @@ -38,8 +38,9 @@ incomplete: - `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. + `editor/app/Host`, and app/core sources now include through explicit module + roots instead of a private `editor/app` compatibility root. The app 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. @@ -75,13 +76,20 @@ Completed boundary cuts: now live under `editor/app/Core/Windowing`, and `XCEditorCore` no longer exports the whole `editor/app` root as a public include directory. +- The private `editor/app` compatibility include root is gone from + `XCEditorCore` and `XCEditor`. App implementation files now include through + explicit module roots such as `app/Composition`, `app/Features`, + `app/Windowing`, `app/Rendering`, `app/Scene`, `app/Services`, + `app/Support`, `app/Bootstrap`, and `app/Platform/Win32`. The root issue is not the existence of a single executable target by itself. 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. +narrowed, and internal source compatibility with the private app root has now +been removed. Remaining work is to finish wiring app-core tests against the +narrowed surface and continue converging host code on the target directory +shape. ## Target Directory Shape @@ -402,9 +410,10 @@ Completed cuts: - 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. +- `XCEditorCore` now exposes only `app/Core`, `app/Commands`, `app/State`, and + `app/Host` through its public usage requirements, and both `XCEditorCore` + and `XCEditor` enumerate explicit private module roots instead of using + `editor/app` as a compatibility include directory. - Remaining work in this phase is to continue converging concrete host code on the `app/Host/Win32` and `app/Host/D3D12` directory shape. diff --git a/editor/AGENTS.md b/editor/AGENTS.md index 59d7b445..731d42b5 100644 --- a/editor/AGENTS.md +++ b/editor/AGENTS.md @@ -23,6 +23,10 @@ change. - `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`. +- `XCEditorCore` also does not consume the whole `editor/app` root privately. + Its implementation include paths enumerate concrete app module roots such as + `app/Composition`, `app/Features`, `app/Windowing`, `app/Rendering`, + `app/Scene`, `app/Services`, `app/Support`, and `app/Bootstrap`. - `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`. @@ -299,10 +303,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. +- `XCEditorCore` does not use `editor/app` as a private implementation include + root. Its public usage requirements expose only `app/Core`, `app/Commands`, + `app/State`, `app/Host`, `include`, and engine headers; implementation files + use explicit module roots instead of the app-wide compatibility root. - `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. @@ -423,3 +427,7 @@ ownership rule. host contracts, pointer-capture contracts, and system interaction service. `XCEditorCore` no longer publishes the entire `editor/app` root through its public CMake include surface. +- The private `editor/app` CMake include root was removed from `XCEditorCore` + and `XCEditor`. App sources and editor app-facing unit files now include + through explicit module roots, so app-wide include-root drift is caught by + the build instead of being hidden by a compatibility path. diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 06497bf6..ed4f292e 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -326,7 +326,14 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ${CMAKE_SOURCE_DIR}/engine/include ${CMAKE_SOURCE_DIR}/engine/third_party/stb PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/app + ${CMAKE_CURRENT_SOURCE_DIR}/app/Bootstrap + ${CMAKE_CURRENT_SOURCE_DIR}/app/Composition + ${CMAKE_CURRENT_SOURCE_DIR}/app/Features + ${CMAKE_CURRENT_SOURCE_DIR}/app/Rendering + ${CMAKE_CURRENT_SOURCE_DIR}/app/Scene + ${CMAKE_CURRENT_SOURCE_DIR}/app/Services + ${CMAKE_CURRENT_SOURCE_DIR}/app/Support + ${CMAKE_CURRENT_SOURCE_DIR}/app/Windowing ) target_compile_definitions(XCEditorCore PUBLIC @@ -353,7 +360,19 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ) target_include_directories(XCEditor PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/app + ${CMAKE_CURRENT_SOURCE_DIR}/app/Bootstrap + ${CMAKE_CURRENT_SOURCE_DIR}/app/Commands + ${CMAKE_CURRENT_SOURCE_DIR}/app/Composition + ${CMAKE_CURRENT_SOURCE_DIR}/app/Core + ${CMAKE_CURRENT_SOURCE_DIR}/app/Features + ${CMAKE_CURRENT_SOURCE_DIR}/app/Host + ${CMAKE_CURRENT_SOURCE_DIR}/app/Platform/Win32 + ${CMAKE_CURRENT_SOURCE_DIR}/app/Rendering + ${CMAKE_CURRENT_SOURCE_DIR}/app/Scene + ${CMAKE_CURRENT_SOURCE_DIR}/app/Services + ${CMAKE_CURRENT_SOURCE_DIR}/app/State + ${CMAKE_CURRENT_SOURCE_DIR}/app/Support + ${CMAKE_CURRENT_SOURCE_DIR}/app/Windowing ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/engine/include ${CMAKE_SOURCE_DIR}/engine/third_party/stb diff --git a/editor/app/Bootstrap/Application.cpp b/editor/app/Bootstrap/Application.cpp index 651a4a69..dbaf0e51 100644 --- a/editor/app/Bootstrap/Application.cpp +++ b/editor/app/Bootstrap/Application.cpp @@ -1,19 +1,19 @@ -#include "Bootstrap/Application.h" -#include "Bootstrap/EditorResources.h" -#include "Host/Interfaces/SystemInteractionService.h" -#include "Composition/EditorContext.h" -#include "Features/EditorUtilityWindowRegistry.h" -#include "Features/EditorWorkspacePanelRegistry.h" -#include "Windowing/EditorWindowManager.h" -#include "Platform/Win32/Diagnostics/Win32CrashTrace.h" -#include "Platform/Win32/System/Win32SystemInteractionHost.h" -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Platform/Win32/Windowing/EditorWindowHostConfig.h" -#include "Platform/Win32/Windowing/EditorWindowHostRuntime.h" -#include "Platform/Win32/Windowing/EditorWindowMessageDispatcher.h" -#include "Rendering/D3D12/D3D12EditorWindowRenderRuntime.h" -#include "Support/EnvironmentFlags.h" -#include "Support/ExecutablePath.h" +#include "Application.h" +#include "EditorResources.h" +#include "Interfaces/SystemInteractionService.h" +#include "EditorContext.h" +#include "EditorUtilityWindowRegistry.h" +#include "EditorWorkspacePanelRegistry.h" +#include "EditorWindowManager.h" +#include "Diagnostics/Win32CrashTrace.h" +#include "System/Win32SystemInteractionHost.h" +#include "Windowing/EditorWindow.h" +#include "Windowing/EditorWindowHostConfig.h" +#include "Windowing/EditorWindowHostRuntime.h" +#include "Windowing/EditorWindowMessageDispatcher.h" +#include "D3D12/D3D12EditorWindowRenderRuntime.h" +#include "EnvironmentFlags.h" +#include "ExecutablePath.h" #include #include diff --git a/editor/app/Bootstrap/EditorApp.rc b/editor/app/Bootstrap/EditorApp.rc index e3b7c9a3..d733b253 100644 --- a/editor/app/Bootstrap/EditorApp.rc +++ b/editor/app/Bootstrap/EditorApp.rc @@ -1,4 +1,4 @@ -#include "Bootstrap/EditorResources.h" +#include "EditorResources.h" IDI_APP_ICON ICON "../resources/Icons/logo.ico" IDI_APP_ICON_SMALL ICON "../resources/Icons/logo_icon.ico" diff --git a/editor/app/Commands/EditorHostCommandBridge.cpp b/editor/app/Commands/EditorHostCommandBridge.cpp index 30c07a1a..ead08bc4 100644 --- a/editor/app/Commands/EditorHostCommandBridge.cpp +++ b/editor/app/Commands/EditorHostCommandBridge.cpp @@ -1,4 +1,4 @@ -#include "Commands/EditorHostCommandBridge.h" +#include "EditorHostCommandBridge.h" #include #include diff --git a/editor/app/Commands/EditorHostCommandBridge.h b/editor/app/Commands/EditorHostCommandBridge.h index 6c515b15..53cad861 100644 --- a/editor/app/Commands/EditorHostCommandBridge.h +++ b/editor/app/Commands/EditorHostCommandBridge.h @@ -1,8 +1,8 @@ #pragma once -#include "Commands/EditorEditCommandRoute.h" -#include "State/EditorCommandFocusService.h" -#include "State/EditorSession.h" +#include "EditorEditCommandRoute.h" +#include "EditorCommandFocusService.h" +#include "EditorSession.h" #include diff --git a/editor/app/Composition/EditorContext.cpp b/editor/app/Composition/EditorContext.cpp index 5e788efd..33ca3590 100644 --- a/editor/app/Composition/EditorContext.cpp +++ b/editor/app/Composition/EditorContext.cpp @@ -1,7 +1,7 @@ #include "EditorContext.h" -#include "Composition/EditorShellAssetBuilder.h" -#include "Scene/EditorSceneRuntime.h" -#include "Core/Panels/EditorPanelIds.h" +#include "EditorShellAssetBuilder.h" +#include "EditorSceneRuntime.h" +#include "Panels/EditorPanelIds.h" #include #include #include diff --git a/editor/app/Composition/EditorContext.h b/editor/app/Composition/EditorContext.h index bfc52763..dae3448c 100644 --- a/editor/app/Composition/EditorContext.h +++ b/editor/app/Composition/EditorContext.h @@ -1,17 +1,17 @@ #pragma once -#include "Composition/EditorShellVariant.h" -#include "Core/Panels/EditorPanelServices.h" -#include "Scene/EditorSceneRuntime.h" -#include "Services/Project/EditorProjectRuntime.h" -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "EditorShellVariant.h" +#include "Panels/EditorPanelServices.h" +#include "EditorSceneRuntime.h" +#include "Project/EditorProjectRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" -#include "Commands/EditorHostCommandBridge.h" -#include "State/EditorColorPickerToolState.h" -#include "State/EditorCommandFocusService.h" -#include "State/EditorSelectionService.h" -#include "State/EditorSession.h" -#include "State/EditorUtilityWindowRequestState.h" +#include "EditorHostCommandBridge.h" +#include "EditorColorPickerToolState.h" +#include "EditorCommandFocusService.h" +#include "EditorSelectionService.h" +#include "EditorSession.h" +#include "EditorUtilityWindowRequestState.h" #include #include #include diff --git a/editor/app/Composition/EditorShellAssetBuilder.cpp b/editor/app/Composition/EditorShellAssetBuilder.cpp index 25385566..72b53976 100644 --- a/editor/app/Composition/EditorShellAssetBuilder.cpp +++ b/editor/app/Composition/EditorShellAssetBuilder.cpp @@ -4,9 +4,9 @@ #include #include #include -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include -#include +#include "Assets/BuiltInIcons.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Composition/EditorShellAssetBuilder.h b/editor/app/Composition/EditorShellAssetBuilder.h index 27eb71ec..01ea0eb7 100644 --- a/editor/app/Composition/EditorShellAssetBuilder.h +++ b/editor/app/Composition/EditorShellAssetBuilder.h @@ -1,6 +1,6 @@ #pragma once -#include "Composition/EditorShellVariant.h" +#include "EditorShellVariant.h" #include #include diff --git a/editor/app/Composition/EditorShellDrawComposer.cpp b/editor/app/Composition/EditorShellDrawComposer.cpp index de7603c1..517704e4 100644 --- a/editor/app/Composition/EditorShellDrawComposer.cpp +++ b/editor/app/Composition/EditorShellDrawComposer.cpp @@ -1,7 +1,7 @@ -#include "Composition/EditorShellDrawComposer.h" +#include "EditorShellDrawComposer.h" -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" -#include "Rendering/Assets/BuiltInIcons.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "Assets/BuiltInIcons.h" #include #include diff --git a/editor/app/Composition/EditorShellHostedPanelCoordinator.cpp b/editor/app/Composition/EditorShellHostedPanelCoordinator.cpp index 9ce56cb3..0baf4b70 100644 --- a/editor/app/Composition/EditorShellHostedPanelCoordinator.cpp +++ b/editor/app/Composition/EditorShellHostedPanelCoordinator.cpp @@ -1,7 +1,7 @@ -#include "Composition/EditorShellHostedPanelCoordinator.h" +#include "EditorShellHostedPanelCoordinator.h" -#include "Composition/EditorContext.h" -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "EditorContext.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" #include #include diff --git a/editor/app/Composition/EditorShellInteractionEngine.cpp b/editor/app/Composition/EditorShellInteractionEngine.cpp index a3d05440..e1c13fb4 100644 --- a/editor/app/Composition/EditorShellInteractionEngine.cpp +++ b/editor/app/Composition/EditorShellInteractionEngine.cpp @@ -1,6 +1,6 @@ -#include "Composition/EditorShellInteractionEngine.h" +#include "EditorShellInteractionEngine.h" -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include diff --git a/editor/app/Composition/EditorShellInteractionEngine.h b/editor/app/Composition/EditorShellInteractionEngine.h index 9de32216..50cb0114 100644 --- a/editor/app/Composition/EditorShellInteractionEngine.h +++ b/editor/app/Composition/EditorShellInteractionEngine.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/ViewportHostService.h" +#include "Viewport/ViewportHostService.h" #include #include diff --git a/editor/app/Composition/EditorShellRuntime.cpp b/editor/app/Composition/EditorShellRuntime.cpp index a0739b8c..2b712eb7 100644 --- a/editor/app/Composition/EditorShellRuntime.cpp +++ b/editor/app/Composition/EditorShellRuntime.cpp @@ -1,7 +1,7 @@ -#include "Composition/EditorShellRuntime.h" -#include "Host/Interfaces/UiTextureHost.h" -#include "Host/Interfaces/ViewportRenderHost.h" -#include "Composition/EditorContext.h" +#include "EditorShellRuntime.h" +#include "Interfaces/UiTextureHost.h" +#include "Interfaces/ViewportRenderHost.h" +#include "EditorContext.h" #include #include diff --git a/editor/app/Composition/EditorShellRuntime.h b/editor/app/Composition/EditorShellRuntime.h index 76bd8ef2..ae2f0383 100644 --- a/editor/app/Composition/EditorShellRuntime.h +++ b/editor/app/Composition/EditorShellRuntime.h @@ -1,14 +1,14 @@ #pragma once -#include "Composition/EditorShellDrawComposer.h" -#include "Composition/EditorShellHostedPanelCoordinator.h" -#include "Composition/EditorShellInteractionEngine.h" -#include "Composition/EditorShellSessionCoordinator.h" -#include "Composition/EditorShellVariant.h" -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" -#include "Rendering/Assets/BuiltInIcons.h" -#include "Rendering/Viewport/ViewportHostService.h" -#include "Composition/WorkspaceEventSync.h" +#include "EditorShellDrawComposer.h" +#include "EditorShellHostedPanelCoordinator.h" +#include "EditorShellInteractionEngine.h" +#include "EditorShellSessionCoordinator.h" +#include "EditorShellVariant.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "Assets/BuiltInIcons.h" +#include "Viewport/ViewportHostService.h" +#include "WorkspaceEventSync.h" #include #include diff --git a/editor/app/Composition/EditorShellSessionCoordinator.cpp b/editor/app/Composition/EditorShellSessionCoordinator.cpp index ec3b6b95..35e498b8 100644 --- a/editor/app/Composition/EditorShellSessionCoordinator.cpp +++ b/editor/app/Composition/EditorShellSessionCoordinator.cpp @@ -1,7 +1,7 @@ -#include "Composition/EditorShellSessionCoordinator.h" +#include "EditorShellSessionCoordinator.h" -#include "Composition/EditorContext.h" -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "EditorContext.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Composition/EditorShellSessionCoordinator.h b/editor/app/Composition/EditorShellSessionCoordinator.h index 3bf01cbc..e8b9180b 100644 --- a/editor/app/Composition/EditorShellSessionCoordinator.h +++ b/editor/app/Composition/EditorShellSessionCoordinator.h @@ -1,6 +1,6 @@ #pragma once -#include "Composition/EditorShellVariant.h" +#include "EditorShellVariant.h" #include #include diff --git a/editor/app/Composition/WorkspaceEventSync.cpp b/editor/app/Composition/WorkspaceEventSync.cpp index 2f74b877..34c37e3d 100644 --- a/editor/app/Composition/WorkspaceEventSync.cpp +++ b/editor/app/Composition/WorkspaceEventSync.cpp @@ -1,6 +1,6 @@ -#include "Composition/WorkspaceEventSync.h" +#include "WorkspaceEventSync.h" -#include "Composition/EditorContext.h" +#include "EditorContext.h" #include diff --git a/editor/app/Composition/WorkspaceEventSync.h b/editor/app/Composition/WorkspaceEventSync.h index 3cce64ba..88338070 100644 --- a/editor/app/Composition/WorkspaceEventSync.h +++ b/editor/app/Composition/WorkspaceEventSync.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" #include #include diff --git a/editor/app/Features/ColorPicker/ColorPickerPanel.cpp b/editor/app/Features/ColorPicker/ColorPickerPanel.cpp index c66fbbb4..98595b40 100644 --- a/editor/app/Features/ColorPicker/ColorPickerPanel.cpp +++ b/editor/app/Features/ColorPicker/ColorPickerPanel.cpp @@ -1,7 +1,7 @@ #include "ColorPickerPanel.h" -#include "Core/Panels/EditorPanelServices.h" -#include "State/EditorColorPickerToolState.h" +#include "Panels/EditorPanelServices.h" +#include "EditorColorPickerToolState.h" #include #include diff --git a/editor/app/Features/ColorPicker/ColorPickerPanel.h b/editor/app/Features/ColorPicker/ColorPickerPanel.h index 74c323ad..94ca4bca 100644 --- a/editor/app/Features/ColorPicker/ColorPickerPanel.h +++ b/editor/app/Features/ColorPicker/ColorPickerPanel.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" #include diff --git a/editor/app/Features/Console/ConsolePanel.h b/editor/app/Features/Console/ConsolePanel.h index ce540e89..343eb4bb 100644 --- a/editor/app/Features/Console/ConsolePanel.h +++ b/editor/app/Features/Console/ConsolePanel.h @@ -1,6 +1,6 @@ #pragma once -#include "State/EditorSession.h" +#include "EditorSession.h" #include diff --git a/editor/app/Features/EditorUtilityWindowRegistry.cpp b/editor/app/Features/EditorUtilityWindowRegistry.cpp index 7398925e..40e4ef22 100644 --- a/editor/app/Features/EditorUtilityWindowRegistry.cpp +++ b/editor/app/Features/EditorUtilityWindowRegistry.cpp @@ -1,7 +1,7 @@ -#include "Features/EditorUtilityWindowRegistry.h" +#include "EditorUtilityWindowRegistry.h" -#include "Features/ColorPicker/ColorPickerPanel.h" -#include "Features/Inspector/AddComponentPanel.h" +#include "ColorPicker/ColorPickerPanel.h" +#include "Inspector/AddComponentPanel.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/EditorUtilityWindowRegistry.h b/editor/app/Features/EditorUtilityWindowRegistry.h index b55399d9..f2719bb9 100644 --- a/editor/app/Features/EditorUtilityWindowRegistry.h +++ b/editor/app/Features/EditorUtilityWindowRegistry.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/EditorWorkspacePanelRegistry.cpp b/editor/app/Features/EditorWorkspacePanelRegistry.cpp index 1f879ccd..698364a1 100644 --- a/editor/app/Features/EditorWorkspacePanelRegistry.cpp +++ b/editor/app/Features/EditorWorkspacePanelRegistry.cpp @@ -1,14 +1,14 @@ -#include "Features/EditorWorkspacePanelRegistry.h" +#include "EditorWorkspacePanelRegistry.h" -#include "Core/Panels/EditorPanelIds.h" -#include "Features/Console/ConsolePanel.h" -#include "Features/Hierarchy/HierarchyPanel.h" -#include "Features/Inspector/InspectorPanel.h" -#include "Features/Project/ProjectPanel.h" -#include "Features/Scene/SceneEditCommandRoute.h" -#include "Features/Scene/SceneViewportFeature.h" -#include "Rendering/Assets/BuiltInIcons.h" -#include "Rendering/Viewport/ViewportHostService.h" +#include "Panels/EditorPanelIds.h" +#include "Console/ConsolePanel.h" +#include "Hierarchy/HierarchyPanel.h" +#include "Inspector/InspectorPanel.h" +#include "Project/ProjectPanel.h" +#include "Scene/SceneEditCommandRoute.h" +#include "Scene/SceneViewportFeature.h" +#include "Assets/BuiltInIcons.h" +#include "Viewport/ViewportHostService.h" #include diff --git a/editor/app/Features/EditorWorkspacePanelRegistry.h b/editor/app/Features/EditorWorkspacePanelRegistry.h index 914c8fea..2342471b 100644 --- a/editor/app/Features/EditorWorkspacePanelRegistry.h +++ b/editor/app/Features/EditorWorkspacePanelRegistry.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/Hierarchy/HierarchyModel.cpp b/editor/app/Features/Hierarchy/HierarchyModel.cpp index c7c5ff70..10157165 100644 --- a/editor/app/Features/Hierarchy/HierarchyModel.cpp +++ b/editor/app/Features/Hierarchy/HierarchyModel.cpp @@ -1,6 +1,6 @@ #include "HierarchyModel.h" -#include "Scene/EditorSceneBridge.h" +#include "EditorSceneBridge.h" #include #include diff --git a/editor/app/Features/Hierarchy/HierarchyPanel.cpp b/editor/app/Features/Hierarchy/HierarchyPanel.cpp index f4ffd13a..c727918a 100644 --- a/editor/app/Features/Hierarchy/HierarchyPanel.cpp +++ b/editor/app/Features/Hierarchy/HierarchyPanel.cpp @@ -1,9 +1,9 @@ -#include "HierarchyPanel.h" -#include "Rendering/Assets/BuiltInIcons.h" +#include "HierarchyPanel.h" +#include "Assets/BuiltInIcons.h" #include #include -#include "Scene/EditorSceneRuntime.h" -#include "State/EditorCommandFocusService.h" +#include "EditorSceneRuntime.h" +#include "EditorCommandFocusService.h" #include #include #include diff --git a/editor/app/Features/Hierarchy/HierarchyPanel.h b/editor/app/Features/Hierarchy/HierarchyPanel.h index d58d9ccb..e2aa7d0b 100644 --- a/editor/app/Features/Hierarchy/HierarchyPanel.h +++ b/editor/app/Features/Hierarchy/HierarchyPanel.h @@ -2,7 +2,7 @@ #include "HierarchyModel.h" -#include "Commands/EditorEditCommandRoute.h" +#include "EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Inspector/AddComponentPanel.cpp b/editor/app/Features/Inspector/AddComponentPanel.cpp index 19aa1360..c7428fc8 100644 --- a/editor/app/Features/Inspector/AddComponentPanel.cpp +++ b/editor/app/Features/Inspector/AddComponentPanel.cpp @@ -1,8 +1,8 @@ -#include "Features/Inspector/AddComponentPanel.h" +#include "Inspector/AddComponentPanel.h" -#include "Core/Panels/EditorPanelServices.h" -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/InspectorComponentEditorRegistry.h" +#include "Panels/EditorPanelServices.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/InspectorComponentEditorRegistry.h" #include diff --git a/editor/app/Features/Inspector/AddComponentPanel.h b/editor/app/Features/Inspector/AddComponentPanel.h index a17701ea..ed078815 100644 --- a/editor/app/Features/Inspector/AddComponentPanel.h +++ b/editor/app/Features/Inspector/AddComponentPanel.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" #include #include diff --git a/editor/app/Features/Inspector/Components/AudioListenerInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/AudioListenerInspectorComponentEditor.h index bd1ac7c9..c239b571 100644 --- a/editor/app/Features/Inspector/Components/AudioListenerInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/AudioListenerInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/AudioSourceInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/AudioSourceInspectorComponentEditor.h index 7a55fd11..81c6d7e1 100644 --- a/editor/app/Features/Inspector/Components/AudioSourceInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/AudioSourceInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include #include diff --git a/editor/app/Features/Inspector/Components/BoxColliderInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/BoxColliderInspectorComponentEditor.h index 7782a545..65782d8e 100644 --- a/editor/app/Features/Inspector/Components/BoxColliderInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/BoxColliderInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h" +#include "Inspector/Components/ColliderInspectorComponentEditorUtils.h" #include diff --git a/editor/app/Features/Inspector/Components/CameraInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/CameraInspectorComponentEditor.h index 5ddccceb..547f08d4 100644 --- a/editor/app/Features/Inspector/Components/CameraInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/CameraInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/CapsuleColliderInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/CapsuleColliderInspectorComponentEditor.h index 39011682..6e6cf817 100644 --- a/editor/app/Features/Inspector/Components/CapsuleColliderInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/CapsuleColliderInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h" +#include "Inspector/Components/ColliderInspectorComponentEditorUtils.h" #include diff --git a/editor/app/Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h b/editor/app/Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h index 2dc6c8f6..f4fc3bcd 100644 --- a/editor/app/Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h +++ b/editor/app/Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/IInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/IInspectorComponentEditor.h index 96fddbaa..78ad92c9 100644 --- a/editor/app/Features/Inspector/Components/IInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/IInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Scene/EditorSceneRuntime.h" +#include "EditorSceneRuntime.h" #include diff --git a/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.cpp b/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.cpp index 65548575..265ccd87 100644 --- a/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.cpp +++ b/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.cpp @@ -1,4 +1,4 @@ -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.h b/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.h index dc7760c2..4702c6b4 100644 --- a/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.h +++ b/editor/app/Features/Inspector/Components/InspectorBindingComponentEditor.h @@ -1,7 +1,7 @@ #pragma once -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/InspectorComponentEditorUtils.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/InspectorComponentEditorUtils.h" #include #include diff --git a/editor/app/Features/Inspector/Components/InspectorComponentEditorRegistry.cpp b/editor/app/Features/Inspector/Components/InspectorComponentEditorRegistry.cpp index 7da63917..da3c2c7b 100644 --- a/editor/app/Features/Inspector/Components/InspectorComponentEditorRegistry.cpp +++ b/editor/app/Features/Inspector/Components/InspectorComponentEditorRegistry.cpp @@ -1,18 +1,18 @@ -#include "Features/Inspector/Components/InspectorComponentEditorRegistry.h" +#include "Inspector/Components/InspectorComponentEditorRegistry.h" -#include "Features/Inspector/Components/AudioListenerInspectorComponentEditor.h" -#include "Features/Inspector/Components/AudioSourceInspectorComponentEditor.h" -#include "Features/Inspector/Components/BoxColliderInspectorComponentEditor.h" -#include "Features/Inspector/Components/CameraInspectorComponentEditor.h" -#include "Features/Inspector/Components/CapsuleColliderInspectorComponentEditor.h" -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/LightInspectorComponentEditor.h" -#include "Features/Inspector/Components/MeshFilterInspectorComponentEditor.h" -#include "Features/Inspector/Components/MeshRendererInspectorComponentEditor.h" -#include "Features/Inspector/Components/RigidbodyInspectorComponentEditor.h" -#include "Features/Inspector/Components/SphereColliderInspectorComponentEditor.h" -#include "Features/Inspector/Components/TransformInspectorComponentEditor.h" -#include "Features/Inspector/Components/VolumeRendererInspectorComponentEditor.h" +#include "Inspector/Components/AudioListenerInspectorComponentEditor.h" +#include "Inspector/Components/AudioSourceInspectorComponentEditor.h" +#include "Inspector/Components/BoxColliderInspectorComponentEditor.h" +#include "Inspector/Components/CameraInspectorComponentEditor.h" +#include "Inspector/Components/CapsuleColliderInspectorComponentEditor.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/LightInspectorComponentEditor.h" +#include "Inspector/Components/MeshFilterInspectorComponentEditor.h" +#include "Inspector/Components/MeshRendererInspectorComponentEditor.h" +#include "Inspector/Components/RigidbodyInspectorComponentEditor.h" +#include "Inspector/Components/SphereColliderInspectorComponentEditor.h" +#include "Inspector/Components/TransformInspectorComponentEditor.h" +#include "Inspector/Components/VolumeRendererInspectorComponentEditor.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/Inspector/Components/LightInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/LightInspectorComponentEditor.h index d6807441..03f73802 100644 --- a/editor/app/Features/Inspector/Components/LightInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/LightInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/MeshFilterInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/MeshFilterInspectorComponentEditor.h index 8ebb7ec5..e4d8b79c 100644 --- a/editor/app/Features/Inspector/Components/MeshFilterInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/MeshFilterInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/MeshRendererInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/MeshRendererInspectorComponentEditor.h index 72f855cd..12d205cf 100644 --- a/editor/app/Features/Inspector/Components/MeshRendererInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/MeshRendererInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include #include diff --git a/editor/app/Features/Inspector/Components/RigidbodyInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/RigidbodyInspectorComponentEditor.h index e9271c65..8e859c93 100644 --- a/editor/app/Features/Inspector/Components/RigidbodyInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/RigidbodyInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/SphereColliderInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/SphereColliderInspectorComponentEditor.h index 32ed501f..738f4efd 100644 --- a/editor/app/Features/Inspector/Components/SphereColliderInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/SphereColliderInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/ColliderInspectorComponentEditorUtils.h" +#include "Inspector/Components/ColliderInspectorComponentEditorUtils.h" #include diff --git a/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.cpp b/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.cpp index f6cebca6..f81cc514 100644 --- a/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.cpp +++ b/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.cpp @@ -1,4 +1,4 @@ -#include "Features/Inspector/Components/TransformInspectorComponentEditor.h" +#include "Inspector/Components/TransformInspectorComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.h index d5cebc65..2606e15c 100644 --- a/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/TransformInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/Inspector/Components/VolumeRendererInspectorComponentEditor.h b/editor/app/Features/Inspector/Components/VolumeRendererInspectorComponentEditor.h index 1c7c3f19..895605ce 100644 --- a/editor/app/Features/Inspector/Components/VolumeRendererInspectorComponentEditor.h +++ b/editor/app/Features/Inspector/Components/VolumeRendererInspectorComponentEditor.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/Components/InspectorBindingComponentEditor.h" +#include "Inspector/Components/InspectorBindingComponentEditor.h" #include diff --git a/editor/app/Features/Inspector/InspectorPanel.cpp b/editor/app/Features/Inspector/InspectorPanel.cpp index 82ddeb00..0d0ea47c 100644 --- a/editor/app/Features/Inspector/InspectorPanel.cpp +++ b/editor/app/Features/Inspector/InspectorPanel.cpp @@ -1,18 +1,18 @@ #include "InspectorPanel.h" -#include "Core/Panels/EditorPanelServices.h" -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" -#include "State/EditorColorPickerToolState.h" +#include "Panels/EditorPanelServices.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" +#include "EditorColorPickerToolState.h" #include #include #include #include -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/InspectorComponentEditorRegistry.h" -#include "Scene/EditorSceneRuntime.h" -#include "Services/Project/EditorProjectRuntime.h" -#include "State/EditorCommandFocusService.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/InspectorComponentEditorRegistry.h" +#include "EditorSceneRuntime.h" +#include "Project/EditorProjectRuntime.h" +#include "EditorCommandFocusService.h" #include #include diff --git a/editor/app/Features/Inspector/InspectorPanel.h b/editor/app/Features/Inspector/InspectorPanel.h index 68b24197..af2feaff 100644 --- a/editor/app/Features/Inspector/InspectorPanel.h +++ b/editor/app/Features/Inspector/InspectorPanel.h @@ -1,9 +1,9 @@ #pragma once -#include "Features/Inspector/InspectorPresentationModel.h" -#include "Features/Inspector/InspectorSubject.h" +#include "Inspector/InspectorPresentationModel.h" +#include "Inspector/InspectorSubject.h" -#include "Commands/EditorEditCommandRoute.h" +#include "EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Inspector/InspectorPresentationModel.cpp b/editor/app/Features/Inspector/InspectorPresentationModel.cpp index 9292a4f7..6f10ac2c 100644 --- a/editor/app/Features/Inspector/InspectorPresentationModel.cpp +++ b/editor/app/Features/Inspector/InspectorPresentationModel.cpp @@ -1,9 +1,9 @@ -#include "Features/Inspector/InspectorPresentationModel.h" +#include "Inspector/InspectorPresentationModel.h" -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/InspectorComponentEditorUtils.h" -#include "Features/Inspector/Components/InspectorComponentEditorRegistry.h" -#include "Scene/EditorSceneRuntime.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/InspectorComponentEditorUtils.h" +#include "Inspector/Components/InspectorComponentEditorRegistry.h" +#include "EditorSceneRuntime.h" #include diff --git a/editor/app/Features/Inspector/InspectorPresentationModel.h b/editor/app/Features/Inspector/InspectorPresentationModel.h index 2606e9f8..18ea0285 100644 --- a/editor/app/Features/Inspector/InspectorPresentationModel.h +++ b/editor/app/Features/Inspector/InspectorPresentationModel.h @@ -1,6 +1,6 @@ #pragma once -#include "Features/Inspector/InspectorSubject.h" +#include "Inspector/InspectorSubject.h" #include diff --git a/editor/app/Features/Inspector/InspectorSubject.cpp b/editor/app/Features/Inspector/InspectorSubject.cpp index 1e3fba42..3ff91f26 100644 --- a/editor/app/Features/Inspector/InspectorSubject.cpp +++ b/editor/app/Features/Inspector/InspectorSubject.cpp @@ -1,6 +1,6 @@ -#include "Features/Inspector/InspectorSubject.h" +#include "Inspector/InspectorSubject.h" -#include "Scene/EditorSceneRuntime.h" +#include "EditorSceneRuntime.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/Inspector/InspectorSubject.h b/editor/app/Features/Inspector/InspectorSubject.h index 39851c21..258216f8 100644 --- a/editor/app/Features/Inspector/InspectorSubject.h +++ b/editor/app/Features/Inspector/InspectorSubject.h @@ -1,6 +1,6 @@ #pragma once -#include "State/EditorSession.h" +#include "EditorSession.h" #include #include diff --git a/editor/app/Features/Project/ProjectPanel.cpp b/editor/app/Features/Project/ProjectPanel.cpp index a6256fc8..bdfc8e17 100644 --- a/editor/app/Features/Project/ProjectPanel.cpp +++ b/editor/app/Features/Project/ProjectPanel.cpp @@ -1,14 +1,14 @@ #include "ProjectPanel.h" -#include "Rendering/Assets/BuiltInIcons.h" +#include "Assets/BuiltInIcons.h" #include #include #include #include #include #include -#include "Host/Interfaces/SystemInteractionService.h" -#include "Services/Project/EditorProjectRuntime.h" -#include "State/EditorCommandFocusService.h" +#include "Interfaces/SystemInteractionService.h" +#include "Project/EditorProjectRuntime.h" +#include "EditorCommandFocusService.h" #include #include #include diff --git a/editor/app/Features/Project/ProjectPanel.h b/editor/app/Features/Project/ProjectPanel.h index 307c2e6e..7fdb8d9d 100644 --- a/editor/app/Features/Project/ProjectPanel.h +++ b/editor/app/Features/Project/ProjectPanel.h @@ -1,9 +1,9 @@ #pragma once -#include "Services/Project/EditorProjectRuntime.h" -#include "Services/Project/ProjectBrowserModel.h" +#include "Project/EditorProjectRuntime.h" +#include "Project/ProjectBrowserModel.h" -#include "Commands/EditorEditCommandRoute.h" +#include "EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Scene/SceneEditCommandRoute.cpp b/editor/app/Features/Scene/SceneEditCommandRoute.cpp index a3e4971c..f40434de 100644 --- a/editor/app/Features/Scene/SceneEditCommandRoute.cpp +++ b/editor/app/Features/Scene/SceneEditCommandRoute.cpp @@ -1,6 +1,6 @@ -#include "Features/Scene/SceneEditCommandRoute.h" +#include "Scene/SceneEditCommandRoute.h" -#include "Scene/EditorSceneRuntime.h" +#include "EditorSceneRuntime.h" #include diff --git a/editor/app/Features/Scene/SceneEditCommandRoute.h b/editor/app/Features/Scene/SceneEditCommandRoute.h index 83169a38..bc86c401 100644 --- a/editor/app/Features/Scene/SceneEditCommandRoute.h +++ b/editor/app/Features/Scene/SceneEditCommandRoute.h @@ -1,6 +1,6 @@ #pragma once -#include "Commands/EditorEditCommandRoute.h" +#include "EditorEditCommandRoute.h" #include diff --git a/editor/app/Features/Scene/SceneViewportController.cpp b/editor/app/Features/Scene/SceneViewportController.cpp index f6025aaa..80c9cf98 100644 --- a/editor/app/Features/Scene/SceneViewportController.cpp +++ b/editor/app/Features/Scene/SceneViewportController.cpp @@ -1,10 +1,10 @@ -#include "Features/Scene/SceneViewportController.h" +#include "Scene/SceneViewportController.h" -#include "Rendering/Viewport/ViewportObjectPickerService.h" -#include "Scene/EditorSceneRuntime.h" -#include "State/EditorCommandFocusService.h" +#include "Viewport/ViewportObjectPickerService.h" +#include "EditorSceneRuntime.h" +#include "EditorCommandFocusService.h" -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include #include diff --git a/editor/app/Features/Scene/SceneViewportController.h b/editor/app/Features/Scene/SceneViewportController.h index 8301e687..ff676212 100644 --- a/editor/app/Features/Scene/SceneViewportController.h +++ b/editor/app/Features/Scene/SceneViewportController.h @@ -1,8 +1,8 @@ #pragma once -#include "Features/Scene/SceneViewportSceneOverlay.h" -#include "Features/Scene/SceneViewportTransformGizmo.h" -#include "Features/Scene/SceneViewportToolOverlay.h" +#include "Scene/SceneViewportSceneOverlay.h" +#include "Scene/SceneViewportTransformGizmo.h" +#include "Scene/SceneViewportToolOverlay.h" #include diff --git a/editor/app/Features/Scene/SceneViewportFeature.cpp b/editor/app/Features/Scene/SceneViewportFeature.cpp index e3f47648..55443fb1 100644 --- a/editor/app/Features/Scene/SceneViewportFeature.cpp +++ b/editor/app/Features/Scene/SceneViewportFeature.cpp @@ -1,10 +1,10 @@ -#include "Features/Scene/SceneViewportFeature.h" +#include "Scene/SceneViewportFeature.h" -#include "Core/Panels/EditorPanelIds.h" -#include "Host/Interfaces/UiTextureHost.h" -#include "Rendering/Viewport/ViewportHostService.h" -#include "Scene/EditorSceneRuntime.h" -#include "State/EditorCommandFocusService.h" +#include "Panels/EditorPanelIds.h" +#include "Interfaces/UiTextureHost.h" +#include "Viewport/ViewportHostService.h" +#include "EditorSceneRuntime.h" +#include "EditorCommandFocusService.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Features/Scene/SceneViewportFeature.h b/editor/app/Features/Scene/SceneViewportFeature.h index b5bb0781..3e9b1baa 100644 --- a/editor/app/Features/Scene/SceneViewportFeature.h +++ b/editor/app/Features/Scene/SceneViewportFeature.h @@ -1,7 +1,7 @@ #pragma once -#include "Features/Scene/SceneViewportController.h" -#include "Rendering/Viewport/SceneViewportRenderService.h" +#include "Scene/SceneViewportController.h" +#include "Viewport/SceneViewportRenderService.h" #include diff --git a/editor/app/Features/Scene/SceneViewportSceneOverlay.cpp b/editor/app/Features/Scene/SceneViewportSceneOverlay.cpp index e85a7b6a..dbc74743 100644 --- a/editor/app/Features/Scene/SceneViewportSceneOverlay.cpp +++ b/editor/app/Features/Scene/SceneViewportSceneOverlay.cpp @@ -1,8 +1,8 @@ -#include "Features/Scene/SceneViewportSceneOverlay.h" +#include "Scene/SceneViewportSceneOverlay.h" -#include "Features/Scene/SceneViewportTransformGizmoSupport.h" -#include "Rendering/Assets/BuiltInIcons.h" -#include "Scene/EditorSceneRuntime.h" +#include "Scene/SceneViewportTransformGizmoSupport.h" +#include "Assets/BuiltInIcons.h" +#include "EditorSceneRuntime.h" #include #include diff --git a/editor/app/Features/Scene/SceneViewportToolOverlay.cpp b/editor/app/Features/Scene/SceneViewportToolOverlay.cpp index 5a630e71..a5857b6d 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 "Scene/SceneViewportToolOverlay.h" -#include "Host/Interfaces/UiTextureHost.h" +#include "Interfaces/UiTextureHost.h" #include diff --git a/editor/app/Features/Scene/SceneViewportToolOverlay.h b/editor/app/Features/Scene/SceneViewportToolOverlay.h index bd710c53..f0082e54 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 "Host/Interfaces/HostFwd.h" +#include "SceneToolState.h" +#include "Interfaces/HostFwd.h" #include #include diff --git a/editor/app/Features/Scene/SceneViewportTransformGizmo.cpp b/editor/app/Features/Scene/SceneViewportTransformGizmo.cpp index 272754d2..bee2b013 100644 --- a/editor/app/Features/Scene/SceneViewportTransformGizmo.cpp +++ b/editor/app/Features/Scene/SceneViewportTransformGizmo.cpp @@ -1,8 +1,8 @@ -#include "Features/Scene/SceneViewportTransformGizmo.h" +#include "Scene/SceneViewportTransformGizmo.h" -#include "Features/Scene/SceneViewportTransformGizmoSupport.h" -#include "Scene/EditorSceneRuntime.h" -#include "Scene/SceneToolState.h" +#include "Scene/SceneViewportTransformGizmoSupport.h" +#include "EditorSceneRuntime.h" +#include "SceneToolState.h" #include #include diff --git a/editor/app/Features/Scene/SceneViewportTransformGizmoSupport.cpp b/editor/app/Features/Scene/SceneViewportTransformGizmoSupport.cpp index 7926d9d1..358feb14 100644 --- a/editor/app/Features/Scene/SceneViewportTransformGizmoSupport.cpp +++ b/editor/app/Features/Scene/SceneViewportTransformGizmoSupport.cpp @@ -1,4 +1,4 @@ -#include "Features/Scene/SceneViewportTransformGizmoSupport.h" +#include "Scene/SceneViewportTransformGizmoSupport.h" #include #include diff --git a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp index 9521b4e9..663cac43 100644 --- a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp +++ b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.cpp @@ -1,11 +1,11 @@ -#include "Platform/Win32/Chrome/EditorWindowChromeController.h" +#include "Chrome/EditorWindowChromeController.h" -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Platform/Win32/Windowing/EditorWindowSupport.h" -#include "Core/Windowing/EditorWindowMetrics.h" -#include "Host/Interfaces/EditorWindowContentBindings.h" -#include "Host/Interfaces/EditorWindowHostCoordinator.h" -#include "Windowing/EditorWindowVisuals.h" +#include "Windowing/EditorWindow.h" +#include "Windowing/EditorWindowSupport.h" +#include "Windowing/EditorWindowMetrics.h" +#include "Interfaces/EditorWindowContentBindings.h" +#include "Interfaces/EditorWindowHostCoordinator.h" +#include "EditorWindowVisuals.h" #include #include diff --git a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.h b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.h index 5d2153d6..8ce3152a 100644 --- a/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.h +++ b/editor/app/Platform/Win32/Chrome/EditorWindowChromeController.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "BorderlessWindowChrome.h" +#include "HostRuntimeState.h" namespace XCEngine::UI { diff --git a/editor/app/Platform/Win32/Diagnostics/Win32CrashTrace.cpp b/editor/app/Platform/Win32/Diagnostics/Win32CrashTrace.cpp index 4e57234b..4d8d1762 100644 --- a/editor/app/Platform/Win32/Diagnostics/Win32CrashTrace.cpp +++ b/editor/app/Platform/Win32/Diagnostics/Win32CrashTrace.cpp @@ -1,4 +1,4 @@ -#include "Platform/Win32/Diagnostics/Win32CrashTrace.h" +#include "Diagnostics/Win32CrashTrace.h" #include diff --git a/editor/app/Platform/Win32/Runtime/EditorWindowInputController.cpp b/editor/app/Platform/Win32/Runtime/EditorWindowInputController.cpp index 8c8116b3..89dd705e 100644 --- a/editor/app/Platform/Win32/Runtime/EditorWindowInputController.cpp +++ b/editor/app/Platform/Win32/Runtime/EditorWindowInputController.cpp @@ -1,4 +1,4 @@ -#include "Platform/Win32/Runtime/EditorWindowInputController.h" +#include "Runtime/EditorWindowInputController.h" #include diff --git a/editor/app/Platform/Win32/Runtime/EditorWindowInputController.h b/editor/app/Platform/Win32/Runtime/EditorWindowInputController.h index 5f770201..9bdfff39 100644 --- a/editor/app/Platform/Win32/Runtime/EditorWindowInputController.h +++ b/editor/app/Platform/Win32/Runtime/EditorWindowInputController.h @@ -4,9 +4,9 @@ #define NOMINMAX #endif -#include "Platform/Win32/Windowing/EditorWindowPointerCapture.h" +#include "Windowing/EditorWindowPointerCapture.h" -#include +#include "InputModifierTracker.h" #include diff --git a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.cpp b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.cpp index 37665df8..1652e6c1 100644 --- a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.cpp +++ b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.cpp @@ -1,6 +1,6 @@ -#include "Platform/Win32/System/Win32SystemInteractionHost.h" +#include "System/Win32SystemInteractionHost.h" -#include "Support/StringEncoding.h" +#include "StringEncoding.h" #include #include diff --git a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h index a1328204..137ab31d 100644 --- a/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h +++ b/editor/app/Platform/Win32/System/Win32SystemInteractionHost.h @@ -1,6 +1,6 @@ #pragma once -#include "Host/Interfaces/SystemInteractionService.h" +#include "Interfaces/SystemInteractionService.h" namespace XCEngine::UI::Editor::Host { diff --git a/editor/app/Platform/Win32/Windowing/EditorFloatingWindowPlacement.cpp b/editor/app/Platform/Win32/Windowing/EditorFloatingWindowPlacement.cpp index a271b019..328eb2a7 100644 --- a/editor/app/Platform/Win32/Windowing/EditorFloatingWindowPlacement.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorFloatingWindowPlacement.cpp @@ -1,4 +1,4 @@ -#include "Platform/Win32/Windowing/EditorFloatingWindowPlacement.h" +#include "Windowing/EditorFloatingWindowPlacement.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindow.cpp b/editor/app/Platform/Win32/Windowing/EditorWindow.cpp index e42be0ed..da5734d0 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindow.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindow.cpp @@ -1,12 +1,12 @@ -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Bootstrap/EditorResources.h" -#include "Platform/Win32/Chrome/EditorWindowChromeController.h" -#include "Platform/Win32/Windowing/EditorWindowSession.h" -#include "Platform/Win32/Windowing/EditorWindowSupport.h" -#include "Platform/Win32/Runtime/EditorWindowInputController.h" -#include "Core/Windowing/EditorWindowMetrics.h" -#include "Host/Interfaces/EditorWindowContentBindings.h" -#include "Windowing/EditorWindowDiagnostics.h" +#include "Windowing/EditorWindow.h" +#include "EditorResources.h" +#include "Chrome/EditorWindowChromeController.h" +#include "Windowing/EditorWindowSession.h" +#include "Windowing/EditorWindowSupport.h" +#include "Runtime/EditorWindowInputController.h" +#include "Windowing/EditorWindowMetrics.h" +#include "Interfaces/EditorWindowContentBindings.h" +#include "EditorWindowDiagnostics.h" #include #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindow.h b/editor/app/Platform/Win32/Windowing/EditorWindow.h index 04ca09b4..5281f5b9 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindow.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindow.h @@ -4,8 +4,8 @@ #define NOMINMAX #endif -#include "Platform/Win32/Windowing/EditorWindowSession.h" -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Windowing/EditorWindowSession.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp index 7f7c9b3f..a96f7eb0 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp @@ -1,10 +1,10 @@ -#include "Platform/Win32/Windowing/EditorWindowHostRuntime.h" +#include "Windowing/EditorWindowHostRuntime.h" -#include "Bootstrap/EditorResources.h" -#include "Platform/Win32/Chrome/EditorWindowChromeController.h" -#include "Platform/Win32/Windowing/EditorFloatingWindowPlacement.h" -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Host/Interfaces/EditorWindowHostCoordinator.h" +#include "EditorResources.h" +#include "Chrome/EditorWindowChromeController.h" +#include "Windowing/EditorFloatingWindowPlacement.h" +#include "Windowing/EditorWindow.h" +#include "Interfaces/EditorWindowHostCoordinator.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h index dac609b2..1dd837b0 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowHostRuntime.h @@ -1,9 +1,9 @@ #pragma once -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Platform/Win32/Windowing/EditorWindowHostConfig.h" -#include "Host/Interfaces/EditorWindowHostCoordinator.h" -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Windowing/EditorWindow.h" +#include "Windowing/EditorWindowHostConfig.h" +#include "Interfaces/EditorWindowHostCoordinator.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp index 95f5cd18..300114fb 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp @@ -1,12 +1,12 @@ -#include "Platform/Win32/Windowing/EditorWindowMessageDispatcher.h" +#include "Windowing/EditorWindowMessageDispatcher.h" -#include "Platform/Win32/Chrome/BorderlessWindowChrome.h" -#include "Platform/Win32/Chrome/EditorWindowChromeController.h" -#include "Platform/Win32/Runtime/EditorWindowInputController.h" -#include "Platform/Win32/Windowing/EditorWindow.h" -#include "Platform/Win32/Windowing/EditorWindowPointerCapture.h" -#include "Host/Interfaces/EditorWindowContentBindings.h" -#include "Host/Interfaces/EditorWindowHostCoordinator.h" +#include "Chrome/BorderlessWindowChrome.h" +#include "Chrome/EditorWindowChromeController.h" +#include "Runtime/EditorWindowInputController.h" +#include "Windowing/EditorWindow.h" +#include "Windowing/EditorWindowPointerCapture.h" +#include "Interfaces/EditorWindowContentBindings.h" +#include "Interfaces/EditorWindowHostCoordinator.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h b/editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.h index 288d344c..46f3704a 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 "Core/Windowing/EditorWindowTransferRequests.h" +#include "Windowing/EditorWindowTransferRequests.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h b/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h index 0881e168..39031010 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h @@ -1,3 +1,3 @@ #pragma once -#include "Host/Interfaces/EditorWindowPointerCapture.h" +#include "Interfaces/EditorWindowPointerCapture.h" diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowSession.cpp b/editor/app/Platform/Win32/Windowing/EditorWindowSession.cpp index 58d8f8a0..815a67d2 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowSession.cpp +++ b/editor/app/Platform/Win32/Windowing/EditorWindowSession.cpp @@ -1,6 +1,6 @@ -#include "Platform/Win32/Windowing/EditorWindowSession.h" +#include "Windowing/EditorWindowSession.h" -#include "Platform/Win32/Windowing/EditorWindowSupport.h" +#include "Windowing/EditorWindowSupport.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowSession.h b/editor/app/Platform/Win32/Windowing/EditorWindowSession.h index 541c070d..965e762b 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 "Core/Windowing/EditorWindowTransferRequests.h" +#include "Windowing/EditorWindowState.h" +#include "Windowing/EditorWindowTransferRequests.h" #include #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowState.h b/editor/app/Platform/Win32/Windowing/EditorWindowState.h index 907dbf14..30767593 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 "Core/Windowing/EditorWindowTypes.h" +#include "Windowing/EditorWindowTypes.h" #include diff --git a/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h b/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h index db1f5a13..cd7dbbc9 100644 --- a/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h +++ b/editor/app/Platform/Win32/Windowing/EditorWindowSupport.h @@ -1,7 +1,7 @@ #pragma once -#include "Support/StringEncoding.h" -#include "Support/TextFormat.h" +#include "StringEncoding.h" +#include "TextFormat.h" #include diff --git a/editor/app/Rendering/Assets/BuiltInIcons.cpp b/editor/app/Rendering/Assets/BuiltInIcons.cpp index 717f6244..f9fbfa2a 100644 --- a/editor/app/Rendering/Assets/BuiltInIcons.cpp +++ b/editor/app/Rendering/Assets/BuiltInIcons.cpp @@ -1,9 +1,9 @@ #include "BuiltInIcons.h" -#include "Bootstrap/EditorResources.h" -#include "Host/Interfaces/UiTextureHost.h" -#include "Support/EmbeddedPngLoader.h" -#include "Support/StringEncoding.h" +#include "EditorResources.h" +#include "Interfaces/UiTextureHost.h" +#include "EmbeddedPngLoader.h" +#include "StringEncoding.h" #include diff --git a/editor/app/Rendering/Assets/BuiltInIcons.h b/editor/app/Rendering/Assets/BuiltInIcons.h index 3d33a2a1..217cfe5a 100644 --- a/editor/app/Rendering/Assets/BuiltInIcons.h +++ b/editor/app/Rendering/Assets/BuiltInIcons.h @@ -1,6 +1,6 @@ #pragma once -#include "Host/Interfaces/HostFwd.h" +#include "Interfaces/HostFwd.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.cpp b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.cpp index 47a4b744..75fe7913 100644 --- a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.cpp +++ b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.cpp @@ -1,4 +1,4 @@ -#include "Rendering/D3D12/D3D12EditorWindowRenderRuntime.h" +#include "D3D12/D3D12EditorWindowRenderRuntime.h" #include #include diff --git a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h index e0984a24..44e1b075 100644 --- a/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h +++ b/editor/app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.h @@ -4,12 +4,12 @@ #define NOMINMAX #endif -#include "Rendering/D3D12/D3D12UiRenderer.h" -#include "Rendering/D3D12/D3D12UiTextSystem.h" -#include "Rendering/D3D12/D3D12UiTextureHost.h" -#include "Rendering/D3D12/D3D12WindowRenderLoop.h" -#include "Rendering/D3D12/D3D12WindowRenderer.h" -#include "Host/Interfaces/EditorWindowRenderRuntime.h" +#include "D3D12/D3D12UiRenderer.h" +#include "D3D12/D3D12UiTextSystem.h" +#include "D3D12/D3D12UiTextureHost.h" +#include "D3D12/D3D12WindowRenderLoop.h" +#include "D3D12/D3D12WindowRenderer.h" +#include "Interfaces/EditorWindowRenderRuntime.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12UiRenderer.h b/editor/app/Rendering/D3D12/D3D12UiRenderer.h index aaa0e2b4..19ca9263 100644 --- a/editor/app/Rendering/D3D12/D3D12UiRenderer.h +++ b/editor/app/Rendering/D3D12/D3D12UiRenderer.h @@ -7,7 +7,7 @@ #include "D3D12UiTextSystem.h" #include "D3D12UiTextureHost.h" -#include +#include "D3D12WindowRenderer.h" #include #include diff --git a/editor/app/Rendering/D3D12/D3D12UiTextureHost.h b/editor/app/Rendering/D3D12/D3D12UiTextureHost.h index 590a52ae..79589774 100644 --- a/editor/app/Rendering/D3D12/D3D12UiTextureHost.h +++ b/editor/app/Rendering/D3D12/D3D12UiTextureHost.h @@ -4,9 +4,9 @@ #define NOMINMAX #endif -#include "Host/Interfaces/UiTextureHost.h" +#include "Interfaces/UiTextureHost.h" -#include +#include "D3D12WindowRenderer.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12WindowRenderLoop.h b/editor/app/Rendering/D3D12/D3D12WindowRenderLoop.h index 3093a088..b88f501c 100644 --- a/editor/app/Rendering/D3D12/D3D12WindowRenderLoop.h +++ b/editor/app/Rendering/D3D12/D3D12WindowRenderLoop.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "D3D12UiRenderer.h" +#include "D3D12WindowRenderer.h" #include diff --git a/editor/app/Rendering/D3D12/D3D12WindowRenderer.h b/editor/app/Rendering/D3D12/D3D12WindowRenderer.h index f4093952..99e9e83a 100644 --- a/editor/app/Rendering/D3D12/D3D12WindowRenderer.h +++ b/editor/app/Rendering/D3D12/D3D12WindowRenderer.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Host/Interfaces/ViewportRenderHost.h" +#include "Interfaces/ViewportRenderHost.h" #include "D3D12HostDevice.h" #include "D3D12ShaderResourceDescriptorAllocator.h" #include "D3D12WindowCapture.h" diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.cpp b/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.cpp index 502282d7..d2b7eb2d 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.cpp +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.cpp @@ -1,6 +1,6 @@ -#include "Rendering/Viewport/Passes/SceneViewportGridPass.h" +#include "Viewport/Passes/SceneViewportGridPass.h" -#include "Rendering/Viewport/SceneViewportResourcePaths.h" +#include "Viewport/SceneViewportResourcePaths.h" #include #include diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.h b/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.h index 4047d1c3..24221da2 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.h +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportGridPass.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/SceneViewportPassSpecs.h" +#include "Viewport/SceneViewportPassSpecs.h" #include #include diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.cpp b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.cpp index 592f0d86..4997f6d7 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.cpp +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.cpp @@ -1,4 +1,4 @@ -#include "Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h" +#include "Viewport/Passes/SceneViewportSelectedHelpersPass.h" #include #include diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h index 2e4f7095..0d25387f 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/SceneViewportRenderRequest.h" +#include "Viewport/SceneViewportRenderRequest.h" #include diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.cpp b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.cpp index 3c6cdde5..546483f3 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.cpp +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.cpp @@ -1,7 +1,7 @@ -#include "Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h" +#include "Viewport/Passes/SceneViewportSelectionOutlinePass.h" -#include "Rendering/Viewport/SceneViewportResourcePaths.h" -#include "Rendering/Viewport/ViewportRenderTargets.h" +#include "Viewport/SceneViewportResourcePaths.h" +#include "Viewport/ViewportRenderTargets.h" #include #include diff --git a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h index e2fcc060..05bb782c 100644 --- a/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h +++ b/editor/app/Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/SceneViewportPassSpecs.h" +#include "Viewport/SceneViewportPassSpecs.h" #include #include diff --git a/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.cpp b/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.cpp index 818b60fa..a539db89 100644 --- a/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.cpp +++ b/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.cpp @@ -1,4 +1,4 @@ -#include "Rendering/Viewport/SceneViewportRenderPassBundle.h" +#include "Viewport/SceneViewportRenderPassBundle.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.h b/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.h index 6047fe9c..62e5c6a9 100644 --- a/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.h +++ b/editor/app/Rendering/Viewport/SceneViewportRenderPassBundle.h @@ -1,9 +1,9 @@ #pragma once -#include "Rendering/Viewport/Passes/SceneViewportGridPass.h" -#include "Rendering/Viewport/Passes/SceneViewportSelectionOutlinePass.h" -#include "Rendering/Viewport/Passes/SceneViewportSelectedHelpersPass.h" -#include "Rendering/Viewport/SceneViewportRenderPlan.h" +#include "Viewport/Passes/SceneViewportGridPass.h" +#include "Viewport/Passes/SceneViewportSelectionOutlinePass.h" +#include "Viewport/Passes/SceneViewportSelectedHelpersPass.h" +#include "Viewport/SceneViewportRenderPlan.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Rendering/Viewport/SceneViewportRenderPlan.h b/editor/app/Rendering/Viewport/SceneViewportRenderPlan.h index 304a398e..2ea5207b 100644 --- a/editor/app/Rendering/Viewport/SceneViewportRenderPlan.h +++ b/editor/app/Rendering/Viewport/SceneViewportRenderPlan.h @@ -1,8 +1,8 @@ #pragma once -#include "Rendering/Viewport/SceneViewportRenderRequest.h" -#include "Rendering/Viewport/SceneViewportPassSpecs.h" -#include "Rendering/Viewport/ViewportRenderTargets.h" +#include "Viewport/SceneViewportRenderRequest.h" +#include "Viewport/SceneViewportPassSpecs.h" +#include "Viewport/ViewportRenderTargets.h" #include #include diff --git a/editor/app/Rendering/Viewport/SceneViewportRenderService.cpp b/editor/app/Rendering/Viewport/SceneViewportRenderService.cpp index e1e5ef21..d49431ab 100644 --- a/editor/app/Rendering/Viewport/SceneViewportRenderService.cpp +++ b/editor/app/Rendering/Viewport/SceneViewportRenderService.cpp @@ -1,4 +1,4 @@ -#include "Rendering/Viewport/SceneViewportRenderService.h" +#include "Viewport/SceneViewportRenderService.h" #include #include diff --git a/editor/app/Rendering/Viewport/SceneViewportRenderService.h b/editor/app/Rendering/Viewport/SceneViewportRenderService.h index e17ac8cf..629fa2f2 100644 --- a/editor/app/Rendering/Viewport/SceneViewportRenderService.h +++ b/editor/app/Rendering/Viewport/SceneViewportRenderService.h @@ -1,9 +1,9 @@ #pragma once -#include "Rendering/Viewport/ViewportContentRenderer.h" -#include "Rendering/Viewport/ViewportObjectPickerService.h" -#include "Rendering/Viewport/SceneViewportRenderPassBundle.h" -#include "Rendering/Viewport/SceneViewportRenderRequest.h" +#include "Viewport/ViewportContentRenderer.h" +#include "Viewport/ViewportObjectPickerService.h" +#include "Viewport/SceneViewportRenderPassBundle.h" +#include "Viewport/SceneViewportRenderRequest.h" #include #include diff --git a/editor/app/Rendering/Viewport/ViewportContentRenderer.h b/editor/app/Rendering/Viewport/ViewportContentRenderer.h index d5803b5c..2133ec6c 100644 --- a/editor/app/Rendering/Viewport/ViewportContentRenderer.h +++ b/editor/app/Rendering/Viewport/ViewportContentRenderer.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/ViewportRenderTargets.h" +#include "Viewport/ViewportRenderTargets.h" #include #include diff --git a/editor/app/Rendering/Viewport/ViewportHostService.cpp b/editor/app/Rendering/Viewport/ViewportHostService.cpp index b0bebe42..f486b57e 100644 --- a/editor/app/Rendering/Viewport/ViewportHostService.cpp +++ b/editor/app/Rendering/Viewport/ViewportHostService.cpp @@ -1,6 +1,6 @@ #include "ViewportHostService.h" -#include "Host/Interfaces/ViewportRenderHost.h" +#include "Interfaces/ViewportRenderHost.h" #include diff --git a/editor/app/Rendering/Viewport/ViewportHostService.h b/editor/app/Rendering/Viewport/ViewportHostService.h index ddf78d56..393ed0e8 100644 --- a/editor/app/Rendering/Viewport/ViewportHostService.h +++ b/editor/app/Rendering/Viewport/ViewportHostService.h @@ -1,7 +1,7 @@ #pragma once -#include "Host/Interfaces/HostFwd.h" -#include "Rendering/Viewport/ViewportContentRenderer.h" +#include "Interfaces/HostFwd.h" +#include "Viewport/ViewportContentRenderer.h" #include "ViewportRenderTargets.h" #include diff --git a/editor/app/Rendering/Viewport/ViewportObjectPickerService.h b/editor/app/Rendering/Viewport/ViewportObjectPickerService.h index 6cab19ce..0a9e006a 100644 --- a/editor/app/Rendering/Viewport/ViewportObjectPickerService.h +++ b/editor/app/Rendering/Viewport/ViewportObjectPickerService.h @@ -1,6 +1,6 @@ #pragma once -#include "Rendering/Viewport/ViewportObjectIdPicker.h" +#include "Viewport/ViewportObjectIdPicker.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Rendering/Viewport/ViewportRenderTargetUtils.cpp b/editor/app/Rendering/Viewport/ViewportRenderTargetUtils.cpp index 48043f2c..3250cc45 100644 --- a/editor/app/Rendering/Viewport/ViewportRenderTargetUtils.cpp +++ b/editor/app/Rendering/Viewport/ViewportRenderTargetUtils.cpp @@ -1,4 +1,4 @@ -#include "Rendering/Viewport/ViewportRenderTargetUtils.h" +#include "Viewport/ViewportRenderTargetUtils.h" #include #include diff --git a/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp b/editor/app/Rendering/Viewport/ViewportRenderTargets.cpp index 8c76e538..24954f81 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 "Viewport/ViewportRenderTargets.h" -#include "Host/Interfaces/ViewportRenderHost.h" +#include "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 11cff62b..04db7f01 100644 --- a/editor/app/Rendering/Viewport/ViewportRenderTargets.h +++ b/editor/app/Rendering/Viewport/ViewportRenderTargets.h @@ -1,6 +1,6 @@ #pragma once -#include "Host/Interfaces/HostFwd.h" +#include "Interfaces/HostFwd.h" #include "ViewportRenderTargetUtils.h" #include diff --git a/editor/app/Scene/EditorSceneBridge.cpp b/editor/app/Scene/EditorSceneBridge.cpp index 409c5852..7da77ff9 100644 --- a/editor/app/Scene/EditorSceneBridge.cpp +++ b/editor/app/Scene/EditorSceneBridge.cpp @@ -1,4 +1,4 @@ -#include "Scene/EditorSceneBridge.h" +#include "EditorSceneBridge.h" #include #include diff --git a/editor/app/Scene/EditorSceneRuntime.cpp b/editor/app/Scene/EditorSceneRuntime.cpp index 3ebc3ca3..5182f7ee 100644 --- a/editor/app/Scene/EditorSceneRuntime.cpp +++ b/editor/app/Scene/EditorSceneRuntime.cpp @@ -1,4 +1,4 @@ -#include "Scene/EditorSceneRuntime.h" +#include "EditorSceneRuntime.h" #include #include diff --git a/editor/app/Scene/EditorSceneRuntime.h b/editor/app/Scene/EditorSceneRuntime.h index c72fd5be..2019eb3f 100644 --- a/editor/app/Scene/EditorSceneRuntime.h +++ b/editor/app/Scene/EditorSceneRuntime.h @@ -1,10 +1,10 @@ #pragma once -#include "Scene/EditorSceneBridge.h" -#include "Scene/SceneViewportCameraController.h" -#include "Scene/SceneToolState.h" -#include "State/EditorSelectionService.h" -#include "Rendering/Viewport/SceneViewportRenderRequest.h" +#include "EditorSceneBridge.h" +#include "SceneViewportCameraController.h" +#include "SceneToolState.h" +#include "EditorSelectionService.h" +#include "Viewport/SceneViewportRenderRequest.h" #include diff --git a/editor/app/Services/Project/EditorProjectRuntime.cpp b/editor/app/Services/Project/EditorProjectRuntime.cpp index 620ce577..9b324647 100644 --- a/editor/app/Services/Project/EditorProjectRuntime.cpp +++ b/editor/app/Services/Project/EditorProjectRuntime.cpp @@ -1,4 +1,4 @@ -#include "Services/Project/EditorProjectRuntime.h" +#include "Project/EditorProjectRuntime.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Services/Project/EditorProjectRuntime.h b/editor/app/Services/Project/EditorProjectRuntime.h index b2c248ce..cab644bf 100644 --- a/editor/app/Services/Project/EditorProjectRuntime.h +++ b/editor/app/Services/Project/EditorProjectRuntime.h @@ -1,9 +1,9 @@ #pragma once -#include "Services/Project/ProjectBrowserModel.h" +#include "Project/ProjectBrowserModel.h" -#include "State/EditorSelectionService.h" -#include "State/EditorSession.h" +#include "EditorSelectionService.h" +#include "EditorSession.h" #include diff --git a/editor/app/State/EditorColorPickerToolState.cpp b/editor/app/State/EditorColorPickerToolState.cpp index 3f093623..77fb9497 100644 --- a/editor/app/State/EditorColorPickerToolState.cpp +++ b/editor/app/State/EditorColorPickerToolState.cpp @@ -1,4 +1,4 @@ -#include "State/EditorColorPickerToolState.h" +#include "EditorColorPickerToolState.h" #include diff --git a/editor/app/State/EditorCommandFocusService.h b/editor/app/State/EditorCommandFocusService.h index 159ef0e6..3b201101 100644 --- a/editor/app/State/EditorCommandFocusService.h +++ b/editor/app/State/EditorCommandFocusService.h @@ -1,6 +1,6 @@ #pragma once -#include "State/EditorSession.h" +#include "EditorSession.h" #include diff --git a/editor/app/State/EditorSelectionService.h b/editor/app/State/EditorSelectionService.h index e7ddd0ae..7460a854 100644 --- a/editor/app/State/EditorSelectionService.h +++ b/editor/app/State/EditorSelectionService.h @@ -1,7 +1,7 @@ #pragma once -#include "State/EditorSelectionStamp.h" -#include "State/EditorSession.h" +#include "EditorSelectionStamp.h" +#include "EditorSession.h" #include #include diff --git a/editor/app/State/EditorSession.cpp b/editor/app/State/EditorSession.cpp index b0edc94f..91f2948b 100644 --- a/editor/app/State/EditorSession.cpp +++ b/editor/app/State/EditorSession.cpp @@ -1,6 +1,6 @@ -#include "State/EditorSession.h" +#include "EditorSession.h" -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include diff --git a/editor/app/State/EditorUtilityWindowRequestState.cpp b/editor/app/State/EditorUtilityWindowRequestState.cpp index 23dc9d7b..d4b57403 100644 --- a/editor/app/State/EditorUtilityWindowRequestState.cpp +++ b/editor/app/State/EditorUtilityWindowRequestState.cpp @@ -1,4 +1,4 @@ -#include "State/EditorUtilityWindowRequestState.h" +#include "EditorUtilityWindowRequestState.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/State/EditorUtilityWindowRequestState.h b/editor/app/State/EditorUtilityWindowRequestState.h index 9ec8a626..71deb39b 100644 --- a/editor/app/State/EditorUtilityWindowRequestState.h +++ b/editor/app/State/EditorUtilityWindowRequestState.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" #include diff --git a/editor/app/Support/EmbeddedPngLoader.cpp b/editor/app/Support/EmbeddedPngLoader.cpp index b7324a1d..30e071a8 100644 --- a/editor/app/Support/EmbeddedPngLoader.cpp +++ b/editor/app/Support/EmbeddedPngLoader.cpp @@ -1,6 +1,6 @@ -#include "Support/EmbeddedPngLoader.h" +#include "EmbeddedPngLoader.h" -#include "Host/Interfaces/UiTextureHost.h" +#include "Interfaces/UiTextureHost.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Support/EmbeddedPngLoader.h b/editor/app/Support/EmbeddedPngLoader.h index d137a4c3..c3fa7d4a 100644 --- a/editor/app/Support/EmbeddedPngLoader.h +++ b/editor/app/Support/EmbeddedPngLoader.h @@ -1,6 +1,6 @@ #pragma once -#include "Host/Interfaces/HostFwd.h" +#include "Interfaces/HostFwd.h" #include diff --git a/editor/app/Windowing/Content/EditorUtilityWindowContentController.cpp b/editor/app/Windowing/Content/EditorUtilityWindowContentController.cpp index 8f7db0a3..1fa1de20 100644 --- a/editor/app/Windowing/Content/EditorUtilityWindowContentController.cpp +++ b/editor/app/Windowing/Content/EditorUtilityWindowContentController.cpp @@ -1,7 +1,7 @@ -#include "Windowing/Content/EditorUtilityWindowContentController.h" +#include "Content/EditorUtilityWindowContentController.h" -#include "Composition/EditorContext.h" -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" +#include "EditorContext.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" #include diff --git a/editor/app/Windowing/Content/EditorUtilityWindowContentController.h b/editor/app/Windowing/Content/EditorUtilityWindowContentController.h index f8e6d31d..ab0edc6f 100644 --- a/editor/app/Windowing/Content/EditorUtilityWindowContentController.h +++ b/editor/app/Windowing/Content/EditorUtilityWindowContentController.h @@ -1,6 +1,6 @@ #pragma once -#include "Windowing/Content/EditorWindowContentController.h" +#include "Content/EditorWindowContentController.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentController.cpp b/editor/app/Windowing/Content/EditorWindowContentController.cpp index 1d40aade..cf20bd93 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 "Content/EditorWindowContentController.h" -#include "Composition/EditorContext.h" -#include "Windowing/EditorWindowVisuals.h" +#include "EditorContext.h" +#include "EditorWindowVisuals.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentController.h b/editor/app/Windowing/Content/EditorWindowContentController.h index 5581aea4..b8a68a4a 100644 --- a/editor/app/Windowing/Content/EditorWindowContentController.h +++ b/editor/app/Windowing/Content/EditorWindowContentController.h @@ -1,7 +1,7 @@ #pragma once -#include "Core/Windowing/EditorWindowTransferRequests.h" -#include "Host/Interfaces/EditorWindowContentBindings.h" +#include "Windowing/EditorWindowTransferRequests.h" +#include "Interfaces/EditorWindowContentBindings.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentFactory.cpp b/editor/app/Windowing/Content/EditorWindowContentFactory.cpp index 69598535..6e8de2d8 100644 --- a/editor/app/Windowing/Content/EditorWindowContentFactory.cpp +++ b/editor/app/Windowing/Content/EditorWindowContentFactory.cpp @@ -1,7 +1,7 @@ -#include "Windowing/Content/EditorWindowContentFactory.h" +#include "Content/EditorWindowContentFactory.h" -#include "Windowing/Content/EditorUtilityWindowContentController.h" -#include "Windowing/Content/EditorWorkspaceWindowContentController.h" +#include "Content/EditorUtilityWindowContentController.h" +#include "Content/EditorWorkspaceWindowContentController.h" #include diff --git a/editor/app/Windowing/Content/EditorWindowContentFactory.h b/editor/app/Windowing/Content/EditorWindowContentFactory.h index 83d686bd..5140c4a9 100644 --- a/editor/app/Windowing/Content/EditorWindowContentFactory.h +++ b/editor/app/Windowing/Content/EditorWindowContentFactory.h @@ -1,7 +1,7 @@ #pragma once -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.h" -#include "Core/WorkspacePanels/EditorWorkspacePanelRuntime.h" +#include "UtilityWindows/EditorUtilityWindowRuntime.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" #include #include diff --git a/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.cpp b/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.cpp index 6f8c049f..699eff69 100644 --- a/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.cpp +++ b/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.cpp @@ -1,4 +1,4 @@ -#include "Windowing/Content/EditorWorkspaceWindowContentController.h" +#include "Content/EditorWorkspaceWindowContentController.h" #include #include diff --git a/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.h b/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.h index b0f157c5..2aa30324 100644 --- a/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.h +++ b/editor/app/Windowing/Content/EditorWorkspaceWindowContentController.h @@ -1,8 +1,8 @@ #pragma once -#include "Composition/EditorShellRuntime.h" -#include "Windowing/Content/EditorWindowContentController.h" -#include "Windowing/Frame/EditorWindowFrameOrchestrator.h" +#include "EditorShellRuntime.h" +#include "Content/EditorWindowContentController.h" +#include "Frame/EditorWindowFrameOrchestrator.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp index 3c91bdc2..a78460a6 100644 --- a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp +++ b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp @@ -1,13 +1,13 @@ -#include "Windowing/Coordinator/EditorUtilityWindowCoordinator.h" +#include "Coordinator/EditorUtilityWindowCoordinator.h" -#include "Core/UtilityWindows/EditorUtilityWindowRegistry.h" -#include "Windowing/Content/EditorWindowContentController.h" -#include "Windowing/Content/EditorWindowContentFactory.h" -#include "Windowing/Coordinator/EditorWindowLifecycleCoordinator.h" -#include "Windowing/EditorWindowManager.h" -#include "Windowing/Runtime/EditorWindowRuntimeController.h" +#include "UtilityWindows/EditorUtilityWindowRegistry.h" +#include "Content/EditorWindowContentController.h" +#include "Content/EditorWindowContentFactory.h" +#include "Coordinator/EditorWindowLifecycleCoordinator.h" +#include "EditorWindowManager.h" +#include "Runtime/EditorWindowRuntimeController.h" -#include +#include #include #include diff --git a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h index 2c2cb816..a37acc61 100644 --- a/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h @@ -1,7 +1,7 @@ #pragma once -#include "Core/Windowing/EditorWindowTransferRequests.h" -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Windowing/EditorWindowTransferRequests.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.cpp b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.cpp index 2710f7f7..c9b73db1 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.cpp +++ b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.cpp @@ -1,6 +1,6 @@ -#include "Windowing/Coordinator/EditorWindowLifecycleCoordinator.h" +#include "Coordinator/EditorWindowLifecycleCoordinator.h" -#include "Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h" +#include "Coordinator/EditorWindowWorkspaceCoordinator.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h index 5ac69386..985092bb 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h @@ -1,6 +1,6 @@ #pragma once -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp index 6128f18a..f8743d78 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp +++ b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp @@ -1,12 +1,12 @@ -#include "Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h" +#include "Coordinator/EditorWindowWorkspaceCoordinator.h" -#include "Windowing/Content/EditorWindowContentFactory.h" -#include "Windowing/Content/EditorWindowContentController.h" -#include "Windowing/Coordinator/EditorWindowLifecycleCoordinator.h" -#include "Windowing/EditorWindowManager.h" -#include "Windowing/Runtime/EditorWindowRuntimeController.h" +#include "Content/EditorWindowContentFactory.h" +#include "Content/EditorWindowContentController.h" +#include "Coordinator/EditorWindowLifecycleCoordinator.h" +#include "EditorWindowManager.h" +#include "Runtime/EditorWindowRuntimeController.h" -#include +#include #include #include diff --git a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h index 7dbf701b..d52fec33 100644 --- a/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h +++ b/editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h @@ -4,8 +4,8 @@ #define NOMINMAX #endif -#include "Core/Windowing/EditorWindowTransferRequests.h" -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Windowing/EditorWindowTransferRequests.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Windowing/EditorWindowDiagnostics.h b/editor/app/Windowing/EditorWindowDiagnostics.h index 57ae6a34..a945825e 100644 --- a/editor/app/Windowing/EditorWindowDiagnostics.h +++ b/editor/app/Windowing/EditorWindowDiagnostics.h @@ -1,6 +1,6 @@ #pragma once -#include "Support/EnvironmentFlags.h" +#include "EnvironmentFlags.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Windowing/EditorWindowInstance.cpp b/editor/app/Windowing/EditorWindowInstance.cpp index fa0f2412..f774f1b1 100644 --- a/editor/app/Windowing/EditorWindowInstance.cpp +++ b/editor/app/Windowing/EditorWindowInstance.cpp @@ -1,9 +1,9 @@ -#include "Windowing/EditorWindowInstance.h" +#include "EditorWindowInstance.h" -#include "Support/StringEncoding.h" -#include "Host/Interfaces/EditorWindowContentBindings.h" -#include "Windowing/Runtime/EditorWindowRuntimeController.h" -#include "Windowing/EditorWindowVisuals.h" +#include "StringEncoding.h" +#include "Interfaces/EditorWindowContentBindings.h" +#include "Runtime/EditorWindowRuntimeController.h" +#include "EditorWindowVisuals.h" #include #include diff --git a/editor/app/Windowing/EditorWindowInstance.h b/editor/app/Windowing/EditorWindowInstance.h index 6f0df178..72dccfc2 100644 --- a/editor/app/Windowing/EditorWindowInstance.h +++ b/editor/app/Windowing/EditorWindowInstance.h @@ -4,7 +4,7 @@ #define NOMINMAX #endif -#include "Host/Interfaces/EditorWindowHostInterfaces.h" +#include "Interfaces/EditorWindowHostInterfaces.h" #include #include diff --git a/editor/app/Windowing/EditorWindowManager.cpp b/editor/app/Windowing/EditorWindowManager.cpp index f480101c..2f7c597f 100644 --- a/editor/app/Windowing/EditorWindowManager.cpp +++ b/editor/app/Windowing/EditorWindowManager.cpp @@ -1,14 +1,14 @@ -#include "Windowing/EditorWindowManager.h" +#include "EditorWindowManager.h" -#include "Windowing/Content/EditorWindowContentController.h" -#include "Windowing/Content/EditorWindowContentFactory.h" -#include "Windowing/Coordinator/EditorWindowLifecycleCoordinator.h" -#include "Windowing/Coordinator/EditorUtilityWindowCoordinator.h" -#include "Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h" -#include "Windowing/EditorWindowInstance.h" -#include "Windowing/Runtime/EditorWindowRuntimeController.h" +#include "Content/EditorWindowContentController.h" +#include "Content/EditorWindowContentFactory.h" +#include "Coordinator/EditorWindowLifecycleCoordinator.h" +#include "Coordinator/EditorUtilityWindowCoordinator.h" +#include "Coordinator/EditorWindowWorkspaceCoordinator.h" +#include "EditorWindowInstance.h" +#include "Runtime/EditorWindowRuntimeController.h" -#include +#include #include diff --git a/editor/app/Windowing/EditorWindowManager.h b/editor/app/Windowing/EditorWindowManager.h index f38f96c9..5c6fd813 100644 --- a/editor/app/Windowing/EditorWindowManager.h +++ b/editor/app/Windowing/EditorWindowManager.h @@ -4,12 +4,12 @@ #define NOMINMAX #endif -#include "Core/UtilityWindows/EditorUtilityWindowRuntime.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 "UtilityWindows/EditorUtilityWindowRuntime.h" +#include "Interfaces/EditorWindowHostCoordinator.h" +#include "Interfaces/EditorWindowHostInterfaces.h" +#include "Interfaces/EditorWindowHostTypes.h" +#include "EditorWindowInstance.h" +#include "WorkspacePanels/EditorWorkspacePanelRuntime.h" #include #include #include diff --git a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp index e15bf92b..d61acf82 100644 --- a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp +++ b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.cpp @@ -1,11 +1,11 @@ -#include "Windowing/Frame/EditorWindowFrameOrchestrator.h" +#include "Frame/EditorWindowFrameOrchestrator.h" -#include "Composition/EditorContext.h" -#include "Composition/EditorShellRuntime.h" -#include "Composition/EditorShellVariant.h" -#include "Core/Windowing/EditorWindowMetrics.h" -#include "Windowing/EditorWindowDiagnostics.h" -#include "Windowing/EditorWindowVisuals.h" +#include "EditorContext.h" +#include "EditorShellRuntime.h" +#include "EditorShellVariant.h" +#include "Windowing/EditorWindowMetrics.h" +#include "EditorWindowDiagnostics.h" +#include "EditorWindowVisuals.h" #include #include diff --git a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h index e1f196ff..3d7c89c2 100644 --- a/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h +++ b/editor/app/Windowing/Frame/EditorWindowFrameOrchestrator.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/Windowing/EditorWindowTransferRequests.h" +#include "Windowing/EditorWindowTransferRequests.h" #include diff --git a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.cpp b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.cpp index bb1d5f77..69680b77 100644 --- a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.cpp +++ b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.cpp @@ -1,8 +1,8 @@ -#include "Windowing/Runtime/EditorWindowRuntimeController.h" +#include "Runtime/EditorWindowRuntimeController.h" -#include "Bootstrap/EditorResources.h" -#include "Support/EmbeddedPngLoader.h" -#include "Support/TextFormat.h" +#include "EditorResources.h" +#include "EmbeddedPngLoader.h" +#include "TextFormat.h" #include #include diff --git a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h index 954cf756..e6ea371c 100644 --- a/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h +++ b/editor/app/Windowing/Runtime/EditorWindowRuntimeController.h @@ -4,10 +4,10 @@ #define NOMINMAX #endif -#include "Windowing/Content/EditorWindowContentController.h" -#include "Windowing/Runtime/EditorWindowScreenshotController.h" +#include "Content/EditorWindowContentController.h" +#include "Runtime/EditorWindowScreenshotController.h" -#include +#include #include diff --git a/editor/app/Windowing/Runtime/EditorWindowScreenshotController.cpp b/editor/app/Windowing/Runtime/EditorWindowScreenshotController.cpp index b3964a88..ee16ae76 100644 --- a/editor/app/Windowing/Runtime/EditorWindowScreenshotController.cpp +++ b/editor/app/Windowing/Runtime/EditorWindowScreenshotController.cpp @@ -1,6 +1,6 @@ -#include "Windowing/Runtime/EditorWindowScreenshotController.h" +#include "Runtime/EditorWindowScreenshotController.h" -#include "Support/ExecutablePath.h" +#include "ExecutablePath.h" #include #include diff --git a/editor/app/main.cpp b/editor/app/main.cpp index 72140a93..e39cd812 100644 --- a/editor/app/main.cpp +++ b/editor/app/main.cpp @@ -1,4 +1,4 @@ -#include "Bootstrap/Application.h" +#include "Application.h" int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR, int nCmdShow) { return XCEngine::UI::Editor::RunXCEditor(hInstance, nCmdShow); diff --git a/tests/UI/Editor/unit/test_editor_host_command_bridge.cpp b/tests/UI/Editor/unit/test_editor_host_command_bridge.cpp index f6a5096d..7cf090d7 100644 --- a/tests/UI/Editor/unit/test_editor_host_command_bridge.cpp +++ b/tests/UI/Editor/unit/test_editor_host_command_bridge.cpp @@ -1,10 +1,10 @@ #include -#include "Core/Panels/EditorPanelIds.h" -#include "Commands/EditorEditCommandRoute.h" -#include "Commands/EditorHostCommandBridge.h" -#include "State/EditorCommandFocusService.h" -#include "State/EditorSession.h" +#include "Panels/EditorPanelIds.h" +#include "EditorEditCommandRoute.h" +#include "EditorHostCommandBridge.h" +#include "EditorCommandFocusService.h" +#include "EditorSession.h" namespace { diff --git a/tests/UI/Editor/unit/test_editor_project_runtime.cpp b/tests/UI/Editor/unit/test_editor_project_runtime.cpp index f063ddfc..8cf5419d 100644 --- a/tests/UI/Editor/unit/test_editor_project_runtime.cpp +++ b/tests/UI/Editor/unit/test_editor_project_runtime.cpp @@ -1,5 +1,5 @@ -#include "Services/Project/EditorProjectRuntime.h" -#include "State/EditorSelectionService.h" +#include "Project/EditorProjectRuntime.h" +#include "EditorSelectionService.h" #include diff --git a/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp b/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp index d5468ee6..d88d4416 100644 --- a/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp +++ b/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp @@ -1,6 +1,6 @@ #include -#include "Composition/EditorShellAssetBuilder.h" +#include "EditorShellAssetBuilder.h" #include diff --git a/tests/UI/Editor/unit/test_hierarchy_scene_binding.cpp b/tests/UI/Editor/unit/test_hierarchy_scene_binding.cpp index cf019d91..d1387b7d 100644 --- a/tests/UI/Editor/unit/test_hierarchy_scene_binding.cpp +++ b/tests/UI/Editor/unit/test_hierarchy_scene_binding.cpp @@ -1,5 +1,5 @@ -#include "Features/Hierarchy/HierarchyModel.h" -#include "Scene/EditorSceneBridge.h" +#include "Hierarchy/HierarchyModel.h" +#include "EditorSceneBridge.h" #include #include diff --git a/tests/UI/Editor/unit/test_inspector_presentation.cpp b/tests/UI/Editor/unit/test_inspector_presentation.cpp index 80e67c33..6f278855 100644 --- a/tests/UI/Editor/unit/test_inspector_presentation.cpp +++ b/tests/UI/Editor/unit/test_inspector_presentation.cpp @@ -1,8 +1,8 @@ -#include "Features/Inspector/Components/IInspectorComponentEditor.h" -#include "Features/Inspector/Components/InspectorComponentEditorRegistry.h" -#include "Features/Inspector/InspectorPresentationModel.h" -#include "Features/Inspector/InspectorSubject.h" -#include "Scene/EditorSceneRuntime.h" +#include "Inspector/Components/IInspectorComponentEditor.h" +#include "Inspector/Components/InspectorComponentEditorRegistry.h" +#include "Inspector/InspectorPresentationModel.h" +#include "Inspector/InspectorSubject.h" +#include "EditorSceneRuntime.h" #include #include diff --git a/tests/UI/Editor/unit/test_project_browser_model.cpp b/tests/UI/Editor/unit/test_project_browser_model.cpp index 4dc9fe1e..f0b20122 100644 --- a/tests/UI/Editor/unit/test_project_browser_model.cpp +++ b/tests/UI/Editor/unit/test_project_browser_model.cpp @@ -1,4 +1,4 @@ -#include "Services/Project/ProjectBrowserModel.h" +#include "Project/ProjectBrowserModel.h" #include diff --git a/tests/UI/Editor/unit/test_project_panel.cpp b/tests/UI/Editor/unit/test_project_panel.cpp index 99944096..3b6540cf 100644 --- a/tests/UI/Editor/unit/test_project_panel.cpp +++ b/tests/UI/Editor/unit/test_project_panel.cpp @@ -1,8 +1,8 @@ -#include "Features/Project/ProjectPanel.h" +#include "Project/ProjectPanel.h" #include "Ports/SystemInteractionPort.h" -#include "Rendering/Assets/BuiltInIcons.h" +#include "Assets/BuiltInIcons.h" -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include diff --git a/tests/UI/Editor/unit/test_scene_viewport_render_plan.cpp b/tests/UI/Editor/unit/test_scene_viewport_render_plan.cpp index 7388c2d0..80c927da 100644 --- a/tests/UI/Editor/unit/test_scene_viewport_render_plan.cpp +++ b/tests/UI/Editor/unit/test_scene_viewport_render_plan.cpp @@ -1,4 +1,4 @@ -#include "Rendering/Viewport/SceneViewportRenderPlan.h" +#include "Viewport/SceneViewportRenderPlan.h" #include #include diff --git a/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp b/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp index 8a4cb7a5..bc827c48 100644 --- a/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp +++ b/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp @@ -1,12 +1,12 @@ -#include "Scene/EditorSceneRuntime.h" -#include "Features/Scene/SceneViewportController.h" -#include "Features/Inspector/InspectorSubject.h" -#include "Rendering/Viewport/SceneViewportRenderService.h" -#include "Rendering/Viewport/ViewportHostService.h" +#include "EditorSceneRuntime.h" +#include "Scene/SceneViewportController.h" +#include "Inspector/InspectorSubject.h" +#include "Viewport/SceneViewportRenderService.h" +#include "Viewport/ViewportHostService.h" #include "Rendering/Viewport/ViewportRenderTargetInternal.h" -#include "State/EditorSelectionService.h" +#include "EditorSelectionService.h" -#include "Core/Panels/EditorPanelIds.h" +#include "Panels/EditorPanelIds.h" #include #include diff --git a/tests/UI/Editor/unit/test_structured_editor_shell.cpp b/tests/UI/Editor/unit/test_structured_editor_shell.cpp index 80fa7740..875e57fd 100644 --- a/tests/UI/Editor/unit/test_structured_editor_shell.cpp +++ b/tests/UI/Editor/unit/test_structured_editor_shell.cpp @@ -1,6 +1,6 @@ #include -#include "Composition/EditorShellAssetBuilder.h" +#include "EditorShellAssetBuilder.h" #include #include diff --git a/tests/UI/Editor/unit/test_ui_editor_panel_registry.cpp b/tests/UI/Editor/unit/test_ui_editor_panel_registry.cpp index 10fa442c..0d9ecc1a 100644 --- a/tests/UI/Editor/unit/test_ui_editor_panel_registry.cpp +++ b/tests/UI/Editor/unit/test_ui_editor_panel_registry.cpp @@ -1,6 +1,6 @@ #include -#include "Composition/EditorShellAssetBuilder.h" +#include "EditorShellAssetBuilder.h" #include