diff --git a/docs/plan/editor-core-refactor-plan.md b/docs/plan/editor-core-refactor-plan.md index c6ab1760..e416d29b 100644 --- a/docs/plan/editor-core-refactor-plan.md +++ b/docs/plan/editor-core-refactor-plan.md @@ -37,9 +37,9 @@ The app layer has a good directory vocabulary but enforcement is still incomplete: - `XCEditorCore` now limits its public app include surface to - `editor/app/Core`, `editor/app/Commands`, `editor/app/State`, and - `editor/app/Host/Interfaces`, and app/core sources now include through - explicit module roots instead of a private `editor/app` compatibility root. + `editor/app/Core` and `editor/app/Host/Interfaces`, and app/core sources now + include through explicit module roots instead of a private `editor/app` + compatibility root. Concrete host code has converged under `editor/app/Host/Win32` and `editor/app/Host/D3D12`. - Native editor resources now cross the app-core boundary through a neutral @@ -78,6 +78,10 @@ Completed boundary cuts: utility-window runtime contracts accept this service view instead of `EditorContext`, so concrete feature panels no longer depend on `Composition/EditorContext.h`. +- Command routing and shared state contracts now live under + `editor/app/Core/Commands` and `editor/app/Core/State`. `XCEditorCore`, + `XCEditor`, and app-facing tests expose those contracts through the single + `editor/app/Core` include surface instead of separate command/state roots. - Win32 now hands render startup a neutral `Rendering::Host::EditorWindowRenderRuntimeSurface` value, and D3D12 no longer includes `Platform/Win32/**` editor surface headers to obtain `HWND`. @@ -304,12 +308,10 @@ add_library(XCEditorCore STATIC ...) Initial contents: - `app/Core/**` -- `app/Commands/**` - `app/Composition/**` - `app/Features/**` - `app/Project/**` or `app/Services/Project/**` - `app/Scene/**` or `app/Services/Scene/**` -- `app/State/**` - `app/Core/UtilityWindows/**` - `app/Core/Windowing/**` - `app/Windowing/**` core files that do not require Win32 or D3D12 @@ -516,8 +518,8 @@ 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 exposes only `app/Core`, `app/Commands`, `app/State`, and - `app/Host/Interfaces` through its public usage requirements, and both +- `XCEditorCore` now exposes only `app/Core` and `app/Host/Interfaces` + through its public usage requirements, and both `XCEditorCore` and `XCEditor` enumerate explicit module roots instead of using `editor/app` as a compatibility include directory. - Concrete Win32 and D3D12 host implementations now live under diff --git a/editor/AGENTS.md b/editor/AGENTS.md index 3ce10ec7..e6d96ab7 100644 --- a/editor/AGENTS.md +++ b/editor/AGENTS.md @@ -32,8 +32,7 @@ change. include root or concrete Win32/D3D12 host dependencies. - `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/Interfaces`. + contracts under `app/Core` and `app/Host/Interfaces`. - `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`, @@ -68,7 +67,8 @@ change. `Application`. - `app/Core/` contains app-level contracts and shared app model definitions that are not owned by a concrete feature or composition implementation. - Current examples are panel IDs, shared window type contracts, host window + Current examples are command routing contracts, editor session/selection + state contracts, panel IDs, shared window type contracts, host window geometry/metrics, frame transfer requests, the panel-facing service view, the windowing-facing frame-services/shell-runtime contracts, scene-viewport request contracts, workspace-panel runtime interface, and @@ -98,8 +98,9 @@ change. panel factory. Shared utility-window contracts and descriptors live under `app/Core/UtilityWindows` so windowing can resolve utility window shape without constructing concrete feature panels. -- `app/Services/Project/`, `app/Scene/`, and `app/State/` hold application - services that panels should use instead of owning global state themselves. +- `app/Services/Project/` and `app/Scene/` hold application services that + panels should use instead of owning global state themselves. Shared app + state contracts live under `app/Core/State`. `ProjectBrowserModel` and `EditorProjectRuntime` live under `app/Services/Project`; project panels adapt those service models into widget-specific tree/list presentation data. @@ -347,8 +348,8 @@ inside pure shell/widget code. `XCENGINE_BUILD_XCUI_EDITOR_APP` as the switch for the concrete executable host. - `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/Interfaces`, `include`, and engine headers; + root. Its public usage requirements expose only `app/Core`, + `app/Host/Interfaces`, `include`, and engine headers; implementation files use explicit module roots instead of the app-wide compatibility root. - App-facing unit tests follow the same rule. `editor_app_core_tests` uses @@ -498,6 +499,10 @@ ownership rule. `app/Core/Panels/EditorPanelServices.h`. Workspace-panel and utility-window runtime contracts no longer expose `EditorContext`, and concrete feature panels no longer include `Composition/EditorContext.h`. +- Command and shared state contracts now live under `app/Core/Commands` and + `app/Core/State`. `XCEditorCore`, `XCEditor`, and app-facing tests no longer + expose `app/Commands` or `app/State` include roots; includes use + `Commands/...` and `State/...` through the single `app/Core` surface. - Project service ownership moved out of `app/Features`: `ProjectBrowserModel` and `EditorProjectRuntime` now live under `app/Services/Project`, and the Project panel owns the widget-tree projection instead of making the service diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index d33ec708..05ea344f 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -219,13 +219,13 @@ if(XCENGINE_BUILD_XCUI_EDITOR_CORE) ) set(XCUI_EDITOR_APP_STATE_SOURCES - app/State/EditorColorPickerToolState.cpp - app/State/EditorUtilityWindowRequestState.cpp - app/State/EditorSession.cpp + app/Core/State/EditorColorPickerToolState.cpp + app/Core/State/EditorUtilityWindowRequestState.cpp + app/Core/State/EditorSession.cpp ) set(XCUI_EDITOR_APP_COMMAND_SOURCES - app/Commands/EditorHostCommandBridge.cpp + app/Core/Commands/EditorHostCommandBridge.cpp ) set(XCUI_EDITOR_APP_COMPOSITION_SOURCES @@ -304,8 +304,6 @@ if(XCENGINE_BUILD_XCUI_EDITOR_CORE) target_include_directories(XCEditorCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/app/Core - ${CMAKE_CURRENT_SOURCE_DIR}/app/Commands - ${CMAKE_CURRENT_SOURCE_DIR}/app/State ${CMAKE_CURRENT_SOURCE_DIR}/app/Host/Interfaces ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/engine/include @@ -363,7 +361,6 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) target_include_directories(XCEditor PRIVATE ${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 @@ -373,7 +370,6 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ${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 diff --git a/editor/app/Composition/EditorContext.h b/editor/app/Composition/EditorContext.h index a64f3142..e2874421 100644 --- a/editor/app/Composition/EditorContext.h +++ b/editor/app/Composition/EditorContext.h @@ -6,12 +6,12 @@ #include "Project/EditorProjectRuntime.h" #include "UtilityWindows/EditorUtilityWindowRuntime.h" -#include "EditorHostCommandBridge.h" -#include "EditorColorPickerToolState.h" -#include "EditorCommandFocusService.h" -#include "EditorSelectionService.h" -#include "EditorSession.h" -#include "EditorUtilityWindowRequestState.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 #include #include diff --git a/editor/app/Commands/EditorEditCommandRoute.h b/editor/app/Core/Commands/EditorEditCommandRoute.h similarity index 100% rename from editor/app/Commands/EditorEditCommandRoute.h rename to editor/app/Core/Commands/EditorEditCommandRoute.h diff --git a/editor/app/Commands/EditorHostCommandBridge.cpp b/editor/app/Core/Commands/EditorHostCommandBridge.cpp similarity index 99% rename from editor/app/Commands/EditorHostCommandBridge.cpp rename to editor/app/Core/Commands/EditorHostCommandBridge.cpp index ead08bc4..30c07a1a 100644 --- a/editor/app/Commands/EditorHostCommandBridge.cpp +++ b/editor/app/Core/Commands/EditorHostCommandBridge.cpp @@ -1,4 +1,4 @@ -#include "EditorHostCommandBridge.h" +#include "Commands/EditorHostCommandBridge.h" #include #include diff --git a/editor/app/Commands/EditorHostCommandBridge.h b/editor/app/Core/Commands/EditorHostCommandBridge.h similarity index 95% rename from editor/app/Commands/EditorHostCommandBridge.h rename to editor/app/Core/Commands/EditorHostCommandBridge.h index 53cad861..6c515b15 100644 --- a/editor/app/Commands/EditorHostCommandBridge.h +++ b/editor/app/Core/Commands/EditorHostCommandBridge.h @@ -1,8 +1,8 @@ #pragma once -#include "EditorEditCommandRoute.h" -#include "EditorCommandFocusService.h" -#include "EditorSession.h" +#include "Commands/EditorEditCommandRoute.h" +#include "State/EditorCommandFocusService.h" +#include "State/EditorSession.h" #include diff --git a/editor/app/State/EditorColorPickerToolState.cpp b/editor/app/Core/State/EditorColorPickerToolState.cpp similarity index 96% rename from editor/app/State/EditorColorPickerToolState.cpp rename to editor/app/Core/State/EditorColorPickerToolState.cpp index 77fb9497..3f093623 100644 --- a/editor/app/State/EditorColorPickerToolState.cpp +++ b/editor/app/Core/State/EditorColorPickerToolState.cpp @@ -1,4 +1,4 @@ -#include "EditorColorPickerToolState.h" +#include "State/EditorColorPickerToolState.h" #include diff --git a/editor/app/State/EditorColorPickerToolState.h b/editor/app/Core/State/EditorColorPickerToolState.h similarity index 100% rename from editor/app/State/EditorColorPickerToolState.h rename to editor/app/Core/State/EditorColorPickerToolState.h diff --git a/editor/app/State/EditorCommandFocusService.h b/editor/app/Core/State/EditorCommandFocusService.h similarity index 98% rename from editor/app/State/EditorCommandFocusService.h rename to editor/app/Core/State/EditorCommandFocusService.h index 3b201101..159ef0e6 100644 --- a/editor/app/State/EditorCommandFocusService.h +++ b/editor/app/Core/State/EditorCommandFocusService.h @@ -1,6 +1,6 @@ #pragma once -#include "EditorSession.h" +#include "State/EditorSession.h" #include diff --git a/editor/app/State/EditorSelectionService.h b/editor/app/Core/State/EditorSelectionService.h similarity index 97% rename from editor/app/State/EditorSelectionService.h rename to editor/app/Core/State/EditorSelectionService.h index 7460a854..e7ddd0ae 100644 --- a/editor/app/State/EditorSelectionService.h +++ b/editor/app/Core/State/EditorSelectionService.h @@ -1,7 +1,7 @@ #pragma once -#include "EditorSelectionStamp.h" -#include "EditorSession.h" +#include "State/EditorSelectionStamp.h" +#include "State/EditorSession.h" #include #include diff --git a/editor/app/State/EditorSelectionStamp.h b/editor/app/Core/State/EditorSelectionStamp.h similarity index 100% rename from editor/app/State/EditorSelectionStamp.h rename to editor/app/Core/State/EditorSelectionStamp.h diff --git a/editor/app/State/EditorSession.cpp b/editor/app/Core/State/EditorSession.cpp similarity index 98% rename from editor/app/State/EditorSession.cpp rename to editor/app/Core/State/EditorSession.cpp index 91f2948b..ac2f80a1 100644 --- a/editor/app/State/EditorSession.cpp +++ b/editor/app/Core/State/EditorSession.cpp @@ -1,4 +1,4 @@ -#include "EditorSession.h" +#include "State/EditorSession.h" #include "Panels/EditorPanelIds.h" diff --git a/editor/app/State/EditorSession.h b/editor/app/Core/State/EditorSession.h similarity index 100% rename from editor/app/State/EditorSession.h rename to editor/app/Core/State/EditorSession.h diff --git a/editor/app/State/EditorUtilityWindowRequestState.cpp b/editor/app/Core/State/EditorUtilityWindowRequestState.cpp similarity index 92% rename from editor/app/State/EditorUtilityWindowRequestState.cpp rename to editor/app/Core/State/EditorUtilityWindowRequestState.cpp index d4b57403..23dc9d7b 100644 --- a/editor/app/State/EditorUtilityWindowRequestState.cpp +++ b/editor/app/Core/State/EditorUtilityWindowRequestState.cpp @@ -1,4 +1,4 @@ -#include "EditorUtilityWindowRequestState.h" +#include "State/EditorUtilityWindowRequestState.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/State/EditorUtilityWindowRequestState.h b/editor/app/Core/State/EditorUtilityWindowRequestState.h similarity index 100% rename from editor/app/State/EditorUtilityWindowRequestState.h rename to editor/app/Core/State/EditorUtilityWindowRequestState.h diff --git a/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h b/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h index 0a410d10..144da34a 100644 --- a/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h +++ b/editor/app/Core/WorkspacePanels/EditorWorkspacePanelRuntime.h @@ -1,7 +1,7 @@ #pragma once -#include "EditorEditCommandRoute.h" -#include "EditorSession.h" +#include "Commands/EditorEditCommandRoute.h" +#include "State/EditorSession.h" #include "Panels/EditorPanelServices.h" #include diff --git a/editor/app/Features/ColorPicker/ColorPickerPanel.cpp b/editor/app/Features/ColorPicker/ColorPickerPanel.cpp index 98595b40..1b142f43 100644 --- a/editor/app/Features/ColorPicker/ColorPickerPanel.cpp +++ b/editor/app/Features/ColorPicker/ColorPickerPanel.cpp @@ -1,7 +1,7 @@ #include "ColorPickerPanel.h" #include "Panels/EditorPanelServices.h" -#include "EditorColorPickerToolState.h" +#include "State/EditorColorPickerToolState.h" #include #include diff --git a/editor/app/Features/Console/ConsolePanel.h b/editor/app/Features/Console/ConsolePanel.h index 343eb4bb..ce540e89 100644 --- a/editor/app/Features/Console/ConsolePanel.h +++ b/editor/app/Features/Console/ConsolePanel.h @@ -1,6 +1,6 @@ #pragma once -#include "EditorSession.h" +#include "State/EditorSession.h" #include diff --git a/editor/app/Features/Hierarchy/HierarchyPanel.cpp b/editor/app/Features/Hierarchy/HierarchyPanel.cpp index c727918a..eb2cd4d7 100644 --- a/editor/app/Features/Hierarchy/HierarchyPanel.cpp +++ b/editor/app/Features/Hierarchy/HierarchyPanel.cpp @@ -3,7 +3,7 @@ #include #include #include "EditorSceneRuntime.h" -#include "EditorCommandFocusService.h" +#include "State/EditorCommandFocusService.h" #include #include #include diff --git a/editor/app/Features/Hierarchy/HierarchyPanel.h b/editor/app/Features/Hierarchy/HierarchyPanel.h index e2aa7d0b..d58d9ccb 100644 --- a/editor/app/Features/Hierarchy/HierarchyPanel.h +++ b/editor/app/Features/Hierarchy/HierarchyPanel.h @@ -2,7 +2,7 @@ #include "HierarchyModel.h" -#include "EditorEditCommandRoute.h" +#include "Commands/EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Inspector/InspectorPanel.cpp b/editor/app/Features/Inspector/InspectorPanel.cpp index 0d0ea47c..0bb69115 100644 --- a/editor/app/Features/Inspector/InspectorPanel.cpp +++ b/editor/app/Features/Inspector/InspectorPanel.cpp @@ -2,7 +2,7 @@ #include "Panels/EditorPanelServices.h" #include "UtilityWindows/EditorUtilityWindowRuntime.h" -#include "EditorColorPickerToolState.h" +#include "State/EditorColorPickerToolState.h" #include #include #include @@ -12,7 +12,7 @@ #include "Inspector/Components/InspectorComponentEditorRegistry.h" #include "EditorSceneRuntime.h" #include "Project/EditorProjectRuntime.h" -#include "EditorCommandFocusService.h" +#include "State/EditorCommandFocusService.h" #include #include diff --git a/editor/app/Features/Inspector/InspectorPanel.h b/editor/app/Features/Inspector/InspectorPanel.h index af2feaff..9abd6dfa 100644 --- a/editor/app/Features/Inspector/InspectorPanel.h +++ b/editor/app/Features/Inspector/InspectorPanel.h @@ -3,7 +3,7 @@ #include "Inspector/InspectorPresentationModel.h" #include "Inspector/InspectorSubject.h" -#include "EditorEditCommandRoute.h" +#include "Commands/EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Inspector/InspectorSubject.h b/editor/app/Features/Inspector/InspectorSubject.h index 258216f8..39851c21 100644 --- a/editor/app/Features/Inspector/InspectorSubject.h +++ b/editor/app/Features/Inspector/InspectorSubject.h @@ -1,6 +1,6 @@ #pragma once -#include "EditorSession.h" +#include "State/EditorSession.h" #include #include diff --git a/editor/app/Features/Project/ProjectPanel.cpp b/editor/app/Features/Project/ProjectPanel.cpp index 6f89074a..aecd1867 100644 --- a/editor/app/Features/Project/ProjectPanel.cpp +++ b/editor/app/Features/Project/ProjectPanel.cpp @@ -8,7 +8,7 @@ #include #include "SystemInteractionService.h" #include "Project/EditorProjectRuntime.h" -#include "EditorCommandFocusService.h" +#include "State/EditorCommandFocusService.h" #include #include #include diff --git a/editor/app/Features/Project/ProjectPanel.h b/editor/app/Features/Project/ProjectPanel.h index 7fdb8d9d..6cdc6693 100644 --- a/editor/app/Features/Project/ProjectPanel.h +++ b/editor/app/Features/Project/ProjectPanel.h @@ -3,7 +3,7 @@ #include "Project/EditorProjectRuntime.h" #include "Project/ProjectBrowserModel.h" -#include "EditorEditCommandRoute.h" +#include "Commands/EditorEditCommandRoute.h" #include #include #include diff --git a/editor/app/Features/Scene/SceneEditCommandRoute.h b/editor/app/Features/Scene/SceneEditCommandRoute.h index bc86c401..83169a38 100644 --- a/editor/app/Features/Scene/SceneEditCommandRoute.h +++ b/editor/app/Features/Scene/SceneEditCommandRoute.h @@ -1,6 +1,6 @@ #pragma once -#include "EditorEditCommandRoute.h" +#include "Commands/EditorEditCommandRoute.h" #include diff --git a/editor/app/Features/Scene/SceneViewportController.cpp b/editor/app/Features/Scene/SceneViewportController.cpp index 80c9cf98..17aaff7e 100644 --- a/editor/app/Features/Scene/SceneViewportController.cpp +++ b/editor/app/Features/Scene/SceneViewportController.cpp @@ -2,7 +2,7 @@ #include "Viewport/ViewportObjectPickerService.h" #include "EditorSceneRuntime.h" -#include "EditorCommandFocusService.h" +#include "State/EditorCommandFocusService.h" #include "Panels/EditorPanelIds.h" #include diff --git a/editor/app/Features/Scene/SceneViewportFeature.cpp b/editor/app/Features/Scene/SceneViewportFeature.cpp index bc578457..bd48cf03 100644 --- a/editor/app/Features/Scene/SceneViewportFeature.cpp +++ b/editor/app/Features/Scene/SceneViewportFeature.cpp @@ -5,7 +5,7 @@ #include "Viewport/SceneViewportResourcePaths.h" #include "Viewport/ViewportHostService.h" #include "EditorSceneRuntime.h" -#include "EditorCommandFocusService.h" +#include "State/EditorCommandFocusService.h" namespace XCEngine::UI::Editor::App { diff --git a/editor/app/Scene/EditorSceneRuntime.h b/editor/app/Scene/EditorSceneRuntime.h index 05c8e0b2..64ebcf98 100644 --- a/editor/app/Scene/EditorSceneRuntime.h +++ b/editor/app/Scene/EditorSceneRuntime.h @@ -3,7 +3,7 @@ #include "EditorSceneBridge.h" #include "SceneViewportCameraController.h" #include "SceneToolState.h" -#include "EditorSelectionService.h" +#include "State/EditorSelectionService.h" #include "Scene/SceneViewportRenderRequest.h" #include diff --git a/editor/app/Services/Project/EditorProjectRuntime.h b/editor/app/Services/Project/EditorProjectRuntime.h index cab644bf..46358e1d 100644 --- a/editor/app/Services/Project/EditorProjectRuntime.h +++ b/editor/app/Services/Project/EditorProjectRuntime.h @@ -2,8 +2,8 @@ #include "Project/ProjectBrowserModel.h" -#include "EditorSelectionService.h" -#include "EditorSession.h" +#include "State/EditorSelectionService.h" +#include "State/EditorSession.h" #include diff --git a/tests/UI/Editor/unit/CMakeLists.txt b/tests/UI/Editor/unit/CMakeLists.txt index b7248048..c9091f2d 100644 --- a/tests/UI/Editor/unit/CMakeLists.txt +++ b/tests/UI/Editor/unit/CMakeLists.txt @@ -128,14 +128,12 @@ if(TARGET XCEditorCore) target_include_directories(editor_app_core_tests PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Commands ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Composition ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Core ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Features ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Host/Interfaces ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Scene ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Services - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/State ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Support ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include ${CMAKE_SOURCE_DIR}/engine/include @@ -172,7 +170,6 @@ if(TARGET XCEditorCore) target_include_directories(editor_app_feature_tests PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Commands ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Composition ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Core ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Features @@ -180,7 +177,6 @@ if(TARGET XCEditorCore) ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Rendering ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Scene ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Services - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/State ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Support ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include ${CMAKE_SOURCE_DIR}/engine/include 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 7cf090d7..f7cc5c86 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 "Panels/EditorPanelIds.h" -#include "EditorEditCommandRoute.h" -#include "EditorHostCommandBridge.h" -#include "EditorCommandFocusService.h" -#include "EditorSession.h" +#include "Commands/EditorEditCommandRoute.h" +#include "Commands/EditorHostCommandBridge.h" +#include "State/EditorCommandFocusService.h" +#include "State/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 8cf5419d..fd01840d 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 "Project/EditorProjectRuntime.h" -#include "EditorSelectionService.h" +#include "State/EditorSelectionService.h" #include diff --git a/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp b/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp index 3d2798a1..f3c679b7 100644 --- a/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp +++ b/tests/UI/Editor/unit/test_scene_viewport_runtime.cpp @@ -5,7 +5,7 @@ #include "Viewport/ViewportHostService.h" #include "Viewport/ViewportRenderTargets.h" #include "Viewport/ViewportRenderTargetUtils.h" -#include "EditorSelectionService.h" +#include "State/EditorSelectionService.h" #include "Panels/EditorPanelIds.h" #include