From 24502babefe8fb2f659ea91e4dd89140966d8265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E9=A3=8E=E9=80=8D=E9=81=A5=E6=B8=B8?= Date: Sun, 6 Sep 2026 17:56:12 +0800 Subject: [PATCH] Nest satellite packages under their host modules. Keep CMake module names and trim switches, but stop flattening editing/editor and runtime bridges as top-level src/modules directories. Parent scans skip nested facets so runtime-3d can drop authoring by directory leaf. Co-authored-by: Cursor --- AGENTS.md | 7 +- CMakeLists.txt | 13 +- cmake/collect_module_sources.cmake | 20 ++- cmake/install_sdk.cmake | 34 +++-- cmake/module_manifest/orchestration.cmake | 9 +- cmake/modules.cmake | 142 +++++++++++++++++- cmake/rescan_source.cmake | 5 +- cmake/scan_source.cmake | 5 +- ...08-18-network-module-improvement-design.md | 2 +- .../specs/2026-08-18-test-suite-pruning.md | 2 +- docs/dev/模块编排与裁剪架构.md | 33 +++- docs/usr/modules/pixelworld_editor.md | 2 +- docs/usr/modules/pixelworld_replay.md | 2 +- docs/usr/modules/pixelworld_streaming.md | 2 +- scripts/architecture_contracts.json | 4 +- scripts/check_module_manifest.py | 97 ++++++++++-- scripts/module_depgraph.py | 57 +++++-- scripts/profile_matrix.py | 17 +-- .../editor}/ActionEditingCommands.cpp | 4 +- .../editor}/ActionEditingCommands.h | 0 .../editor}/ActionEditorModule.cpp | 8 +- .../editor}/ActionEditorModule.h | 0 .../editor}/ActionPreviewController.cpp | 2 +- .../editor}/ActionPreviewController.h | 2 +- .../editor}/ActionTimelineEditor.cpp | 2 +- .../editor}/ActionTimelineEditor.h | 0 .../editor}/ActionTimelineScriptBindings.cpp | 8 +- .../editor}/ActionTimelineScriptBindings.h | 0 .../editor}/ActionTimelineWidget.cpp | 2 +- .../editor}/ActionTimelineWidget.h | 2 +- .../AnimationRootMotionPreviewSource.cpp | 2 +- .../AnimationRootMotionPreviewSource.h | 0 .../editing}/AnimationClip.cpp | 2 +- .../editing}/AnimationClip.h | 2 +- .../editing}/AnimationClipRuntime.cpp | 2 +- .../editing}/AnimationEditingCommands.cpp | 4 +- .../editing}/AnimationEditingCommands.h | 0 .../editing}/AnimationEditingTypes.h | 0 .../editing}/AnimationGraph.cpp | 2 +- .../editing}/AnimationGraph.h | 2 +- .../editing}/AnimationGraphRuntime.cpp | 2 +- .../editing}/ProceduralBoneOverlay.cpp | 2 +- .../editing}/ProceduralBoneOverlay.h | 0 .../editing}/SkeletonOverlay.cpp | 2 +- .../editing}/SkeletonOverlay.h | 0 .../editing}/SkeletonOverlayRuntime.cpp | 2 +- .../editor}/AnimationClipEditor.cpp | 2 +- .../editor}/AnimationClipEditor.h | 4 +- .../AnimationClipEditorScriptBindings.cpp | 6 +- .../AnimationClipEditorScriptBindings.h | 0 .../editor}/AnimationEditorModule.cpp | 8 +- .../editor}/AnimationEditorModule.h | 0 .../editor}/EditorAnimationClip.h | 2 +- .../editor}/EditorAnimationGraph.h | 2 +- .../editor}/EditorSkeletonOverlay.h | 2 +- .../animation/editor/animation_editor.cpp | 4 + .../animation_editor/animation_editor.cpp | 4 - .../graphics}/EvpackGraphicsLoader.cpp | 2 +- .../graphics}/EvpackGraphicsLoader.h | 0 .../graphics}/EvpackImageLoader.cpp | 2 +- .../graphics}/EvpackImageLoader.h | 0 .../graphics}/GraphicsImageFactoryAdapter.cpp | 2 +- .../graphics}/GraphicsMeshFactoryAdapter.cpp | 2 +- .../import}/AssetCommand.cpp | 8 +- .../import}/AssetImporter.h | 0 .../import}/GltfImporter.cpp | 4 +- .../import}/ImageImporter.cpp | 4 +- .../import}/ImportCommon.h | 2 +- .../import}/ImportReport.cpp | 2 +- .../import}/LegacyAnimationImporter.cpp | 4 +- .../import}/LegacyAnimationImporter.h | 2 +- .../import}/TerrainImporter.cpp | 4 +- .../import}/TerrainImporter.h | 2 +- .../import}/UnityImporter.cpp | 4 +- .../import}/UnityImporter.h | 2 +- .../import}/UnrealImporter.cpp | 4 +- .../import}/UnrealImporter.h | 2 +- .../procgen}/EvpackInstanceSetLoader.cpp | 2 +- .../procgen}/EvpackInstanceSetLoader.h | 0 .../procgen}/EvpackPointGraphLoader.cpp | 2 +- .../procgen}/EvpackPointGraphLoader.h | 0 .../procgen}/EvpackTerrainLoader.cpp | 2 +- .../procgen}/EvpackTerrainLoader.h | 0 .../procgen}/EvpackTerrainMaterialLoader.cpp | 2 +- .../procgen}/EvpackTerrainMaterialLoader.h | 0 .../scene}/EvpackSceneTemplateLoader.cpp | 2 +- .../scene}/EvpackSceneTemplateLoader.h | 0 .../editing}/AudioEditingCommands.cpp | 4 +- .../editing}/AudioEditingCommands.h | 0 .../editing}/AudioEditingProvider.cpp | 2 +- .../editing}/AudioEditingProvider.h | 2 +- .../editing}/AudioEditingTypes.h | 0 .../editing}/AudioEffects.cpp | 2 +- .../editing}/AudioEffects.h | 2 +- .../editing}/AudioImportDiagnostics.cpp | 2 +- .../editing}/AudioImportDiagnostics.h | 2 +- .../editing}/AudioMixerTarget.cpp | 2 +- .../editing}/AudioPublishingTarget.cpp | 2 +- .../editing}/AudioRuntime.cpp | 2 +- .../editing}/AudioSerialization.cpp | 2 +- .../editing}/AudioTarget.cpp | 2 +- .../editing}/AudioTarget.h | 2 +- .../editing}/AudioTransport.cpp | 2 +- .../editing}/AudioTransport.h | 2 +- .../editing}/AudioTransportRuntime.cpp | 2 +- .../editing}/AudioWaveform.cpp | 2 +- .../editing}/AudioWaveform.h | 2 +- .../editor}/AudioEditorModule.cpp | 10 +- .../editor}/AudioEditorModule.h | 0 .../editor}/AudioSourceEditor.cpp | 4 +- .../editor}/AudioSourceEditor.h | 6 +- .../AudioSourceEditorScriptBindings.cpp | 6 +- .../editor}/AudioSourceEditorScriptBindings.h | 0 .../editor}/EditorAudioEffects.h | 4 +- .../editor}/EditorAudioImportDiagnostics.h | 4 +- .../editor}/EditorAudioTarget.h | 2 +- .../editor}/EditorAudioTransport.h | 2 +- .../editor}/EditorAudioWaveform.h | 2 +- src/modules/audio/editor/audio_editor.cpp | 6 + src/modules/audio_editor/audio_editor.cpp | 6 - .../editing}/AvatarEditingCommands.cpp | 4 +- .../editing}/AvatarEditingCommands.h | 0 .../editing}/AvatarRuntime.cpp | 2 +- .../editing}/AvatarTarget.cpp | 2 +- .../editing}/AvatarTarget.h | 0 .../editor}/AvatarDocumentEditor.cpp | 2 +- .../editor}/AvatarDocumentEditor.h | 2 +- .../AvatarDocumentEditorScriptBindings.cpp | 6 +- .../AvatarDocumentEditorScriptBindings.h | 0 .../editor}/AvatarEditorModule.h | 0 .../editor}/EditorAvatarTarget.h | 2 +- .../editor}/avatar_editor.cpp | 10 +- .../editing}/BuildingTarget.cpp | 2 +- .../editing}/BuildingTarget.h | 0 .../editor}/BuildingEdgeCurveTool.cpp | 2 +- .../editor}/EditorBuildingTarget.h | 2 +- .../editor}/building_editor.cpp | 2 +- .../fx}/BuildingFx.cpp | 2 +- .../{buildingfx => building/fx}/BuildingFx.h | 0 .../editing}/CameraRuntime.cpp | 2 +- .../editing}/CameraTarget.cpp | 2 +- .../editing}/CameraTarget.h | 0 .../editor}/EditorCameraTarget.h | 4 +- .../editor}/camera_editor.cpp | 2 +- .../editing}/CrowdDocument.cpp | 2 +- .../editing}/CrowdDocument.h | 0 .../editing}/CrowdRuntime.cpp | 2 +- .../editor}/EditorCrowdDocument.h | 2 +- .../editor}/crowd_editor.cpp | 2 +- .../editing}/DecalGizmo.cpp | 2 +- .../editing}/DecalRuntime.cpp | 2 +- .../editing}/DecalTarget.cpp | 2 +- .../editing}/DecalTarget.h | 0 .../editor}/EditorDecalTarget.h | 2 +- .../editor}/decal_editor.cpp | 2 +- .../editing}/DefinitionForm.h | 2 +- .../editing}/DefinitionFormRuntime.cpp | 2 +- .../editing}/DefinitionRuntime.cpp | 2 +- .../editing}/DefinitionTarget.cpp | 2 +- .../editing}/DefinitionTarget.h | 0 .../editor}/EditorDefinitionForm.h | 2 +- .../editor}/EditorDefinitionTarget.h | 2 +- .../editor}/definitions_editor.cpp | 2 +- .../editing}/DialogueEditingTypes.h | 0 .../editing}/DialogueGraph.cpp | 2 +- .../editing}/DialogueGraph.h | 2 +- .../editing}/DialogueGraphRuntime.cpp | 2 +- .../editor}/EditorDialogueGraph.h | 2 +- .../editor}/EditorDialoguePreview.cpp | 2 +- .../editor}/EditorDialoguePreview.h | 2 +- .../gizmo/editing}/DomainGizmoPreview.cpp | 8 +- .../gizmo/editing}/DomainGizmoPreview.h | 6 +- .../gizmo/editor}/EditorGizmoPreview.h | 2 +- .../gizmo/editor}/domain_gizmo_editor.cpp | 2 +- .../input/editing}/InputMapTarget.cpp | 2 +- .../input/editing}/InputMapTarget.h | 0 .../input/editor}/EditorInputMapTarget.h | 2 +- .../input/editor}/input_editor.cpp | 2 +- .../queue/editing}/QueueInspector.cpp | 2 +- .../queue/editing}/QueueInspector.h | 0 .../queue/editor}/EditorQueueInspector.h | 2 +- .../queue/editor}/queue_editor.cpp | 2 +- .../editing}/FluidRuntime.cpp | 2 +- .../editing}/FluidTarget.cpp | 2 +- .../editing}/FluidTarget.h | 0 .../editing}/SurfaceFluidRuntime.cpp | 2 +- .../editing}/SurfaceFluidTarget.cpp | 2 +- .../editing}/SurfaceFluidTarget.h | 0 .../editor}/EditorFluidTarget.h | 2 +- .../editor}/EditorSurfaceFluidOffscreen.cpp | 2 +- .../editor}/EditorSurfaceFluidPreview.cpp | 2 +- .../editor}/EditorSurfaceFluidPreview.h | 4 +- .../editor}/EditorSurfaceFluidTarget.h | 2 +- .../editing}/OffscreenPreview.cpp | 2 +- .../editing}/OffscreenPreview.h | 0 .../editing}/PrimitiveGizmoRenderer.cpp | 2 +- .../editing}/PrimitiveGizmoRenderer.h | 0 .../editor}/EditorOffscreenPreview.h | 2 +- .../editor}/GraphicsEditorModule.cpp | 4 +- .../editor}/GraphicsEditorModule.h | 0 .../editor}/ReflectionProbeVisualizer.cpp | 2 +- .../editor}/ReflectionProbeVisualizer.h | 0 .../editing}/EnvironmentDayNightRuntime.cpp | 2 +- .../editing}/EnvironmentWeatherRuntime.cpp | 2 +- .../lighting/editing}/LightingRuntime.cpp | 2 +- .../lighting/editing}/LightingTarget.cpp | 2 +- .../lighting/editing}/LightingTarget.h | 0 .../lighting/editor}/EditorLightingTarget.h | 2 +- .../lighting/editor}/lighting_editor.cpp | 2 +- .../editing}/MaterialEditingCommands.cpp | 2 +- .../editing}/MaterialEditingCommands.h | 0 .../material/editing}/MaterialGraph.cpp | 2 +- .../material/editing}/MaterialGraph.h | 0 .../editing}/MaterialPublishingTarget.cpp | 2 +- .../material/editing}/MaterialTarget.cpp | 2 +- .../material/editing}/MaterialTarget.h | 0 .../material/editor}/EditorGraph.h | 2 +- .../editor}/EditorMaterialOffscreen.cpp | 2 +- .../editor}/EditorMaterialOffscreen.h | 4 +- .../editor}/EditorMaterialPreview.cpp | 2 +- .../material/editor}/EditorMaterialPreview.h | 2 +- .../material/editor}/EditorMaterialStudio.cpp | 2 +- .../material/editor}/EditorMaterialStudio.h | 2 +- .../material/editor}/EditorMaterialTarget.h | 2 +- .../material/editor}/MaterialEditorModule.cpp | 6 +- .../material/editor}/MaterialEditorModule.h | 0 .../graphics_editing}/MaterialRuntime.cpp | 2 +- .../editing}/Hd2dRuntime.cpp | 2 +- .../editing}/Hd2dTarget.cpp | 2 +- .../editing}/Hd2dTarget.h | 0 .../editor}/EditorHd2dTarget.h | 2 +- .../editor}/hd2d_editor.cpp | 2 +- .../editing}/HouseGenRuntime.cpp | 2 +- .../editing}/HouseGenTarget.cpp | 2 +- .../editing}/HouseGenTarget.h | 0 .../editor}/EditorHouseGenTarget.h | 4 +- .../editor}/housegen_editor.cpp | 2 +- .../editing}/LocalizationDocument.cpp | 2 +- .../editing}/LocalizationDocument.h | 0 .../editing}/LocalizationRuntime.cpp | 2 +- .../editor}/EditorLocalization.h | 2 +- .../editor}/localization_editor.cpp | 2 +- .../editing}/MapDocument.cpp | 2 +- .../editing}/MapDocument.h | 2 +- .../editing}/MapEditingTypes.h | 0 .../editing}/MapIntegration.cpp | 2 +- .../editing}/TileLayerTarget.cpp | 2 +- .../editing}/TileLayerTarget.h | 0 .../editor}/EditorMapDocument.h | 2 +- .../{map_editor => map/editor}/map_editor.cpp | 2 +- .../level/editing}/Brush.cpp | 2 +- .../level/editing}/Brush.h | 2 +- .../level/editing}/EditorHistory.cpp | 2 +- .../level/editing}/EditorHistory.h | 2 +- .../level/editing}/FieldTargets.cpp | 4 +- .../level/editing}/FieldTargets.h | 0 .../level/editing}/LevelDocument.cpp | 2 +- .../level/editing}/LevelDocument.h | 2 +- .../level/editing}/LevelFormat.cpp | 4 +- .../level/editing}/LevelFormat.h | 0 .../level/editing}/TileBuffer.cpp | 2 +- .../level/editing}/TileBuffer.h | 0 .../level/editor}/LevelEditorModule.cpp | 10 +- .../level/editor}/LevelEditorModule.h | 0 .../TileLayerTargetModule.cpp | 4 +- .../tilelayer_target/TileLayerTargetModule.h | 0 .../editing}/NetworkTelemetry.cpp | 2 +- .../editing}/NetworkTelemetry.h | 0 .../editing}/NetworkTelemetryRuntime.cpp | 2 +- .../editor}/EditorNetworkTelemetry.h | 2 +- .../editor}/network_editor.cpp | 2 +- .../editing}/BehaviorGraph.cpp | 2 +- .../editing}/BehaviorGraph.h | 2 +- .../editing}/NpcAiEditingTypes.h | 0 .../editor}/EditorBehaviorGraph.h | 2 +- .../editor}/npc_ai_editor.cpp | 2 +- .../editing}/ParticleGraph.cpp | 2 +- .../editing}/ParticleGraph.h | 2 +- .../editing}/ParticleGraphRuntime.cpp | 2 +- .../editing}/ParticlesEditingTypes.h | 0 .../editor}/EditorParticleGraph.h | 2 +- .../editor}/EditorParticleOffscreen.h | 2 +- .../editor}/particles_editor.cpp | 2 +- .../graphics_editing}/ParticleOffscreen.cpp | 2 +- .../graphics_editing}/ParticleOffscreen.h | 4 +- .../ParticleOffscreenRuntime.cpp | 2 +- .../editing}/PhysicsColliderAsset.cpp | 2 +- .../editing}/PhysicsColliderAsset.h | 0 .../editing}/PhysicsEditingProvider.cpp | 2 +- .../editing}/PhysicsEditingProvider.h | 2 +- .../editing}/PhysicsJointTarget.cpp | 2 +- .../editing}/PhysicsPublishingTarget.cpp | 2 +- .../editing}/PhysicsRuntime.cpp | 2 +- .../editing}/PhysicsSerialization.cpp | 2 +- .../editing}/PhysicsTarget.cpp | 2 +- .../editing}/PhysicsTarget.h | 2 +- .../editor}/EditorPhysicsAsset.cpp | 2 +- .../editor}/EditorPhysicsAsset.h | 2 +- .../editor}/EditorPhysicsTarget.h | 2 +- .../editor}/PixelWorldCatalogPanel.cpp | 2 +- .../editor}/PixelWorldCatalogPanel.h | 0 .../editor}/PixelWorldEditorModule.cpp | 2 +- .../editor}/PixelWorldEditorModule.h | 2 +- .../graphics}/PixelWorldGraphics.cpp | 2 +- .../graphics}/PixelWorldGraphics.h | 0 .../physics}/PixelWorldPhysics.cpp | 2 +- .../physics}/PixelWorldPhysics.h | 0 .../replay}/PixelWorldReplay.cpp | 2 +- .../replay}/PixelWorldReplay.h | 0 .../streaming}/PixelWorldArchive.cpp | 2 +- .../streaming}/PixelWorldStreaming.cpp | 2 +- .../streaming}/PixelWorldStreaming.h | 0 .../streaming}/PixelWorldTransport.cpp | 2 +- .../streaming}/PixelWorldTransport.h | 2 +- .../thread}/PixelWorldThread.cpp | 2 +- .../thread}/PixelWorldThread.h | 0 .../biome/editing}/BiomeEditingCommands.cpp | 4 +- .../biome/editing}/BiomeEditingCommands.h | 0 .../biome/editing}/BiomeRuntime.cpp | 2 +- .../biome/editing}/BiomeTarget.cpp | 2 +- .../biome/editing}/BiomeTarget.h | 0 .../biome/editor}/BiomeEditorModule.h | 0 .../biome/editor}/BiomeRulesEditor.cpp | 2 +- .../biome/editor}/BiomeRulesEditor.h | 2 +- .../BiomeRulesEditorScriptBindings.cpp | 6 +- .../editor}/BiomeRulesEditorScriptBindings.h | 0 .../biome/editor}/EditorBiomeTarget.h | 2 +- .../biome/editor}/biome_editor.cpp | 8 +- .../editing}/HeightmapBrush.h | 0 .../editing}/HeightmapTarget.cpp | 2 +- .../editing}/HeightmapTarget.h | 2 +- .../editing}/PcgGraph.cpp | 2 +- .../editing}/PcgGraph.h | 2 +- .../editing}/ProcgenEditingTypes.h | 0 .../editing}/ProcgenScriptTarget.cpp | 2 +- .../editing}/ProcgenScriptTarget.h | 0 .../editing}/TextureRecipeTarget.cpp | 2 +- .../editing}/TextureRecipeTarget.h | 0 .../editor}/EditorPcgGraph.h | 2 +- .../editor}/EditorTextureRecipeTarget.h | 2 +- .../editor}/ProcgenEditorModule.h | 0 .../editor}/ProcgenScriptEditor.cpp | 2 +- .../editor}/ProcgenScriptEditor.h | 2 +- .../ProcgenScriptEditorScriptBindings.cpp | 6 +- .../ProcgenScriptEditorScriptBindings.h | 0 .../editor}/procgen_editor.cpp | 6 +- .../graphics_editing}/HeightmapMesh.cpp | 2 +- .../graphics_editing}/HeightmapMesh.h | 0 .../HeightmapTargetModule.cpp | 8 +- .../heightmap_target/HeightmapTargetModule.h | 0 .../editing}/ProfilerModel.cpp | 2 +- .../editing}/ProfilerModel.h | 0 .../editing}/ProfilerRuntime.cpp | 2 +- .../editor}/EditorProfiler.h | 2 +- .../editor}/profiler_editor.cpp | 2 +- .../editing}/SceneComponentPayload.cpp | 2 +- .../editing}/SceneComponentPayload.h | 2 +- .../editing}/SceneEditingCommands.cpp | 2 +- .../editing}/SceneEditingCommands.h | 0 .../editing}/SceneEditingTypes.h | 0 .../editing}/SceneRuntime.cpp | 2 +- .../editing}/SceneTarget.cpp | 4 +- .../editing}/SceneTarget.h | 4 +- .../editor}/EditorPrefab.cpp | 2 +- .../editor}/EditorPrefab.h | 2 +- .../editor}/EditorSceneComponentPayload.h | 2 +- .../editor}/EditorSceneTarget.h | 2 +- .../editor}/SceneEditorModule.cpp | 6 +- .../editor}/SceneEditorModule.h | 0 .../loader}/SceneLoader.cpp | 2 +- .../loader}/SceneLoader.h | 0 .../loader/editing}/SceneImportRuntime.cpp | 4 +- .../loader/editing}/SceneImportTarget.cpp | 2 +- .../loader/editing}/SceneImportTarget.h | 0 .../loader/editor}/EditorSceneImportTarget.h | 2 +- .../loader/editor}/sceneloader_editor.cpp | 2 +- .../editing}/SnowFieldTarget.cpp | 2 +- .../editing}/SnowFieldTarget.h | 0 .../editor}/SnowFieldTarget.h | 2 +- .../editor}/snow_editor.cpp | 2 +- .../editing}/SocialDocument.cpp | 2 +- .../editing}/SocialDocument.h | 0 .../editing}/SocialRuntime.cpp | 2 +- .../editor}/EditorSocialDocument.h | 2 +- .../editor}/social_editor.cpp | 2 +- .../editing}/SpriteStackRuntime.cpp | 2 +- .../editing}/SpriteStackTarget.cpp | 2 +- .../editing}/SpriteStackTarget.h | 0 .../editor}/EditorSpriteStackTarget.h | 2 +- .../editor}/spritestack_editor.cpp | 2 +- .../editing}/StylizeRuntime.cpp | 2 +- .../editing}/StylizeTarget.cpp | 2 +- .../editing}/StylizeTarget.h | 0 .../editor}/EditorStylizeOffscreen.cpp | 2 +- .../editor}/EditorStylizeTarget.h | 4 +- .../{ui_editing => ui/editing}/UiDocument.cpp | 2 +- .../{ui_editing => ui/editing}/UiDocument.h | 0 .../editing}/UiDocumentProperty.cpp | 2 +- .../editing}/UiDocumentSerialization.cpp | 2 +- .../{ui_editing => ui/editing}/UiPreview.cpp | 2 +- .../{ui_editing => ui/editing}/UiRuntime.cpp | 2 +- .../{ui_editing => ui/editing}/UiTheme.cpp | 4 +- .../{ui_editing => ui/editing}/UiTheme.h | 0 .../editing}/UiThemePreview.cpp | 4 +- .../editing}/UiThemeProperty.cpp | 4 +- .../editing}/UiThemeTokens.cpp | 2 +- .../editing}/UiThemeTokens.h | 2 +- .../editor}/EditorUiDocumentTarget.h | 2 +- .../editor}/EditorUiOffscreen.cpp | 2 +- .../editor}/EditorUiOffscreen.h | 6 +- .../editor}/EditorUiSkinPreview.cpp | 2 +- .../editor}/EditorUiSkinPreview.h | 2 +- .../editor}/EditorUiThemeTarget.h | 2 +- .../editor}/UiEditorModule.cpp | 4 +- .../{ui_editor => ui/editor}/UiEditorModule.h | 0 .../editor}/UiThemeEditor.cpp | 2 +- .../{ui_editor => ui/editor}/UiThemeEditor.h | 2 +- .../editor}/UiThemeEditorScriptBindings.cpp | 6 +- .../editor}/UiThemeEditorScriptBindings.h | 0 .../editing}/VirtualGeometryRuntime.cpp | 2 +- .../editing}/VirtualGeometryTarget.cpp | 2 +- .../editing}/VirtualGeometryTarget.h | 0 .../editor}/EditorVirtualGeometryTarget.h | 2 +- .../editor}/virtualgeometry_editor.cpp | 2 +- .../editing}/VoxelCatalog.cpp | 2 +- .../editing}/VoxelCatalog.h | 0 .../editing}/VoxelEditingCommands.cpp | 4 +- .../editing}/VoxelEditingCommands.h | 0 .../editing}/VoxelPaletteRuntime.cpp | 2 +- .../editing}/VoxelPaletteTarget.cpp | 2 +- .../editing}/VoxelPaletteTarget.h | 0 .../editing}/VoxelWorldTarget.cpp | 2 +- .../editing}/VoxelWorldTarget.h | 0 .../editor}/EditorVoxelCatalogTarget.h | 2 +- .../editor}/EditorVoxelPaletteTarget.h | 2 +- .../editor}/VoxelCatalogEditor.cpp | 2 +- .../editor}/VoxelCatalogEditor.h | 2 +- .../VoxelCatalogEditorScriptBindings.cpp | 6 +- .../VoxelCatalogEditorScriptBindings.h | 0 .../editor}/VoxelEditorModule.h | 0 .../editor}/voxel_editor.cpp | 10 +- .../VoxelWorldTargetModule.cpp | 4 +- .../VoxelWorldTargetModule.h | 0 test/action_editor_adapter.cpp | 4 +- test/action_preview_controller.cpp | 2 +- test/action_timeline.cpp | 2 +- test/action_timeline_widget.cpp | 2 +- test/animation_action_preview.cpp | 2 +- test/animation_procedural_bones.cpp | 2 +- test/asset_graphics_loader.cpp | 4 +- test/asset_import.cpp | 6 +- test/asset_import_animation.cpp | 2 +- test/asset_import_unity.cpp | 12 +- test/asset_import_unreal.cpp | 8 +- test/audio_editing_contracts.cpp | 2 +- test/buildingfx.cpp | 2 +- test/editing_contracts.cpp | 136 ++++++++--------- test/editing_satellite_contract_suite.cpp | 8 +- test/editor.cpp | 14 +- test/editor_animation_clip.cpp | 2 +- test/editor_animation_clip_editor.cpp | 2 +- test/editor_animation_editor.cpp | 4 +- test/editor_animation_graph.cpp | 2 +- test/editor_api_contracts.cpp | 8 +- test/editor_audio_editor.cpp | 4 +- test/editor_audio_effects.cpp | 2 +- test/editor_audio_import_diagnostics.cpp | 2 +- test/editor_audio_source_editor.cpp | 2 +- test/editor_audio_target.cpp | 2 +- test/editor_audio_transport.cpp | 2 +- test/editor_audio_waveform.cpp | 2 +- test/editor_automation_v2.cpp | 8 +- test/editor_avatar_document_editor.cpp | 2 +- test/editor_avatar_editor.cpp | 4 +- test/editor_avatar_target.cpp | 2 +- test/editor_behavior_graph.cpp | 2 +- test/editor_biome_rules_editor.cpp | 2 +- test/editor_biome_target.cpp | 4 +- test/editor_building_target.cpp | 2 +- test/editor_building_tool.cpp | 2 +- test/editor_camera_target.cpp | 2 +- test/editor_core_v2.cpp | 4 +- test/editor_crowd_document.cpp | 2 +- test/editor_decal_target.cpp | 2 +- test/editor_definition_target.cpp | 4 +- test/editor_dialogue_graph.cpp | 2 +- test/editor_dialogue_preview.cpp | 2 +- test/editor_document_asset_v2.cpp | 2 +- test/editor_domain_offscreen.cpp | 8 +- test/editor_fluid_target.cpp | 2 +- test/editor_gizmo_preview.cpp | 8 +- test/editor_graph_material_v2.cpp | 2 +- test/editor_hd2d_target.cpp | 2 +- test/editor_housegen_target.cpp | 2 +- test/editor_input_map_target.cpp | 2 +- test/editor_level.cpp | 4 +- test/editor_lighting_target.cpp | 2 +- test/editor_localization.cpp | 2 +- test/editor_map.cpp | 2 +- test/editor_map_document.cpp | 2 +- test/editor_material_preview.cpp | 2 +- test/editor_material_studio.cpp | 2 +- test/editor_material_target.cpp | 2 +- test/editor_network_telemetry.cpp | 2 +- test/editor_offscreen_preview.cpp | 2 +- test/editor_particle_graph.cpp | 2 +- test/editor_pcg_graph.cpp | 2 +- test/editor_physics_asset.cpp | 2 +- test/editor_physics_publication.cpp | 4 +- test/editor_physics_target.cpp | 2 +- test/editor_prefab.cpp | 2 +- test/editor_procgen_script_editor.cpp | 2 +- test/editor_profiler.cpp | 2 +- test/editor_queue_inspector.cpp | 2 +- test/editor_scene_component_payload.cpp | 10 +- test/editor_scene_import_target.cpp | 2 +- test/editor_scene_runtime.cpp | 2 +- test/editor_scene_target_v2.cpp | 2 +- test/editor_skeleton_overlay.cpp | 2 +- test/editor_snow_target.cpp | 4 +- test/editor_social_document.cpp | 2 +- test/editor_spritestack_target.cpp | 2 +- test/editor_stylize_target.cpp | 2 +- test/editor_surface_fluid_preview.cpp | 2 +- test/editor_surface_fluid_target.cpp | 2 +- test/editor_task_diagnostic_v2.cpp | 2 +- test/editor_texture_recipe_target.cpp | 2 +- test/editor_transaction_consumer.cpp | 4 +- test/editor_ui_document.cpp | 2 +- test/editor_ui_skin_preview.cpp | 2 +- test/editor_ui_theme.cpp | 2 +- test/editor_virtualgeometry_target.cpp | 2 +- test/editor_voxel_catalog.cpp | 2 +- test/editor_voxel_editor.cpp | 4 +- test/editor_voxel_palette.cpp | 2 +- test/graphics_backend_parity.cpp | 2 +- test/kaykit_combat_assets.cpp | 6 +- test/pixelworld_editor.cpp | 2 +- test/pixelworld_parallel.cpp | 2 +- test/pixelworld_physics.cpp | 2 +- test/pixelworld_replay.cpp | 2 +- test/pixelworld_streaming.cpp | 4 +- test/sceneloader.cpp | 2 +- 543 files changed, 1029 insertions(+), 714 deletions(-) rename src/modules/{action_editor => action/editor}/ActionEditingCommands.cpp (96%) rename src/modules/{action_editor => action/editor}/ActionEditingCommands.h (100%) rename src/modules/{action_editor => action/editor}/ActionEditorModule.cpp (94%) rename src/modules/{action_editor => action/editor}/ActionEditorModule.h (100%) rename src/modules/{action_editor => action/editor}/ActionPreviewController.cpp (99%) rename src/modules/{action_editor => action/editor}/ActionPreviewController.h (98%) rename src/modules/{action_editor => action/editor}/ActionTimelineEditor.cpp (99%) rename src/modules/{action_editor => action/editor}/ActionTimelineEditor.h (100%) rename src/modules/{action_editor => action/editor}/ActionTimelineScriptBindings.cpp (98%) rename src/modules/{action_editor => action/editor}/ActionTimelineScriptBindings.h (100%) rename src/modules/{action_editor => action/editor}/ActionTimelineWidget.cpp (99%) rename src/modules/{action_editor => action/editor}/ActionTimelineWidget.h (99%) rename src/modules/{action_editor => action/editor}/AnimationRootMotionPreviewSource.cpp (98%) rename src/modules/{action_editor => action/editor}/AnimationRootMotionPreviewSource.h (100%) rename src/modules/{animation_editing => animation/editing}/AnimationClip.cpp (99%) rename src/modules/{animation_editing => animation/editing}/AnimationClip.h (99%) rename src/modules/{animation_editing => animation/editing}/AnimationClipRuntime.cpp (98%) rename src/modules/{animation_editing => animation/editing}/AnimationEditingCommands.cpp (99%) rename src/modules/{animation_editing => animation/editing}/AnimationEditingCommands.h (100%) rename src/modules/{animation_editing => animation/editing}/AnimationEditingTypes.h (100%) rename src/modules/{animation_editing => animation/editing}/AnimationGraph.cpp (99%) rename src/modules/{animation_editing => animation/editing}/AnimationGraph.h (98%) rename src/modules/{animation_editing => animation/editing}/AnimationGraphRuntime.cpp (99%) rename src/modules/{animation_editing => animation/editing}/ProceduralBoneOverlay.cpp (98%) rename src/modules/{animation_editing => animation/editing}/ProceduralBoneOverlay.h (100%) rename src/modules/{animation_editing => animation/editing}/SkeletonOverlay.cpp (99%) rename src/modules/{animation_editing => animation/editing}/SkeletonOverlay.h (100%) rename src/modules/{animation_editing => animation/editing}/SkeletonOverlayRuntime.cpp (98%) rename src/modules/{animation_editor => animation/editor}/AnimationClipEditor.cpp (99%) rename src/modules/{animation_editor => animation/editor}/AnimationClipEditor.h (98%) rename src/modules/{animation_editor => animation/editor}/AnimationClipEditorScriptBindings.cpp (98%) rename src/modules/{animation_editor => animation/editor}/AnimationClipEditorScriptBindings.h (100%) rename src/modules/{animation_editor => animation/editor}/AnimationEditorModule.cpp (92%) rename src/modules/{animation_editor => animation/editor}/AnimationEditorModule.h (100%) rename src/modules/{animation_editor => animation/editor}/EditorAnimationClip.h (95%) rename src/modules/{animation_editor => animation/editor}/EditorAnimationGraph.h (88%) rename src/modules/{animation_editor => animation/editor}/EditorSkeletonOverlay.h (90%) create mode 100644 src/modules/animation/editor/animation_editor.cpp delete mode 100644 src/modules/animation_editor/animation_editor.cpp rename src/modules/{asset_graphics => asset/graphics}/EvpackGraphicsLoader.cpp (99%) rename src/modules/{asset_graphics => asset/graphics}/EvpackGraphicsLoader.h (100%) rename src/modules/{asset_graphics => asset/graphics}/EvpackImageLoader.cpp (98%) rename src/modules/{asset_graphics => asset/graphics}/EvpackImageLoader.h (100%) rename src/modules/{asset_graphics => asset/graphics}/GraphicsImageFactoryAdapter.cpp (97%) rename src/modules/{asset_graphics => asset/graphics}/GraphicsMeshFactoryAdapter.cpp (96%) rename src/modules/{asset_import => asset/import}/AssetCommand.cpp (99%) rename src/modules/{asset_import => asset/import}/AssetImporter.h (100%) rename src/modules/{asset_import => asset/import}/GltfImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/ImageImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/ImportCommon.h (98%) rename src/modules/{asset_import => asset/import}/ImportReport.cpp (99%) rename src/modules/{asset_import => asset/import}/LegacyAnimationImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/LegacyAnimationImporter.h (94%) rename src/modules/{asset_import => asset/import}/TerrainImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/TerrainImporter.h (98%) rename src/modules/{asset_import => asset/import}/UnityImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/UnityImporter.h (96%) rename src/modules/{asset_import => asset/import}/UnrealImporter.cpp (99%) rename src/modules/{asset_import => asset/import}/UnrealImporter.h (96%) rename src/modules/{asset_procgen => asset/procgen}/EvpackInstanceSetLoader.cpp (99%) rename src/modules/{asset_procgen => asset/procgen}/EvpackInstanceSetLoader.h (100%) rename src/modules/{asset_procgen => asset/procgen}/EvpackPointGraphLoader.cpp (99%) rename src/modules/{asset_procgen => asset/procgen}/EvpackPointGraphLoader.h (100%) rename src/modules/{asset_procgen => asset/procgen}/EvpackTerrainLoader.cpp (99%) rename src/modules/{asset_procgen => asset/procgen}/EvpackTerrainLoader.h (100%) rename src/modules/{asset_procgen => asset/procgen}/EvpackTerrainMaterialLoader.cpp (99%) rename src/modules/{asset_procgen => asset/procgen}/EvpackTerrainMaterialLoader.h (100%) rename src/modules/{asset_scene => asset/scene}/EvpackSceneTemplateLoader.cpp (99%) rename src/modules/{asset_scene => asset/scene}/EvpackSceneTemplateLoader.h (100%) rename src/modules/{audio_editing => audio/editing}/AudioEditingCommands.cpp (97%) rename src/modules/{audio_editing => audio/editing}/AudioEditingCommands.h (100%) rename src/modules/{audio_editing => audio/editing}/AudioEditingProvider.cpp (95%) rename src/modules/{audio_editing => audio/editing}/AudioEditingProvider.h (97%) rename src/modules/{audio_editing => audio/editing}/AudioEditingTypes.h (100%) rename src/modules/{audio_editing => audio/editing}/AudioEffects.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioEffects.h (98%) rename src/modules/{audio_editing => audio/editing}/AudioImportDiagnostics.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioImportDiagnostics.h (97%) rename src/modules/{audio_editing => audio/editing}/AudioMixerTarget.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioPublishingTarget.cpp (98%) rename src/modules/{audio_editing => audio/editing}/AudioRuntime.cpp (98%) rename src/modules/{audio_editing => audio/editing}/AudioSerialization.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioTarget.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioTarget.h (99%) rename src/modules/{audio_editing => audio/editing}/AudioTransport.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioTransport.h (98%) rename src/modules/{audio_editing => audio/editing}/AudioTransportRuntime.cpp (96%) rename src/modules/{audio_editing => audio/editing}/AudioWaveform.cpp (99%) rename src/modules/{audio_editing => audio/editing}/AudioWaveform.h (97%) rename src/modules/{audio_editor => audio/editor}/AudioEditorModule.cpp (91%) rename src/modules/{audio_editor => audio/editor}/AudioEditorModule.h (100%) rename src/modules/{audio_editor => audio/editor}/AudioSourceEditor.cpp (99%) rename src/modules/{audio_editor => audio/editor}/AudioSourceEditor.h (98%) rename src/modules/{audio_editor => audio/editor}/AudioSourceEditorScriptBindings.cpp (98%) rename src/modules/{audio_editor => audio/editor}/AudioSourceEditorScriptBindings.h (100%) rename src/modules/{audio_editor => audio/editor}/EditorAudioEffects.h (87%) rename src/modules/{audio_editor => audio/editor}/EditorAudioImportDiagnostics.h (86%) rename src/modules/{audio_editor => audio/editor}/EditorAudioTarget.h (95%) rename src/modules/{audio_editor => audio/editor}/EditorAudioTransport.h (94%) rename src/modules/{audio_editor => audio/editor}/EditorAudioWaveform.h (94%) create mode 100644 src/modules/audio/editor/audio_editor.cpp delete mode 100644 src/modules/audio_editor/audio_editor.cpp rename src/modules/{avatar_editing => avatar/editing}/AvatarEditingCommands.cpp (98%) rename src/modules/{avatar_editing => avatar/editing}/AvatarEditingCommands.h (100%) rename src/modules/{avatar_editing => avatar/editing}/AvatarRuntime.cpp (98%) rename src/modules/{avatar_editing => avatar/editing}/AvatarTarget.cpp (99%) rename src/modules/{avatar_editing => avatar/editing}/AvatarTarget.h (100%) rename src/modules/{avatar_editor => avatar/editor}/AvatarDocumentEditor.cpp (99%) rename src/modules/{avatar_editor => avatar/editor}/AvatarDocumentEditor.h (99%) rename src/modules/{avatar_editor => avatar/editor}/AvatarDocumentEditorScriptBindings.cpp (98%) rename src/modules/{avatar_editor => avatar/editor}/AvatarDocumentEditorScriptBindings.h (100%) rename src/modules/{avatar_editor => avatar/editor}/AvatarEditorModule.h (100%) rename src/modules/{avatar_editor => avatar/editor}/EditorAvatarTarget.h (90%) rename src/modules/{avatar_editor => avatar/editor}/avatar_editor.cpp (94%) rename src/modules/{building_editing => building/editing}/BuildingTarget.cpp (99%) rename src/modules/{building_editing => building/editing}/BuildingTarget.h (100%) rename src/modules/{building_editor => building/editor}/BuildingEdgeCurveTool.cpp (99%) rename src/modules/{building_editor => building/editor}/EditorBuildingTarget.h (99%) rename src/modules/{building_editor => building/editor}/building_editor.cpp (69%) rename src/modules/{buildingfx => building/fx}/BuildingFx.cpp (99%) rename src/modules/{buildingfx => building/fx}/BuildingFx.h (100%) rename src/modules/{camera_editing => camera/editing}/CameraRuntime.cpp (98%) rename src/modules/{camera_editing => camera/editing}/CameraTarget.cpp (99%) rename src/modules/{camera_editing => camera/editing}/CameraTarget.h (100%) rename src/modules/{camera_editor => camera/editor}/EditorCameraTarget.h (80%) rename src/modules/{camera_editor => camera/editor}/camera_editor.cpp (70%) rename src/modules/{crowd_editing => crowd/editing}/CrowdDocument.cpp (99%) rename src/modules/{crowd_editing => crowd/editing}/CrowdDocument.h (100%) rename src/modules/{crowd_editing => crowd/editing}/CrowdRuntime.cpp (98%) rename src/modules/{crowd_editor => crowd/editor}/EditorCrowdDocument.h (93%) rename src/modules/{crowd_editor => crowd/editor}/crowd_editor.cpp (70%) rename src/modules/{decal_editing => decal/editing}/DecalGizmo.cpp (97%) rename src/modules/{decal_editing => decal/editing}/DecalRuntime.cpp (99%) rename src/modules/{decal_editing => decal/editing}/DecalTarget.cpp (99%) rename src/modules/{decal_editing => decal/editing}/DecalTarget.h (100%) rename src/modules/{decal_editor => decal/editor}/EditorDecalTarget.h (93%) rename src/modules/{decal_editor => decal/editor}/decal_editor.cpp (71%) rename src/modules/{definitions_editing => definitions/editing}/DefinitionForm.h (97%) rename src/modules/{definitions_editing => definitions/editing}/DefinitionFormRuntime.cpp (99%) rename src/modules/{definitions_editing => definitions/editing}/DefinitionRuntime.cpp (96%) rename src/modules/{definitions_editing => definitions/editing}/DefinitionTarget.cpp (99%) rename src/modules/{definitions_editing => definitions/editing}/DefinitionTarget.h (100%) rename src/modules/{definitions_editor => definitions/editor}/EditorDefinitionForm.h (76%) rename src/modules/{definitions_editor => definitions/editor}/EditorDefinitionTarget.h (86%) rename src/modules/{definitions_editor => definitions/editor}/definitions_editor.cpp (67%) rename src/modules/{dialogue_editing => dialogue/editing}/DialogueEditingTypes.h (100%) rename src/modules/{dialogue_editing => dialogue/editing}/DialogueGraph.cpp (99%) rename src/modules/{dialogue_editing => dialogue/editing}/DialogueGraph.h (97%) rename src/modules/{dialogue_editing => dialogue/editing}/DialogueGraphRuntime.cpp (99%) rename src/modules/{dialogue_editor => dialogue/editor}/EditorDialogueGraph.h (87%) rename src/modules/{dialogue_editor => dialogue/editor}/EditorDialoguePreview.cpp (98%) rename src/modules/{dialogue_editor => dialogue/editor}/EditorDialoguePreview.h (97%) rename src/modules/{domain_gizmo_editing => editor/gizmo/editing}/DomainGizmoPreview.cpp (98%) rename src/modules/{domain_gizmo_editing => editor/gizmo/editing}/DomainGizmoPreview.h (92%) rename src/modules/{domain_gizmo_editor => editor/gizmo/editor}/EditorGizmoPreview.h (81%) rename src/modules/{domain_gizmo_editor => editor/gizmo/editor}/domain_gizmo_editor.cpp (69%) rename src/modules/{input_editing => editor/input/editing}/InputMapTarget.cpp (99%) rename src/modules/{input_editing => editor/input/editing}/InputMapTarget.h (100%) rename src/modules/{input_editor => editor/input/editor}/EditorInputMapTarget.h (88%) rename src/modules/{input_editor => editor/input/editor}/input_editor.cpp (67%) rename src/modules/{queue_editing => editor/queue/editing}/QueueInspector.cpp (98%) rename src/modules/{queue_editing => editor/queue/editing}/QueueInspector.h (100%) rename src/modules/{queue_editor => editor/queue/editor}/EditorQueueInspector.h (86%) rename src/modules/{queue_editor => editor/queue/editor}/queue_editor.cpp (67%) rename src/modules/{fluids_editing => fluids/editing}/FluidRuntime.cpp (98%) rename src/modules/{fluids_editing => fluids/editing}/FluidTarget.cpp (99%) rename src/modules/{fluids_editing => fluids/editing}/FluidTarget.h (100%) rename src/modules/{fluids_editing => fluids/editing}/SurfaceFluidRuntime.cpp (98%) rename src/modules/{fluids_editing => fluids/editing}/SurfaceFluidTarget.cpp (99%) rename src/modules/{fluids_editing => fluids/editing}/SurfaceFluidTarget.h (100%) rename src/modules/{fluids_editor => fluids/editor}/EditorFluidTarget.h (89%) rename src/modules/{fluids_editor => fluids/editor}/EditorSurfaceFluidOffscreen.cpp (95%) rename src/modules/{fluids_editor => fluids/editor}/EditorSurfaceFluidPreview.cpp (99%) rename src/modules/{fluids_editor => fluids/editor}/EditorSurfaceFluidPreview.h (97%) rename src/modules/{fluids_editor => fluids/editor}/EditorSurfaceFluidTarget.h (85%) rename src/modules/{graphics_editing => graphics/editing}/OffscreenPreview.cpp (99%) rename src/modules/{graphics_editing => graphics/editing}/OffscreenPreview.h (100%) rename src/modules/{graphics_editing => graphics/editing}/PrimitiveGizmoRenderer.cpp (99%) rename src/modules/{graphics_editing => graphics/editing}/PrimitiveGizmoRenderer.h (100%) rename src/modules/{graphics_editor => graphics/editor}/EditorOffscreenPreview.h (86%) rename src/modules/{graphics_editor => graphics/editor}/GraphicsEditorModule.cpp (95%) rename src/modules/{graphics_editor => graphics/editor}/GraphicsEditorModule.h (100%) rename src/modules/{graphics_editor => graphics/editor}/ReflectionProbeVisualizer.cpp (98%) rename src/modules/{graphics_editor => graphics/editor}/ReflectionProbeVisualizer.h (100%) rename src/modules/{lighting_editing => graphics/lighting/editing}/EnvironmentDayNightRuntime.cpp (97%) rename src/modules/{lighting_editing => graphics/lighting/editing}/EnvironmentWeatherRuntime.cpp (97%) rename src/modules/{lighting_editing => graphics/lighting/editing}/LightingRuntime.cpp (98%) rename src/modules/{lighting_editing => graphics/lighting/editing}/LightingTarget.cpp (99%) rename src/modules/{lighting_editing => graphics/lighting/editing}/LightingTarget.h (100%) rename src/modules/{lighting_editor => graphics/lighting/editor}/EditorLightingTarget.h (87%) rename src/modules/{lighting_editor => graphics/lighting/editor}/lighting_editor.cpp (65%) rename src/modules/{material_editing => graphics/material/editing}/MaterialEditingCommands.cpp (97%) rename src/modules/{material_editing => graphics/material/editing}/MaterialEditingCommands.h (100%) rename src/modules/{material_editing => graphics/material/editing}/MaterialGraph.cpp (99%) rename src/modules/{material_editing => graphics/material/editing}/MaterialGraph.h (100%) rename src/modules/{material_editing => graphics/material/editing}/MaterialPublishingTarget.cpp (97%) rename src/modules/{material_editing => graphics/material/editing}/MaterialTarget.cpp (99%) rename src/modules/{material_editing => graphics/material/editing}/MaterialTarget.h (100%) rename src/modules/{material_editor => graphics/material/editor}/EditorGraph.h (94%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialOffscreen.cpp (95%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialOffscreen.h (87%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialPreview.cpp (98%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialPreview.h (97%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialStudio.cpp (99%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialStudio.h (98%) rename src/modules/{material_editor => graphics/material/editor}/EditorMaterialTarget.h (90%) rename src/modules/{material_editor => graphics/material/editor}/MaterialEditorModule.cpp (97%) rename src/modules/{material_editor => graphics/material/editor}/MaterialEditorModule.h (100%) rename src/modules/{material_graphics_editing => graphics/material/graphics_editing}/MaterialRuntime.cpp (99%) rename src/modules/{hd2d_editing => hd2d/editing}/Hd2dRuntime.cpp (99%) rename src/modules/{hd2d_editing => hd2d/editing}/Hd2dTarget.cpp (99%) rename src/modules/{hd2d_editing => hd2d/editing}/Hd2dTarget.h (100%) rename src/modules/{hd2d_editor => hd2d/editor}/EditorHd2dTarget.h (91%) rename src/modules/{hd2d_editor => hd2d/editor}/hd2d_editor.cpp (72%) rename src/modules/{housegen_editing => housegen/editing}/HouseGenRuntime.cpp (98%) rename src/modules/{housegen_editing => housegen/editing}/HouseGenTarget.cpp (99%) rename src/modules/{housegen_editing => housegen/editing}/HouseGenTarget.h (100%) rename src/modules/{housegen_editor => housegen/editor}/EditorHouseGenTarget.h (74%) rename src/modules/{housegen_editor => housegen/editor}/housegen_editor.cpp (69%) rename src/modules/{localization_editing => i18n/editing}/LocalizationDocument.cpp (99%) rename src/modules/{localization_editing => i18n/editing}/LocalizationDocument.h (100%) rename src/modules/{localization_editing => i18n/editing}/LocalizationRuntime.cpp (97%) rename src/modules/{localization_editor => i18n/editor}/EditorLocalization.h (90%) rename src/modules/{localization_editor => i18n/editor}/localization_editor.cpp (69%) rename src/modules/{map_editing => map/editing}/MapDocument.cpp (99%) rename src/modules/{map_editing => map/editing}/MapDocument.h (99%) rename src/modules/{map_editing => map/editing}/MapEditingTypes.h (100%) rename src/modules/{map_editing => map/editing}/MapIntegration.cpp (99%) rename src/modules/{map_editing => map/editing}/TileLayerTarget.cpp (96%) rename src/modules/{map_editing => map/editing}/TileLayerTarget.h (100%) rename src/modules/{map_editor => map/editor}/EditorMapDocument.h (96%) rename src/modules/{map_editor => map/editor}/map_editor.cpp (72%) rename src/modules/{level_editing => map/level/editing}/Brush.cpp (99%) rename src/modules/{level_editing => map/level/editing}/Brush.h (98%) rename src/modules/{level_editing => map/level/editing}/EditorHistory.cpp (99%) rename src/modules/{level_editing => map/level/editing}/EditorHistory.h (98%) rename src/modules/{level_editing => map/level/editing}/FieldTargets.cpp (91%) rename src/modules/{level_editing => map/level/editing}/FieldTargets.h (100%) rename src/modules/{level_editing => map/level/editing}/LevelDocument.cpp (99%) rename src/modules/{level_editing => map/level/editing}/LevelDocument.h (99%) rename src/modules/{level_editing => map/level/editing}/LevelFormat.cpp (99%) rename src/modules/{level_editing => map/level/editing}/LevelFormat.h (100%) rename src/modules/{level_editing => map/level/editing}/TileBuffer.cpp (97%) rename src/modules/{level_editing => map/level/editing}/TileBuffer.h (100%) rename src/modules/{level_editor => map/level/editor}/LevelEditorModule.cpp (97%) rename src/modules/{level_editor => map/level/editor}/LevelEditorModule.h (100%) rename src/modules/{ => map}/tilelayer_target/TileLayerTargetModule.cpp (95%) rename src/modules/{ => map}/tilelayer_target/TileLayerTargetModule.h (100%) rename src/modules/{network_editing => network/editing}/NetworkTelemetry.cpp (98%) rename src/modules/{network_editing => network/editing}/NetworkTelemetry.h (100%) rename src/modules/{network_editing => network/editing}/NetworkTelemetryRuntime.cpp (95%) rename src/modules/{network_editor => network/editor}/EditorNetworkTelemetry.h (85%) rename src/modules/{network_editor => network/editor}/network_editor.cpp (68%) rename src/modules/{npc_ai_editing => npc_ai/editing}/BehaviorGraph.cpp (99%) rename src/modules/{npc_ai_editing => npc_ai/editing}/BehaviorGraph.h (96%) rename src/modules/{npc_ai_editing => npc_ai/editing}/NpcAiEditingTypes.h (100%) rename src/modules/{npc_ai_editor => npc_ai/editor}/EditorBehaviorGraph.h (86%) rename src/modules/{npc_ai_editor => npc_ai/editor}/npc_ai_editor.cpp (70%) rename src/modules/{particles_editing => particles/editing}/ParticleGraph.cpp (99%) rename src/modules/{particles_editing => particles/editing}/ParticleGraph.h (97%) rename src/modules/{particles_editing => particles/editing}/ParticleGraphRuntime.cpp (99%) rename src/modules/{particles_editing => particles/editing}/ParticlesEditingTypes.h (100%) rename src/modules/{particles_editor => particles/editor}/EditorParticleGraph.h (91%) rename src/modules/{particles_editor => particles/editor}/EditorParticleOffscreen.h (88%) rename src/modules/{particles_editor => particles/editor}/particles_editor.cpp (69%) rename src/modules/{particles_graphics_editing => particles/graphics_editing}/ParticleOffscreen.cpp (96%) rename src/modules/{particles_graphics_editing => particles/graphics_editing}/ParticleOffscreen.h (97%) rename src/modules/{particles_graphics_editing => particles/graphics_editing}/ParticleOffscreenRuntime.cpp (98%) rename src/modules/{physics_editing => physics/editing}/PhysicsColliderAsset.cpp (76%) rename src/modules/{physics_editing => physics/editing}/PhysicsColliderAsset.h (100%) rename src/modules/{physics_editing => physics/editing}/PhysicsEditingProvider.cpp (95%) rename src/modules/{physics_editing => physics/editing}/PhysicsEditingProvider.h (97%) rename src/modules/{physics_editing => physics/editing}/PhysicsJointTarget.cpp (99%) rename src/modules/{physics_editing => physics/editing}/PhysicsPublishingTarget.cpp (98%) rename src/modules/{physics_editing => physics/editing}/PhysicsRuntime.cpp (99%) rename src/modules/{physics_editing => physics/editing}/PhysicsSerialization.cpp (99%) rename src/modules/{physics_editing => physics/editing}/PhysicsTarget.cpp (99%) rename src/modules/{physics_editing => physics/editing}/PhysicsTarget.h (99%) rename src/modules/{physics_editor => physics/editor}/EditorPhysicsAsset.cpp (99%) rename src/modules/{physics_editor => physics/editor}/EditorPhysicsAsset.h (94%) rename src/modules/{physics_editor => physics/editor}/EditorPhysicsTarget.h (95%) rename src/modules/{pixelworld_editor => pixelworld/editor}/PixelWorldCatalogPanel.cpp (99%) rename src/modules/{pixelworld_editor => pixelworld/editor}/PixelWorldCatalogPanel.h (100%) rename src/modules/{pixelworld_editor => pixelworld/editor}/PixelWorldEditorModule.cpp (96%) rename src/modules/{pixelworld_editor => pixelworld/editor}/PixelWorldEditorModule.h (94%) rename src/modules/{pixelworld_graphics => pixelworld/graphics}/PixelWorldGraphics.cpp (99%) rename src/modules/{pixelworld_graphics => pixelworld/graphics}/PixelWorldGraphics.h (100%) rename src/modules/{pixelworld_physics => pixelworld/physics}/PixelWorldPhysics.cpp (99%) rename src/modules/{pixelworld_physics => pixelworld/physics}/PixelWorldPhysics.h (100%) rename src/modules/{pixelworld_replay => pixelworld/replay}/PixelWorldReplay.cpp (99%) rename src/modules/{pixelworld_replay => pixelworld/replay}/PixelWorldReplay.h (100%) rename src/modules/{pixelworld_streaming => pixelworld/streaming}/PixelWorldArchive.cpp (99%) rename src/modules/{pixelworld_streaming => pixelworld/streaming}/PixelWorldStreaming.cpp (98%) rename src/modules/{pixelworld_streaming => pixelworld/streaming}/PixelWorldStreaming.h (100%) rename src/modules/{pixelworld_streaming => pixelworld/streaming}/PixelWorldTransport.cpp (99%) rename src/modules/{pixelworld_streaming => pixelworld/streaming}/PixelWorldTransport.h (98%) rename src/modules/{pixelworld_thread => pixelworld/thread}/PixelWorldThread.cpp (95%) rename src/modules/{pixelworld_thread => pixelworld/thread}/PixelWorldThread.h (100%) rename src/modules/{biome_editing => procgen/biome/editing}/BiomeEditingCommands.cpp (98%) rename src/modules/{biome_editing => procgen/biome/editing}/BiomeEditingCommands.h (100%) rename src/modules/{biome_editing => procgen/biome/editing}/BiomeRuntime.cpp (98%) rename src/modules/{biome_editing => procgen/biome/editing}/BiomeTarget.cpp (99%) rename src/modules/{biome_editing => procgen/biome/editing}/BiomeTarget.h (100%) rename src/modules/{biome_editor => procgen/biome/editor}/BiomeEditorModule.h (100%) rename src/modules/{biome_editor => procgen/biome/editor}/BiomeRulesEditor.cpp (99%) rename src/modules/{biome_editor => procgen/biome/editor}/BiomeRulesEditor.h (99%) rename src/modules/{biome_editor => procgen/biome/editor}/BiomeRulesEditorScriptBindings.cpp (98%) rename src/modules/{biome_editor => procgen/biome/editor}/BiomeRulesEditorScriptBindings.h (100%) rename src/modules/{biome_editor => procgen/biome/editor}/EditorBiomeTarget.h (89%) rename src/modules/{biome_editor => procgen/biome/editor}/biome_editor.cpp (93%) rename src/modules/{procgen_editing => procgen/editing}/HeightmapBrush.h (100%) rename src/modules/{procgen_editing => procgen/editing}/HeightmapTarget.cpp (98%) rename src/modules/{procgen_editing => procgen/editing}/HeightmapTarget.h (97%) rename src/modules/{procgen_editing => procgen/editing}/PcgGraph.cpp (99%) rename src/modules/{procgen_editing => procgen/editing}/PcgGraph.h (98%) rename src/modules/{procgen_editing => procgen/editing}/ProcgenEditingTypes.h (100%) rename src/modules/{procgen_editing => procgen/editing}/ProcgenScriptTarget.cpp (99%) rename src/modules/{procgen_editing => procgen/editing}/ProcgenScriptTarget.h (100%) rename src/modules/{procgen_editing => procgen/editing}/TextureRecipeTarget.cpp (99%) rename src/modules/{procgen_editing => procgen/editing}/TextureRecipeTarget.h (100%) rename src/modules/{procgen_editor => procgen/editor}/EditorPcgGraph.h (91%) rename src/modules/{procgen_editor => procgen/editor}/EditorTextureRecipeTarget.h (86%) rename src/modules/{procgen_editor => procgen/editor}/ProcgenEditorModule.h (100%) rename src/modules/{procgen_editor => procgen/editor}/ProcgenScriptEditor.cpp (99%) rename src/modules/{procgen_editor => procgen/editor}/ProcgenScriptEditor.h (99%) rename src/modules/{procgen_editor => procgen/editor}/ProcgenScriptEditorScriptBindings.cpp (98%) rename src/modules/{procgen_editor => procgen/editor}/ProcgenScriptEditorScriptBindings.h (100%) rename src/modules/{procgen_editor => procgen/editor}/procgen_editor.cpp (90%) rename src/modules/{procgen_graphics_editing => procgen/graphics_editing}/HeightmapMesh.cpp (99%) rename src/modules/{procgen_graphics_editing => procgen/graphics_editing}/HeightmapMesh.h (100%) rename src/modules/{ => procgen}/heightmap_target/HeightmapTargetModule.cpp (95%) rename src/modules/{ => procgen}/heightmap_target/HeightmapTargetModule.h (100%) rename src/modules/{profiler_editing => profiler/editing}/ProfilerModel.cpp (99%) rename src/modules/{profiler_editing => profiler/editing}/ProfilerModel.h (100%) rename src/modules/{profiler_editing => profiler/editing}/ProfilerRuntime.cpp (97%) rename src/modules/{profiler_editor => profiler/editor}/EditorProfiler.h (94%) rename src/modules/{profiler_editor => profiler/editor}/profiler_editor.cpp (71%) rename src/modules/{scene_editing => scene/editing}/SceneComponentPayload.cpp (99%) rename src/modules/{scene_editing => scene/editing}/SceneComponentPayload.h (99%) rename src/modules/{scene_editing => scene/editing}/SceneEditingCommands.cpp (98%) rename src/modules/{scene_editing => scene/editing}/SceneEditingCommands.h (100%) rename src/modules/{scene_editing => scene/editing}/SceneEditingTypes.h (100%) rename src/modules/{scene_editing => scene/editing}/SceneRuntime.cpp (99%) rename src/modules/{scene_editing => scene/editing}/SceneTarget.cpp (99%) rename src/modules/{scene_editing => scene/editing}/SceneTarget.h (99%) rename src/modules/{scene_editor => scene/editor}/EditorPrefab.cpp (99%) rename src/modules/{scene_editor => scene/editor}/EditorPrefab.h (98%) rename src/modules/{scene_editor => scene/editor}/EditorSceneComponentPayload.h (94%) rename src/modules/{scene_editor => scene/editor}/EditorSceneTarget.h (97%) rename src/modules/{scene_editor => scene/editor}/SceneEditorModule.cpp (97%) rename src/modules/{scene_editor => scene/editor}/SceneEditorModule.h (100%) rename src/modules/{sceneloader => scene/loader}/SceneLoader.cpp (99%) rename src/modules/{sceneloader => scene/loader}/SceneLoader.h (100%) rename src/modules/{sceneloader_editing => scene/loader/editing}/SceneImportRuntime.cpp (96%) rename src/modules/{sceneloader_editing => scene/loader/editing}/SceneImportTarget.cpp (99%) rename src/modules/{sceneloader_editing => scene/loader/editing}/SceneImportTarget.h (100%) rename src/modules/{sceneloader_editor => scene/loader/editor}/EditorSceneImportTarget.h (87%) rename src/modules/{sceneloader_editor => scene/loader/editor}/sceneloader_editor.cpp (67%) rename src/modules/{snow_editing => snow/editing}/SnowFieldTarget.cpp (97%) rename src/modules/{snow_editing => snow/editing}/SnowFieldTarget.h (100%) rename src/modules/{snow_editor => snow/editor}/SnowFieldTarget.h (83%) rename src/modules/{snow_editor => snow/editor}/snow_editor.cpp (72%) rename src/modules/{social_editing => social/editing}/SocialDocument.cpp (99%) rename src/modules/{social_editing => social/editing}/SocialDocument.h (100%) rename src/modules/{social_editing => social/editing}/SocialRuntime.cpp (97%) rename src/modules/{social_editor => social/editor}/EditorSocialDocument.h (87%) rename src/modules/{social_editor => social/editor}/social_editor.cpp (69%) rename src/modules/{spritestack_editing => spritestack/editing}/SpriteStackRuntime.cpp (99%) rename src/modules/{spritestack_editing => spritestack/editing}/SpriteStackTarget.cpp (99%) rename src/modules/{spritestack_editing => spritestack/editing}/SpriteStackTarget.h (100%) rename src/modules/{spritestack_editor => spritestack/editor}/EditorSpriteStackTarget.h (91%) rename src/modules/{spritestack_editor => spritestack/editor}/spritestack_editor.cpp (67%) rename src/modules/{stylize_editing => stylize/editing}/StylizeRuntime.cpp (98%) rename src/modules/{stylize_editing => stylize/editing}/StylizeTarget.cpp (99%) rename src/modules/{stylize_editing => stylize/editing}/StylizeTarget.h (100%) rename src/modules/{stylize_editor => stylize/editor}/EditorStylizeOffscreen.cpp (95%) rename src/modules/{stylize_editor => stylize/editor}/EditorStylizeTarget.h (91%) rename src/modules/{ui_editing => ui/editing}/UiDocument.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiDocument.h (100%) rename src/modules/{ui_editing => ui/editing}/UiDocumentProperty.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiDocumentSerialization.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiPreview.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiRuntime.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiTheme.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiTheme.h (100%) rename src/modules/{ui_editing => ui/editing}/UiThemePreview.cpp (96%) rename src/modules/{ui_editing => ui/editing}/UiThemeProperty.cpp (98%) rename src/modules/{ui_editing => ui/editing}/UiThemeTokens.cpp (99%) rename src/modules/{ui_editing => ui/editing}/UiThemeTokens.h (96%) rename src/modules/{ui_editor => ui/editor}/EditorUiDocumentTarget.h (95%) rename src/modules/{ui_editor => ui/editor}/EditorUiOffscreen.cpp (98%) rename src/modules/{ui_editor => ui/editor}/EditorUiOffscreen.h (88%) rename src/modules/{ui_editor => ui/editor}/EditorUiSkinPreview.cpp (99%) rename src/modules/{ui_editor => ui/editor}/EditorUiSkinPreview.h (97%) rename src/modules/{ui_editor => ui/editor}/EditorUiThemeTarget.h (94%) rename src/modules/{ui_editor => ui/editor}/UiEditorModule.cpp (82%) rename src/modules/{ui_editor => ui/editor}/UiEditorModule.h (100%) rename src/modules/{ui_editor => ui/editor}/UiThemeEditor.cpp (99%) rename src/modules/{ui_editor => ui/editor}/UiThemeEditor.h (99%) rename src/modules/{ui_editor => ui/editor}/UiThemeEditorScriptBindings.cpp (98%) rename src/modules/{ui_editor => ui/editor}/UiThemeEditorScriptBindings.h (100%) rename src/modules/{virtualgeometry_editing => virtualgeometry/editing}/VirtualGeometryRuntime.cpp (99%) rename src/modules/{virtualgeometry_editing => virtualgeometry/editing}/VirtualGeometryTarget.cpp (99%) rename src/modules/{virtualgeometry_editing => virtualgeometry/editing}/VirtualGeometryTarget.h (100%) rename src/modules/{virtualgeometry_editor => virtualgeometry/editor}/EditorVirtualGeometryTarget.h (90%) rename src/modules/{virtualgeometry_editor => virtualgeometry/editor}/virtualgeometry_editor.cpp (65%) rename src/modules/{voxel_editing => voxel/editing}/VoxelCatalog.cpp (99%) rename src/modules/{voxel_editing => voxel/editing}/VoxelCatalog.h (100%) rename src/modules/{voxel_editing => voxel/editing}/VoxelEditingCommands.cpp (98%) rename src/modules/{voxel_editing => voxel/editing}/VoxelEditingCommands.h (100%) rename src/modules/{voxel_editing => voxel/editing}/VoxelPaletteRuntime.cpp (97%) rename src/modules/{voxel_editing => voxel/editing}/VoxelPaletteTarget.cpp (99%) rename src/modules/{voxel_editing => voxel/editing}/VoxelPaletteTarget.h (100%) rename src/modules/{voxel_editing => voxel/editing}/VoxelWorldTarget.cpp (97%) rename src/modules/{voxel_editing => voxel/editing}/VoxelWorldTarget.h (100%) rename src/modules/{voxel_editor => voxel/editor}/EditorVoxelCatalogTarget.h (91%) rename src/modules/{voxel_editor => voxel/editor}/EditorVoxelPaletteTarget.h (87%) rename src/modules/{voxel_editor => voxel/editor}/VoxelCatalogEditor.cpp (99%) rename src/modules/{voxel_editor => voxel/editor}/VoxelCatalogEditor.h (99%) rename src/modules/{voxel_editor => voxel/editor}/VoxelCatalogEditorScriptBindings.cpp (98%) rename src/modules/{voxel_editor => voxel/editor}/VoxelCatalogEditorScriptBindings.h (100%) rename src/modules/{voxel_editor => voxel/editor}/VoxelEditorModule.h (100%) rename src/modules/{voxel_editor => voxel/editor}/voxel_editor.cpp (91%) rename src/modules/{ => voxel}/voxelworld_target/VoxelWorldTargetModule.cpp (96%) rename src/modules/{ => voxel}/voxelworld_target/VoxelWorldTargetModule.h (100%) diff --git a/AGENTS.md b/AGENTS.md index 3e7f2060..02ccba08 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -246,7 +246,12 @@ model behind them. - **One manifest, one boot list.** New modules are declared only in `cmake/module_manifest.cmake`; the link list, third-party closure and `eve.moduleList` are derived. Do not hand-edit `EVELIBS` / `ThirdParty` / - `load.nut` module wiring. + `load.nut` module wiring. Domain satellites live under the host package + (`src/modules//editing`, `editor`, `graphics`, `physics`, `fx`, …) — + do not add a new top-level `*_editing` / `*_editor` / `asset_*` / + `pixelworld_*` / `buildingfx` directory. Runtime-only profiles exclude + authoring directories (`editing` / `editor` / `graphics_editing`) by leaf + name; optional runtime satellites stay independently switchable. - **Keep public headers free of cross-module includes.** Prefer forward declarations and Pimpl so a low-level type change does not recompile every dependent module. Check `python3 scripts/module_depgraph.py` for `*` marks diff --git a/CMakeLists.txt b/CMakeLists.txt index e53cdd9a..c5d273cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,8 @@ option(EVENGINE_BUILD_PROFILE_CHECKS "Build independent public-header and optional-capability profile checks" OFF) option(EVENGINE_BUILD_PIXELWORLD_BENCHMARK "Build the renderer-independent PixelWorld million-cell benchmark" OFF) +option(EVENGINE_BUILD_RENDER_BENCHMARK + "Build the windowed engine rendering performance benchmark" OFF) option(EVENGINE_BUILD_DEMO "Build optional Demo module (procedural demo assets + default demo.nut)" ON) option(EVENGINE_VULKAN_USE_VMA "Use the bundled Vulkan Memory Allocator for VKBuilder buffers" ON) @@ -465,6 +467,9 @@ function(main) if(EVENGINE_BUILD_PIXELWORLD_BENCHMARK) add_subdirectory(benchmarks/pixelworld) endif() + if(EVENGINE_BUILD_HOST AND EVENGINE_BUILD_RENDER_BENCHMARK) + add_subdirectory(benchmarks/render) + endif() if(EVENGINE_BUILD_HOST) add_subdirectory(src/scripts) endif() @@ -562,7 +567,10 @@ macro(create_module libname folder) # shell metacharacters (command separator / pipe) that would split or # execute the -D argument. ',' is safe unquoted on every shell (POSIX sh, # cmd.exe, emcc). The scan script splits on ','. - string(JOIN "," _eve_excl_dirs_arg ${EVENGINE_EXCLUDED_BACKEND_SUBDIRS}) + eve_module_scan_dir("${folder}" _eve_scan_dir) + eve_module_nested_scan_excludes("${folder}" _eve_nested_dirs) + set(_eve_excl_dirs ${EVENGINE_EXCLUDED_BACKEND_SUBDIRS} ${_eve_nested_dirs}) + string(JOIN "," _eve_excl_dirs_arg ${_eve_excl_dirs}) string(JOIN "," _eve_excl_files_arg ${EVENGINE_EXCLUDED_MODULE_FILES}) # Scan .cpp files at configure time. New files are picked up by the next # cmake configure (`make debug` reconfigures when the module directory is @@ -571,7 +579,8 @@ macro(create_module libname folder) # restacks Ninja cmake re-runs and rebuilds every TU. execute_process(COMMAND ${CMAKE_COMMAND} -Doutput_dir=${CMAKE_CURRENT_BINARY_DIR} - -Dmodule_name=${folder} + -Dscan_dir=${_eve_scan_dir} + -Dlist_name=${folder} -Dexclude_dirs=${_eve_excl_dirs_arg} -Dexclude_files=${_eve_excl_files_arg} -P ${CMAKE_SOURCE_DIR}/cmake/scan_source.cmake diff --git a/cmake/collect_module_sources.cmake b/cmake/collect_module_sources.cmake index efc459ca..d993ca02 100644 --- a/cmake/collect_module_sources.cmake +++ b/cmake/collect_module_sources.cmake @@ -1,14 +1,27 @@ # Shared by scan_source.cmake / rescan_source.cmake (-P). Sets file_list to a -# stable newline-joined list of .cpp paths for ${module_name}. +# stable newline-joined list of .cpp paths for ${scan_dir}. # # One GLOB_RECURSE is enough: `*.cpp` already walks subdirectories. A second # `**/*.cpp` pass duplicated every file and made the list order filesystem- # dependent, which then looked like a source-list change on every rescan. +# +# exclude_dirs are matched against the path *relative to the module root*, so +# a nested authoring facet (animation/editing) is skipped when scanning +# animation, but compiled when scanning that facet's own DIR. +if(NOT DEFINED scan_dir) + set(scan_dir "${module_name}") +endif() +if(NOT DEFINED list_name) + set(list_name "${module_name}") +endif() + string(REPLACE "," ";" exclude_dirs "${exclude_dirs}") string(REPLACE "," ";" exclude_files "${exclude_files}") +set(_eve_mod_root "${CMAKE_CURRENT_SOURCE_DIR}/${scan_dir}") +file(TO_CMAKE_PATH "${_eve_mod_root}" _eve_mod_root) file(GLOB_RECURSE source_files LIST_DIRECTORIES false - "${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/*.cpp") + "${_eve_mod_root}/*.cpp") list(REMOVE_DUPLICATES source_files) list(SORT source_files) @@ -19,9 +32,10 @@ foreach(file ${source_files}) # CMAKE_CONFIGURE_DEPENDS, and the next build re-runs CMake + rebuilds # every TU. file(TO_CMAKE_PATH "${file}" file) + file(RELATIVE_PATH _eve_rel "${_eve_mod_root}" "${file}") set(_eve_skip FALSE) foreach(exc ${exclude_dirs}) - if(exc AND (file MATCHES "/${exc}/" OR file MATCHES "${exc}[\\/]+")) + if(exc AND (_eve_rel STREQUAL "${exc}" OR _eve_rel MATCHES "^${exc}/")) set(_eve_skip TRUE) endif() endforeach() diff --git a/cmake/install_sdk.cmake b/cmake/install_sdk.cmake index 9edca23f..fc989a92 100644 --- a/cmake/install_sdk.cmake +++ b/cmake/install_sdk.cmake @@ -106,6 +106,8 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/external/zeroerr/include/zeroerr/" # SDK's API surface always matches the target runtime. Single source of truth is # cmake/module_manifest.cmake (EVE_ENABLED_MODULES); CORE modules (common / # cmdline / devtools) live under src/engine and have no src/modules/ dir. +# Nested authoring facets install to include/eve//editing (matching +# #include "host/editing/Header.h"); the host package excludes those child dirs. if(NOT DEFINED EVE_ENABLED_MODULES) # Defensive fallback when included outside the engine configure: every dir. file(GLOB _eve_all_module_dirs RELATIVE "${CMAKE_SOURCE_DIR}/src/modules" @@ -113,22 +115,32 @@ if(NOT DEFINED EVE_ENABLED_MODULES) set(EVE_ENABLED_MODULES ${_eve_all_module_dirs}) endif() foreach(_eve_mod IN LISTS EVE_ENABLED_MODULES) - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/src/modules/${_eve_mod}") + if(EVE_MODULE_${_eve_mod}_CORE) continue() endif() - install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/modules/${_eve_mod}/" - DESTINATION include/eve/${_eve_mod} + eve_module_scan_dir("${_eve_mod}" _eve_mod_dir) + if(NOT EXISTS "${CMAKE_SOURCE_DIR}/src/modules/${_eve_mod_dir}") + continue() + endif() + eve_module_nested_scan_excludes("${_eve_mod}" _eve_nested_heads) + set(_eve_install_excludes + PATTERN "sdl" EXCLUDE + PATTERN "vulkan" EXCLUDE + PATTERN "webgpu" EXCLUDE + PATTERN "physfs" EXCLUDE + PATTERN "openal" EXCLUDE + PATTERN "imgui" EXCLUDE + PATTERN "cppfs" EXCLUDE + PATTERN "include_shim" EXCLUDE) + foreach(_eve_nested IN LISTS _eve_nested_heads) + list(APPEND _eve_install_excludes PATTERN "${_eve_nested}" EXCLUDE) + endforeach() + install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/modules/${_eve_mod_dir}/" + DESTINATION include/eve/${_eve_mod_dir} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp" - PATTERN "sdl" EXCLUDE - PATTERN "vulkan" EXCLUDE - PATTERN "webgpu" EXCLUDE - PATTERN "physfs" EXCLUDE - PATTERN "openal" EXCLUDE - PATTERN "imgui" EXCLUDE - PATTERN "cppfs" EXCLUDE - PATTERN "include_shim" EXCLUDE + ${_eve_install_excludes} ) endforeach() diff --git a/cmake/module_manifest/orchestration.cmake b/cmake/module_manifest/orchestration.cmake index 3a194bd0..462817e9 100644 --- a/cmake/module_manifest/orchestration.cmake +++ b/cmake/module_manifest/orchestration.cmake @@ -98,13 +98,16 @@ eve_declare_module(NAME voxel_editing LAYER 6 OPTIONAL_DEPS voxel GROUP 3d) # L7 -- domain editor adapters -eve_declare_module(NAME tilelayer_target LAYER 7 SCRIPT TileLayerTargetModule SLOT tileLayerTarget +eve_declare_module(NAME tilelayer_target DIR map/tilelayer_target LAYER 7 + SCRIPT TileLayerTargetModule SLOT tileLayerTarget DEPS editor map map_editing GROUP 3d) -eve_declare_module(NAME heightmap_target LAYER 7 SCRIPT HeightmapTargetModule SLOT heightmapTarget +eve_declare_module(NAME heightmap_target DIR procgen/heightmap_target LAYER 7 + SCRIPT HeightmapTargetModule SLOT heightmapTarget DEPS editor procgen procgen_editing procgen_graphics_editing GROUP 3d) -eve_declare_module(NAME voxelworld_target LAYER 7 SCRIPT VoxelWorldTargetModule SLOT voxelWorldTarget +eve_declare_module(NAME voxelworld_target DIR voxel/voxelworld_target LAYER 7 + SCRIPT VoxelWorldTargetModule SLOT voxelWorldTarget DEPS editor voxel voxel_editing GROUP 3d) # Domain-facing editor compatibility adapters. These modules preserve the diff --git a/cmake/modules.cmake b/cmake/modules.cmake index 6bc37512..4cce569a 100644 --- a/cmake/modules.cmake +++ b/cmake/modules.cmake @@ -15,14 +15,85 @@ # pick a preset (default: full) # -DEVENGINE_MODULE_=ON|OFF override one module # +# Authoring facets are nested under the host package: +# src/modules/animation/editing -> NAME animation_editing +# src/modules/pixelworld/physics -> NAME pixelworld_physics +# src/modules/scene/loader -> NAME sceneloader +# src/modules/graphics/material -> NAME material_editing / material_editor +# runtime-3d drops every module whose DIR leaf is editing/editor/graphics_editing. +# # See docs/dev/模块编排与裁剪架构.md. include_guard(GLOBAL) set(EVE_ALL_MODULES "" CACHE INTERNAL "Every declared module, in declaration order") +# Maps an authoring/runtime stem onto its package root under src/modules. +# Empty hosts (biome, input, ...) live under the real domain; sceneloader is +# scene's loader facet. +function(eve_package_root stem out) + if(stem STREQUAL "biome") + set(${out} "procgen/biome" PARENT_SCOPE) + elseif(stem STREQUAL "domain_gizmo") + set(${out} "editor/gizmo" PARENT_SCOPE) + elseif(stem STREQUAL "localization") + set(${out} "i18n" PARENT_SCOPE) + elseif(stem STREQUAL "material") + set(${out} "graphics/material" PARENT_SCOPE) + elseif(stem STREQUAL "lighting") + set(${out} "graphics/lighting" PARENT_SCOPE) + elseif(stem STREQUAL "input") + set(${out} "editor/input" PARENT_SCOPE) + elseif(stem STREQUAL "queue") + set(${out} "editor/queue" PARENT_SCOPE) + elseif(stem STREQUAL "level") + set(${out} "map/level" PARENT_SCOPE) + elseif(stem STREQUAL "sceneloader") + set(${out} "scene/loader" PARENT_SCOPE) + else() + set(${out} "${stem}" PARENT_SCOPE) + endif() +endfunction() + +function(eve_default_module_dir name out) + if(name MATCHES "_graphics_editing$") + string(REGEX REPLACE "_graphics_editing$" "" _stem "${name}") + eve_package_root("${_stem}" _root) + set(${out} "${_root}/graphics_editing" PARENT_SCOPE) + elseif(name MATCHES "_editing$") + string(REGEX REPLACE "_editing$" "" _stem "${name}") + eve_package_root("${_stem}" _root) + set(${out} "${_root}/editing" PARENT_SCOPE) + elseif(name MATCHES "_editor$") + string(REGEX REPLACE "_editor$" "" _stem "${name}") + eve_package_root("${_stem}" _root) + set(${out} "${_root}/editor" PARENT_SCOPE) + elseif(name STREQUAL "buildingfx") + set(${out} "building/fx" PARENT_SCOPE) + else() + set(_eve_mapped FALSE) + set(_eve_dir "") + foreach(_facet IN ITEMS streaming graphics physics procgen import replay scene thread) + if(NOT _eve_mapped AND name MATCHES "_${_facet}$") + string(REGEX REPLACE "_${_facet}$" "" _stem "${name}") + eve_package_root("${_stem}" _root) + set(_eve_dir "${_root}/${_facet}") + set(_eve_mapped TRUE) + endif() + endforeach() + if(NOT _eve_mapped) + eve_package_root("${name}" _root) + set(_eve_dir "${_root}") + endif() + set(${out} "${_eve_dir}" PARENT_SCOPE) + endif() +endfunction() + # eve_declare_module( -# NAME directory under src/modules and manifest key +# NAME manifest key / CMake switch / boot contract name +# DIR sources under src/modules/ (default: NAME, +# or / for authoring and runtime +# satellites such as editing/editor/graphics/physics) # LIB OBJECT library name (default: EV) # LAYER informational; matches scripts/module_depgraph.py # DEPS ... modules that must also be enabled @@ -39,7 +110,7 @@ set(EVE_ALL_MODULES "" CACHE INTERNAL "Every declared module, in declaration ord # ) function(eve_declare_module) set(options REQUIRED CORE) - set(oneValue NAME LIB LAYER) + set(oneValue NAME LIB LAYER DIR) set(multiValue DEPS OPTIONAL_DEPS THIRDPARTY GROUP SCRIPT SLOT) cmake_parse_arguments(M "${options}" "${oneValue}" "${multiValue}" ${ARGN}) @@ -53,7 +124,11 @@ function(eve_declare_module) string(TOUPPER "${_first}" _first) set(M_LIB "EV${_first}${_rest}") endif() + if(NOT M_DIR) + eve_default_module_dir("${M_NAME}" M_DIR) + endif() + set(EVE_MODULE_${M_NAME}_DIR "${M_DIR}" CACHE INTERNAL "") set(EVE_MODULE_${M_NAME}_LIB "${M_LIB}" CACHE INTERNAL "") set(EVE_MODULE_${M_NAME}_DEPS "${M_DEPS}" CACHE INTERNAL "") set(EVE_MODULE_${M_NAME}_OPTIONAL_DEPS "${M_OPTIONAL_DEPS}" CACHE INTERNAL "") @@ -77,6 +152,58 @@ function(eve_declare_module) set(EVE_ALL_MODULES "${EVE_ALL_MODULES}" CACHE INTERNAL "Every declared module") endfunction() +# Source directory relative to src/modules (or src/engine for CORE). +function(eve_module_scan_dir name out) + if(DEFINED EVE_MODULE_${name}_DIR AND NOT "${EVE_MODULE_${name}_DIR}" STREQUAL "") + set(${out} "${EVE_MODULE_${name}_DIR}" PARENT_SCOPE) + else() + set(${out} "${name}" PARENT_SCOPE) + endif() +endfunction() + +# Immediate child directory names of other modules nested under this one. +# The parent source glob must skip them so a disabled facet is not compiled +# into the host package. +function(eve_module_nested_scan_excludes name out) + eve_module_scan_dir("${name}" _root) + set(_heads "") + foreach(_other IN LISTS EVE_ALL_MODULES) + if(_other STREQUAL name) + continue() + endif() + eve_module_scan_dir("${_other}" _odir) + string(FIND "${_odir}" "${_root}/" _at) + if(_at EQUAL 0) + string(LENGTH "${_root}" _len) + math(EXPR _start "${_len} + 1") + string(SUBSTRING "${_odir}" ${_start} -1 _rel) + string(REGEX REPLACE "/.*" "" _head "${_rel}") + if(_head) + list(APPEND _heads "${_head}") + endif() + endif() + endforeach() + if(_heads) + list(REMOVE_DUPLICATES _heads) + endif() + set(${out} "${_heads}" PARENT_SCOPE) +endfunction() + +# Authoring facets live in nested editing/editor directories. Runtime-only +# profiles drop every module whose scan dir ends with those names (plus the +# three editor-only *_target adapters). +function(eve_module_is_authoring_facet name out) + eve_module_scan_dir("${name}" _dir) + get_filename_component(_leaf "${_dir}" NAME) + if(_leaf STREQUAL "editing" OR _leaf STREQUAL "editor" OR _leaf STREQUAL "graphics_editing") + set(${out} TRUE PARENT_SCOPE) + elseif(name MATCHES "_target$") + set(${out} TRUE PARENT_SCOPE) + else() + set(${out} FALSE PARENT_SCOPE) + endif() +endfunction() + # Whether a module survived resolution. Use to guard per-module tweaks. function(eve_module_enabled name out) if("${name}" IN_LIST EVE_ENABLED_MODULES) @@ -180,8 +307,8 @@ function(eve_resolve_modules) set(_on TRUE) endif() - if(EVENGINE_PROFILE STREQUAL "runtime-3d" AND - m MATCHES "^(editor|editing|.*_editing|.*_editor|tilelayer_target|heightmap_target|voxelworld_target)$") + eve_module_is_authoring_facet("${m}" _authoring) + if(EVENGINE_PROFILE STREQUAL "runtime-3d" AND _authoring) set(_on FALSE) endif() @@ -229,9 +356,10 @@ function(eve_resolve_modules) if(EVENGINE_PROFILE STREQUAL "runtime-3d") foreach(m IN LISTS _wanted) - if(m MATCHES "^(editor|editing|.*_editing|.*_editor|tilelayer_target|heightmap_target|voxelworld_target)$") + eve_module_is_authoring_facet("${m}" _authoring) + if(_authoring) message(FATAL_ERROR - "Runtime-only profile '${EVENGINE_PROFILE}' acquired editing module '${m}'") + "Runtime-only profile '${EVENGINE_PROFILE}' acquired authoring dir '${EVE_MODULE_${m}_DIR}' (module '${m}')") endif() endforeach() endif() @@ -320,7 +448,7 @@ function(eve_write_module_manifest out_file) set(_required false) endif() list(APPEND _contracts - "{ name = \"${m}\", enabled = ${_enabled}, required = ${_required}, layer = ${EVE_MODULE_${m}_LAYER}, deps = ${_DEPS_array}, optionalDeps = ${_OPTIONAL_DEPS_array}, profiles = ${_GROUP_array}, classes = ${_SCRIPT_array}, slots = ${_SLOT_array} }") + "{ name = \"${m}\", dir = \"${EVE_MODULE_${m}_DIR}\", enabled = ${_enabled}, required = ${_required}, layer = ${EVE_MODULE_${m}_LAYER}, deps = ${_DEPS_array}, optionalDeps = ${_OPTIONAL_DEPS_array}, profiles = ${_GROUP_array}, classes = ${_SCRIPT_array}, slots = ${_SLOT_array} }") endforeach() string(JOIN "\n " _joined ${_entries}) string(JOIN "\n " _contracts_joined ${_contracts}) diff --git a/cmake/rescan_source.cmake b/cmake/rescan_source.cmake index 836bd469..be508227 100644 --- a/cmake/rescan_source.cmake +++ b/cmake/rescan_source.cmake @@ -3,7 +3,10 @@ # -P script on Linux/macOS Ninja builds). include("${CMAKE_CURRENT_LIST_DIR}/collect_module_sources.cmake") -set(_eve_src_txt "${output_dir}/${module_name}_src.txt") +if(NOT DEFINED list_name) + set(list_name "${module_name}") +endif() +set(_eve_src_txt "${output_dir}/${list_name}_src.txt") if(NOT EXISTS "${_eve_src_txt}") file(WRITE "${_eve_src_txt}" "${file_list}") message(WARNING "Rerun CMake to update source files") diff --git a/cmake/scan_source.cmake b/cmake/scan_source.cmake index cf5f4172..532d86ea 100644 --- a/cmake/scan_source.cmake +++ b/cmake/scan_source.cmake @@ -3,7 +3,10 @@ # script on Linux/macOS Ninja builds). include("${CMAKE_CURRENT_LIST_DIR}/collect_module_sources.cmake") -set(_eve_src_txt "${output_dir}/${module_name}_src.txt") +if(NOT DEFINED list_name) + set(list_name "${module_name}") +endif() +set(_eve_src_txt "${output_dir}/${list_name}_src.txt") set(_eve_write TRUE) if(EXISTS "${_eve_src_txt}") file(READ "${_eve_src_txt}" _eve_old) diff --git a/docs/dev/superpowers/specs/2026-08-18-network-module-improvement-design.md b/docs/dev/superpowers/specs/2026-08-18-network-module-improvement-design.md index 1884acc7..b236d219 100644 --- a/docs/dev/superpowers/specs/2026-08-18-network-module-improvement-design.md +++ b/docs/dev/superpowers/specs/2026-08-18-network-module-improvement-design.md @@ -173,7 +173,7 @@ Godot 4.x 内置网络栈，差距集中在「游戏网络层」：UDP 可靠性 仅链接 network 模块 + Poco + 脚本库）四项全绿： 序列化往返 / 越界安全 / 2 MiB TCP 冲刷（逐字节校验）/ 512 KiB Channel 帧重组。 - `test/network.cpp` 新增同套用例，单独编译通过；全量 `unit_test` 本机受阻于 - **既有** `src/modules/sceneloader/SceneLoader.cpp` 编译错误（引用 `SceneNode` + **既有** `src/modules/scene/loader/SceneLoader.cpp` 编译错误（引用 `SceneNode` 不存在的成员，主仓库该文件已更新、本 worktree 落后），与本改动无关。 待依赖更新后继续：1.3 HTTPS/TLS（third-party 需补 OpenSSL + Poco NetSSL_OpenSSL）、 diff --git a/docs/dev/superpowers/specs/2026-08-18-test-suite-pruning.md b/docs/dev/superpowers/specs/2026-08-18-test-suite-pruning.md index 5e7c6e91..17313aef 100644 --- a/docs/dev/superpowers/specs/2026-08-18-test-suite-pruning.md +++ b/docs/dev/superpowers/specs/2026-08-18-test-suite-pruning.md @@ -87,4 +87,4 @@ Spine 旋转父级偏移、IK2D 求解追踪、IK3D 偏移投影、按名重附 > 备注：远端 main（fbf9db0）的 scene-ecs 合并存在已知编译问题 > （`SceneLoader.cpp` 引用不存在的 `SceneNode::linkTarget/linkKind`），为让本 PR 可编译， > 按仓库 `codex/fix-sceneloader-merge-ci` 分支的修复一并提交了这两处补丁 -> （`src/modules/sceneloader/SceneLoader.cpp` + `test/sceneloader.cpp`）。 +> （`src/modules/scene/loader/SceneLoader.cpp` + `test/sceneloader.cpp`）。 diff --git a/docs/dev/模块编排与裁剪架构.md b/docs/dev/模块编排与裁剪架构.md index 545b4ea8..4ed6d5b0 100644 --- a/docs/dev/模块编排与裁剪架构.md +++ b/docs/dev/模块编排与裁剪架构.md @@ -464,6 +464,7 @@ cmake -B build -DEVENGINE_PROFILE=minimal # 引擎壳：L0–L3 + 窗口/事 cmake -B build -DEVENGINE_PROFILE=2d # LÖVE 级 2D cmake -B build -DEVENGINE_PROFILE=3d # 3D cmake -B build -DEVENGINE_PROFILE=full # 全部（默认，与改造前完全一致） +cmake -B build -DEVENGINE_PROFILE=runtime-3d # 3d 运行时：排除 editing/editor 目录 cmake -B build -DEVENGINE_PROFILE=web # 浏览器（Emscripten 自动选中） # 单个模块开关，两种大小写都认 @@ -488,6 +489,34 @@ CMake Error: Module 'devtools' needs 'procgen', which was disabled with -DEVENGINE_MODULE_procgen=OFF. Disable 'devtools' too, or re-enable 'procgen'. ``` +### 包目录：宿主模块下嵌套卫星包 + +`src/modules/` 不再为每个卫星包平铺一个顶层目录。领域运行时仍是 +`src/modules//`；编辑器、渲染桥和可选运行时切片放在同宿主下的固定子目录： + +| 子目录 | 清单 NAME 规则 | include | +|--------|----------------|---------| +| `/editing/` | `_editing` | `"/editing/Header.h"` | +| `/editor/` | `_editor` | `"/editor/Header.h"` | +| `/graphics_editing/` | `_graphics_editing` | `"/graphics_editing/Header.h"` | +| `/graphics/` 等 | `_graphics` / `_physics` / `_import` / … | `"/graphics/Header.h"` | +| `building/fx/` | `buildingfx` | `"building/fx/Header.h"` | + +没有独立运行时宿主的 authoring 包挂在真正的领域目录下，不占用 top-level 名字： +`procgen/biome`、`editor/gizmo`、`i18n/{editing,editor}`、`graphics/material`、 +`graphics/lighting`、`editor/input`、`editor/queue`、`map/level`。 +场景导入是 `scene/loader`（NAME 仍是 `sceneloader`）。`DIR` 可由 NAME 后缀加 +`eve_package_root` 别名推导，也可在 `eve_declare_module` 里显式写出。 + +裁剪规则按**目录叶名**，不是按再发明一套顶层包： + +- 宿主的 `create_module()` 扫描会排除这些嵌套子目录，因此关掉 facet 模块不会把源码 + 编进宿主库。 +- `EVENGINE_PROFILE=runtime-3d` 丢弃所有 scan dir 叶名为 `editing` / `editor` / + `graphics_editing` 的模块，以及 `*_target` 编辑适配器。 +- 仍可用 `-DEVENGINE_MODULE_=OFF` 关掉单个 facet（含 `buildingfx`、 + `pixelworld_physics`、`asset_import` 等运行时卫星）。 + ### S7：三条反向边清零 三条反向边已全部清零（`module_depgraph.py` 的 `KNOWN_BACK_EDGES` 为空）： @@ -528,11 +557,13 @@ CMake Error: Module 'devtools' needs 'procgen', which was disabled with ## 附录 A：分析方法 -本文的依赖图由扫描 `src/modules/**/*.{cpp,h,hpp}` 的 `#include` 得到，规则： +本文的依赖图由扫描各模块 ``DIR`` 下 `*.{cpp,h,hpp}` 的 `#include` 得到，规则： - 只有**带子路径**的 include 才算跨模块依赖（`#include "map/Map.h"`）。 裸 `#include ` / `` / `` 是标准库头，必须排除—— 否则会误报 `mouse→map`、`audio→thread` 等约 10 条不存在的边。 +- include 通过**最长 DIR 前缀**归属模块（`animation/editing/Foo.h` 属于 + `animation_editing`，不是 `animation`）。宿主扫描会跳过嵌套 facet 目录。 - 区分头文件中的 include（公开 API 泄漏，标 `*`）与仅 `.cpp` 中的 include（实现细节，更易解耦）。 - 分层由移除 §3.2 那 16 条反向边后的最长路径深度确定。 diff --git a/docs/usr/modules/pixelworld_editor.md b/docs/usr/modules/pixelworld_editor.md index 6fe42e7a..806c29f8 100644 --- a/docs/usr/modules/pixelworld_editor.md +++ b/docs/usr/modules/pixelworld_editor.md @@ -21,5 +21,5 @@ fingerprint 进入已有的暂停世界事务热重载路径。世界不存在 脚本侧的 `pixelworldEditor.openCatalog()`、`closeCatalog()` 与 `isCatalogOpen()` 提供应用 入口；`examples/pixelworld` 默认打开该面板，便于边运行材料仿真边编辑 Catalog draft。 -源码：[`src/modules/pixelworld_editor/`](../../../src/modules/pixelworld_editor/)。 +源码：[`src/modules/pixelworld/editor/`](../../../src/modules/pixelworld/editor/)。 测试：[`test/pixelworld_editor.cpp`](../../../test/pixelworld_editor.cpp)。 diff --git a/docs/usr/modules/pixelworld_replay.md b/docs/usr/modules/pixelworld_replay.md index 2067797b..1e38fa94 100644 --- a/docs/usr/modules/pixelworld_replay.md +++ b/docs/usr/modules/pixelworld_replay.md @@ -20,5 +20,5 @@ hash 必须由宿主注入，模块不默认选择弱 hash。`restoreSnapshot()` 非 canonical Chunk 顺序和未知新版本都不会部分修改旧日志。version 1 可迁移到 version 2，其 checkpoint 保留 world digest，但没有当时尚未编码的每 Chunk 诊断。 -源码：[`src/modules/pixelworld_replay/`](../../../src/modules/pixelworld_replay/)。 +源码：[`src/modules/pixelworld/replay/`](../../../src/modules/pixelworld/replay/)。 测试：[`test/pixelworld_replay.cpp`](../../../test/pixelworld_replay.cpp)。 diff --git a/docs/usr/modules/pixelworld_streaming.md b/docs/usr/modules/pixelworld_streaming.md index 13c94f49..e0f87338 100644 --- a/docs/usr/modules/pixelworld_streaming.md +++ b/docs/usr/modules/pixelworld_streaming.md @@ -33,5 +33,5 @@ little-endian cell bytes，可选择 `None` 或 zstd level 3，并保存独立 d version 1/2 的 5-byte legacy cell 仍可迁移，缺失 residual 恢复为 0，version 1 缺失的 `sourceLastEditSequence` 也恢复为 0。 -源码：[`src/modules/pixelworld_streaming/`](../../../src/modules/pixelworld_streaming/)。 +源码：[`src/modules/pixelworld/streaming/`](../../../src/modules/pixelworld/streaming/)。 测试：[`test/pixelworld_streaming.cpp`](../../../test/pixelworld_streaming.cpp)。 diff --git a/scripts/architecture_contracts.json b/scripts/architecture_contracts.json index ab661f9b..d2227e4b 100644 --- a/scripts/architecture_contracts.json +++ b/scripts/architecture_contracts.json @@ -270,13 +270,13 @@ { "id": "pixelworld-thread-system-contract", "rule": "ecs-system", - "scope": "src/modules/pixelworld_thread/PixelWorldThread.h", + "scope": "src/modules/pixelworld/thread/PixelWorldThread.h", "owner": "pixelworld::PixelWorld", "issue": "EVENGINE-PIXELWORLD-PARALLEL", "reason": "PixelWorld worker scheduling must declare immutable phase reads, isolated candidate writes and canonical commit ordering.", "expiry": "2027-12-31", "evidence": [ - "src/modules/pixelworld_thread/PixelWorldThread.h", + "src/modules/pixelworld/thread/PixelWorldThread.h", "docs/dev/PixelWorld-Noita技术路线.md" ], "tests": [ diff --git a/scripts/check_module_manifest.py b/scripts/check_module_manifest.py index 953efdfb..c9e8cd27 100644 --- a/scripts/check_module_manifest.py +++ b/scripts/check_module_manifest.py @@ -5,8 +5,9 @@ The CMake manifest is intentionally the only module declaration source. This check is kept in Python so it can run before a toolchain is installed and so a bad section marker cannot be hidden by CMake's parser. A declaration must have an explicit ``LAYER`` and must sit below a matching ``# L`` section marker. -The check also compares the manifest with ``src/modules``; a new module cannot -silently compile outside the profile resolver. +The check also compares the manifest with ``src/modules`` (including nested +``DIR`` paths such as ``animation/editing``); a new module cannot silently +compile outside the profile resolver. Usage:: @@ -29,6 +30,7 @@ MODULES = ROOT / "src" / "modules" DECLARATION_START = re.compile(r"^\s*eve_declare_module\s*\(") NAME_RE = re.compile(r"\bNAME\s+([A-Za-z0-9_.-]+)") +DIR_RE = re.compile(r"\bDIR\s+([A-Za-z0-9_./-]+)") LAYER_RE = re.compile(r"\bLAYER\s+(-?\d+)") SECTION_RE = re.compile(r"^\s*#\s*((?:L-?\d+\s*(?:/|,)\s*)*L-?\d+)\b") MANIFEST_INCLUDE_RE = re.compile( @@ -40,6 +42,7 @@ MANIFEST_INCLUDE_RE = re.compile( @dataclass(frozen=True) class Declaration: name: str + dir: str layer: int | None section_layers: tuple[int, ...] line: int @@ -47,6 +50,61 @@ class Declaration: header_only: bool +SATELLITE_FACETS = ( + "streaming", + "graphics", + "physics", + "procgen", + "import", + "replay", + "scene", + "thread", +) +SPECIAL_DIRS = { + "buildingfx": "building/fx", +} +HOST_DIR_ALIASES = { + "biome": "procgen/biome", + "domain_gizmo": "editor/gizmo", + "localization": "i18n", + "material": "graphics/material", + "lighting": "graphics/lighting", + "input": "editor/input", + "queue": "editor/queue", + "level": "map/level", + "sceneloader": "scene/loader", +} + + +def package_root(stem: str) -> str: + return HOST_DIR_ALIASES.get(stem, stem) + + +def default_module_dir(name: str) -> str: + """Match cmake/modules.cmake DIR inference for nested packages.""" + + if name.endswith("_graphics_editing"): + return f"{package_root(name[: -len('_graphics_editing')])}/graphics_editing" + if name.endswith("_editing"): + return f"{package_root(name[: -len('_editing')])}/editing" + if name.endswith("_editor"): + return f"{package_root(name[: -len('_editor')])}/editor" + if name in SPECIAL_DIRS: + return SPECIAL_DIRS[name] + for facet in SATELLITE_FACETS: + suffix = f"_{facet}" + if name.endswith(suffix): + return f"{package_root(name[: -len(suffix)])}/{facet}" + return package_root(name) + + +def is_authoring_facet(name: str, directory: str | None = None) -> bool: + """True when a runtime-only profile must drop this module by directory.""" + + leaf = Path(directory or default_module_dir(name)).name + return leaf in {"editing", "editor", "graphics_editing"} or name.endswith("_target") + + def _section_layers(line: str) -> tuple[int, ...] | None: """Return layer numbers from a heading, or None for an ordinary comment.""" @@ -108,9 +166,16 @@ def parse_manifest(path: Path = MANIFEST) -> list[Declaration]: block, end = _balanced_block(lines, index) name = NAME_RE.search(block) layer = LAYER_RE.search(block) + declared_name = name.group(1) if name else "" + declared_dir = DIR_RE.search(block) declarations.append( Declaration( - name=name.group(1) if name else "", + name=declared_name, + dir=( + declared_dir.group(1) + if declared_dir + else default_module_dir(declared_name) + ), layer=int(layer.group(1)) if layer else None, section_layers=section, line=index + 1, @@ -125,18 +190,22 @@ def parse_manifest(path: Path = MANIFEST) -> list[Declaration]: def source_modules(root: Path = ROOT) -> set[str]: + """Return top-level directory names under src/modules (containers included).""" + modules_dir = root / "src" / "modules" return {path.name for path in modules_dir.iterdir() if path.is_dir()} def validate( declarations: list[Declaration], - modules: set[str], + modules_root: Path = MODULES, ) -> list[str]: """Return human-readable errors; an empty list means the contract passes.""" + modules = {path.name for path in modules_root.iterdir() if path.is_dir()} errors: list[str] = [] seen: set[str] = set() + justified_tops: set[str] = set() for declaration in declarations: if not declaration.name: errors.append(f"line {declaration.line}: declaration has no NAME") @@ -156,13 +225,16 @@ def validate( f"line {declaration.line}: {declaration.name} declares L{declaration.layer} " f"inside {expected} section" ) - if not declaration.core and declaration.name not in modules: - errors.append( - f"line {declaration.line}: {declaration.name} has no src/modules/{declaration.name}" - ) + if not declaration.core: + justified_tops.add(Path(declaration.dir).parts[0]) + module_path = modules_root / Path(*declaration.dir.split("/")) + if not module_path.is_dir(): + errors.append( + f"line {declaration.line}: {declaration.name} has no " + f"src/modules/{declaration.dir}" + ) - declared = {declaration.name for declaration in declarations if declaration.name and not declaration.core} - for missing in sorted(modules - declared): + for missing in sorted(modules - justified_tops): errors.append(f"src/modules/{missing}: no declaration in cmake/module_manifest.cmake") return errors @@ -194,10 +266,7 @@ def main(argv: list[str] | None = None) -> int: parser.add_argument("--json", action="store_true", help="emit machine-readable output") args = parser.parse_args(argv) declarations = parse_manifest(args.manifest) - modules = { - path.name for path in args.modules_dir.iterdir() if path.is_dir() - } - return report(declarations, validate(declarations, modules), args.json) + return report(declarations, validate(declarations, args.modules_dir), args.json) if __name__ == "__main__": diff --git a/scripts/module_depgraph.py b/scripts/module_depgraph.py index 1c34648c..df861446 100755 --- a/scripts/module_depgraph.py +++ b/scripts/module_depgraph.py @@ -59,6 +59,33 @@ def declared_layers(): return result +def module_source_roots(): + """Return {module_name: abs path} from the manifest DIR field.""" + roots = {} + for declaration in check_module_manifest.parse_manifest(): + if declaration.core or not declaration.name: + continue + roots[declaration.name] = os.path.join(MODULES_DIR, *declaration.dir.split("/")) + return roots + + +def include_prefixes(roots): + """Longest-first (dir_posix, module_name) so nested facets win.""" + prefixes = [] + for name, path in roots.items(): + rel = os.path.relpath(path, MODULES_DIR).replace("\\", "/") + prefixes.append((rel, name)) + prefixes.sort(key=lambda item: (-len(item[0]), item[0])) + return prefixes + + +def resolve_include_module(include, prefixes): + for prefix, name in prefixes: + if include == prefix or include.startswith(prefix + "/"): + return name + return None + + def scan(): """Return (modules, edges, header_edges). @@ -66,15 +93,27 @@ def scan(): header_edges[a][b] narrows that to includes in a's own headers, which leak into a's public API and are harder to decouple. """ - modules = sorted( - d for d in os.listdir(MODULES_DIR) if os.path.isdir(os.path.join(MODULES_DIR, d)) - ) - known = set(modules) + roots = module_source_roots() + modules = sorted(roots) + prefixes = include_prefixes(roots) edges = defaultdict(lambda: defaultdict(set)) header_edges = defaultdict(lambda: defaultdict(set)) - for module in modules: - for dirpath, _, files in os.walk(os.path.join(MODULES_DIR, module)): + for module, root in roots.items(): + if not os.path.isdir(root): + continue + nested_heads = set() + root_norm = os.path.normpath(root) + for other, other_root in roots.items(): + if other == module or not os.path.isdir(other_root): + continue + rel = os.path.relpath(os.path.normpath(other_root), root_norm) + if rel == "." or rel.startswith(".."): + continue + nested_heads.add(rel.split(os.sep)[0]) + for dirpath, dirnames, files in os.walk(root): + if os.path.normpath(dirpath) == root_norm: + dirnames[:] = [d for d in dirnames if d not in nested_heads] for name in files: if not name.endswith(SOURCE_EXT): continue @@ -82,10 +121,10 @@ def scan(): with open(path, encoding="utf-8", errors="ignore") as handle: text = handle.read() for include in INCLUDE_RE.findall(text): - head, _, _ = include.partition("/") - if not _: + if "/" not in include: continue - if head not in known or head == module: + head = resolve_include_module(include, prefixes) + if not head or head == module: continue edges[module][head].add(include) if name.endswith((".h", ".hpp")): diff --git a/scripts/profile_matrix.py b/scripts/profile_matrix.py index 090f9672..4d9fce49 100644 --- a/scripts/profile_matrix.py +++ b/scripts/profile_matrix.py @@ -53,16 +53,14 @@ PROFILES = ( ) HOSTLESS = {"procgen-core-only", "physics-core-only", "asset-core-only", "headless", "server"} RUNTIME_ONLY = {"runtime-3d"} -EDITOR_ADAPTERS = {"tilelayer_target", "heightmap_target", "voxelworld_target"} +_MODULE_DIRS: dict[str, str] | None = None def is_editor_module(name: str) -> bool: - return ( - name in {"editor", "editing"} - or name in EDITOR_ADAPTERS - or name.endswith("_editing") - or name.endswith("_editor") - ) + global _MODULE_DIRS + if _MODULE_DIRS is None: + _MODULE_DIRS = {item.name: item.dir for item in manifest.parse_manifest()} + return manifest.is_authoring_facet(name, _MODULE_DIRS.get(name)) CORE_SEEDS = { @@ -125,6 +123,7 @@ _KEYWORDS = { "NAME", "LIB", "LAYER", + "DIR", "DEPS", "OPTIONAL_DEPS", "THIRDPARTY", @@ -134,7 +133,7 @@ _KEYWORDS = { "REQUIRED", "CORE", } -_ONE_VALUE = {"NAME", "LIB", "LAYER"} +_ONE_VALUE = {"NAME", "LIB", "LAYER", "DIR"} _MULTI_VALUE = {"DEPS", "OPTIONAL_DEPS", "THIRDPARTY", "SCRIPT", "SLOT", "GROUP"} @@ -262,7 +261,7 @@ def resolve(profile: str, declared: list[ModuleContract] | None = None) -> tuple def check_contracts() -> int: declarations = manifest.parse_manifest() - errors = manifest.validate(declarations, manifest.source_modules()) + errors = manifest.validate(declarations, manifest.MODULES) try: module_contracts = contracts() except ValueError as error: diff --git a/src/modules/action_editor/ActionEditingCommands.cpp b/src/modules/action/editor/ActionEditingCommands.cpp similarity index 96% rename from src/modules/action_editor/ActionEditingCommands.cpp rename to src/modules/action/editor/ActionEditingCommands.cpp index 0ea5fad0..c0387950 100644 --- a/src/modules/action_editor/ActionEditingCommands.cpp +++ b/src/modules/action/editor/ActionEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "action_editor/ActionEditingCommands.h" +#include "action/editor/ActionEditingCommands.h" -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineEditor.h" #include "editing/EditingProperty.h" namespace eve::action_editor { diff --git a/src/modules/action_editor/ActionEditingCommands.h b/src/modules/action/editor/ActionEditingCommands.h similarity index 100% rename from src/modules/action_editor/ActionEditingCommands.h rename to src/modules/action/editor/ActionEditingCommands.h diff --git a/src/modules/action_editor/ActionEditorModule.cpp b/src/modules/action/editor/ActionEditorModule.cpp similarity index 94% rename from src/modules/action_editor/ActionEditorModule.cpp rename to src/modules/action/editor/ActionEditorModule.cpp index a1e3ed9f..688c249e 100644 --- a/src/modules/action_editor/ActionEditorModule.cpp +++ b/src/modules/action/editor/ActionEditorModule.cpp @@ -1,8 +1,8 @@ -#include "action_editor/ActionEditorModule.h" +#include "action/editor/ActionEditorModule.h" -#include "action_editor/ActionEditingCommands.h" -#include "action_editor/ActionTimelineEditor.h" -#include "action_editor/ActionTimelineScriptBindings.h" +#include "action/editor/ActionEditingCommands.h" +#include "action/editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineScriptBindings.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" diff --git a/src/modules/action_editor/ActionEditorModule.h b/src/modules/action/editor/ActionEditorModule.h similarity index 100% rename from src/modules/action_editor/ActionEditorModule.h rename to src/modules/action/editor/ActionEditorModule.h diff --git a/src/modules/action_editor/ActionPreviewController.cpp b/src/modules/action/editor/ActionPreviewController.cpp similarity index 99% rename from src/modules/action_editor/ActionPreviewController.cpp rename to src/modules/action/editor/ActionPreviewController.cpp index 21c74334..1a95b61b 100644 --- a/src/modules/action_editor/ActionPreviewController.cpp +++ b/src/modules/action/editor/ActionPreviewController.cpp @@ -1,4 +1,4 @@ -#include "action_editor/ActionPreviewController.h" +#include "action/editor/ActionPreviewController.h" #include #include diff --git a/src/modules/action_editor/ActionPreviewController.h b/src/modules/action/editor/ActionPreviewController.h similarity index 98% rename from src/modules/action_editor/ActionPreviewController.h rename to src/modules/action/editor/ActionPreviewController.h index 9959ab33..a8e45838 100644 --- a/src/modules/action_editor/ActionPreviewController.h +++ b/src/modules/action/editor/ActionPreviewController.h @@ -3,7 +3,7 @@ /** @file ActionPreviewController.h @brief Atomic action-preview transport and presentation orchestration. */ #include "action/ActionPreview.h" -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineEditor.h" #include "editor/EditorPresentation.h" #include diff --git a/src/modules/action_editor/ActionTimelineEditor.cpp b/src/modules/action/editor/ActionTimelineEditor.cpp similarity index 99% rename from src/modules/action_editor/ActionTimelineEditor.cpp rename to src/modules/action/editor/ActionTimelineEditor.cpp index eaa2a83d..ac74318a 100644 --- a/src/modules/action_editor/ActionTimelineEditor.cpp +++ b/src/modules/action/editor/ActionTimelineEditor.cpp @@ -1,4 +1,4 @@ -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineEditor.h" #include "editor/EditorProperty.h" diff --git a/src/modules/action_editor/ActionTimelineEditor.h b/src/modules/action/editor/ActionTimelineEditor.h similarity index 100% rename from src/modules/action_editor/ActionTimelineEditor.h rename to src/modules/action/editor/ActionTimelineEditor.h diff --git a/src/modules/action_editor/ActionTimelineScriptBindings.cpp b/src/modules/action/editor/ActionTimelineScriptBindings.cpp similarity index 98% rename from src/modules/action_editor/ActionTimelineScriptBindings.cpp rename to src/modules/action/editor/ActionTimelineScriptBindings.cpp index 232e83b0..f2235b16 100644 --- a/src/modules/action_editor/ActionTimelineScriptBindings.cpp +++ b/src/modules/action/editor/ActionTimelineScriptBindings.cpp @@ -1,11 +1,11 @@ -#include "action_editor/ActionTimelineScriptBindings.h" +#include "action/editor/ActionTimelineScriptBindings.h" #include "action/ActionNotifyRegistry.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" -#include "action_editor/ActionTimelineEditor.h" -#include "action_editor/ActionTimelineWidget.h" -#include "action_editor/ActionEditorModule.h" +#include "action/editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineWidget.h" +#include "action/editor/ActionEditorModule.h" #include "editor/EditorWorkspace.h" #include diff --git a/src/modules/action_editor/ActionTimelineScriptBindings.h b/src/modules/action/editor/ActionTimelineScriptBindings.h similarity index 100% rename from src/modules/action_editor/ActionTimelineScriptBindings.h rename to src/modules/action/editor/ActionTimelineScriptBindings.h diff --git a/src/modules/action_editor/ActionTimelineWidget.cpp b/src/modules/action/editor/ActionTimelineWidget.cpp similarity index 99% rename from src/modules/action_editor/ActionTimelineWidget.cpp rename to src/modules/action/editor/ActionTimelineWidget.cpp index 595b39d0..a165f0ce 100644 --- a/src/modules/action_editor/ActionTimelineWidget.cpp +++ b/src/modules/action/editor/ActionTimelineWidget.cpp @@ -1,4 +1,4 @@ -#include "action_editor/ActionTimelineWidget.h" +#include "action/editor/ActionTimelineWidget.h" #include #include diff --git a/src/modules/action_editor/ActionTimelineWidget.h b/src/modules/action/editor/ActionTimelineWidget.h similarity index 99% rename from src/modules/action_editor/ActionTimelineWidget.h rename to src/modules/action/editor/ActionTimelineWidget.h index 4455d3cc..03536691 100644 --- a/src/modules/action_editor/ActionTimelineWidget.h +++ b/src/modules/action/editor/ActionTimelineWidget.h @@ -3,7 +3,7 @@ /** @file ActionTimelineWidget.h @brief Renderer-neutral interactive action timeline widget. */ #include "action/ActionNotifyRegistry.h" -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineEditor.h" #include "editor/EditorPresentation.h" #include diff --git a/src/modules/action_editor/AnimationRootMotionPreviewSource.cpp b/src/modules/action/editor/AnimationRootMotionPreviewSource.cpp similarity index 98% rename from src/modules/action_editor/AnimationRootMotionPreviewSource.cpp rename to src/modules/action/editor/AnimationRootMotionPreviewSource.cpp index 92014b0d..32add8fd 100644 --- a/src/modules/action_editor/AnimationRootMotionPreviewSource.cpp +++ b/src/modules/action/editor/AnimationRootMotionPreviewSource.cpp @@ -1,4 +1,4 @@ -#include "action_editor/AnimationRootMotionPreviewSource.h" +#include "action/editor/AnimationRootMotionPreviewSource.h" #include "animation/AnimClip.h" #include "animation/AnimClipRegistry.h" diff --git a/src/modules/action_editor/AnimationRootMotionPreviewSource.h b/src/modules/action/editor/AnimationRootMotionPreviewSource.h similarity index 100% rename from src/modules/action_editor/AnimationRootMotionPreviewSource.h rename to src/modules/action/editor/AnimationRootMotionPreviewSource.h diff --git a/src/modules/animation_editing/AnimationClip.cpp b/src/modules/animation/editing/AnimationClip.cpp similarity index 99% rename from src/modules/animation_editing/AnimationClip.cpp rename to src/modules/animation/editing/AnimationClip.cpp index fde492cc..8a848116 100644 --- a/src/modules/animation_editing/AnimationClip.cpp +++ b/src/modules/animation/editing/AnimationClip.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationClip.h" +#include "animation/editing/AnimationClip.h" #include #include diff --git a/src/modules/animation_editing/AnimationClip.h b/src/modules/animation/editing/AnimationClip.h similarity index 99% rename from src/modules/animation_editing/AnimationClip.h rename to src/modules/animation/editing/AnimationClip.h index 166abe68..e345e419 100644 --- a/src/modules/animation_editing/AnimationClip.h +++ b/src/modules/animation/editing/AnimationClip.h @@ -1,6 +1,6 @@ #pragma once -#include "animation_editing/AnimationEditingTypes.h" +#include "animation/editing/AnimationEditingTypes.h" #include #include diff --git a/src/modules/animation_editing/AnimationClipRuntime.cpp b/src/modules/animation/editing/AnimationClipRuntime.cpp similarity index 98% rename from src/modules/animation_editing/AnimationClipRuntime.cpp rename to src/modules/animation/editing/AnimationClipRuntime.cpp index d595d697..e771d3d6 100644 --- a/src/modules/animation_editing/AnimationClipRuntime.cpp +++ b/src/modules/animation/editing/AnimationClipRuntime.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationClip.h" +#include "animation/editing/AnimationClip.h" #include "animation/AnimClip.h" #include "animation/AnimSkeleton.h" diff --git a/src/modules/animation_editing/AnimationEditingCommands.cpp b/src/modules/animation/editing/AnimationEditingCommands.cpp similarity index 99% rename from src/modules/animation_editing/AnimationEditingCommands.cpp rename to src/modules/animation/editing/AnimationEditingCommands.cpp index 44b6bdfd..71cd20b0 100644 --- a/src/modules/animation_editing/AnimationEditingCommands.cpp +++ b/src/modules/animation/editing/AnimationEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "animation_editing/AnimationEditingCommands.h" +#include "animation/editing/AnimationEditingCommands.h" -#include "animation_editing/AnimationClip.h" +#include "animation/editing/AnimationClip.h" #include diff --git a/src/modules/animation_editing/AnimationEditingCommands.h b/src/modules/animation/editing/AnimationEditingCommands.h similarity index 100% rename from src/modules/animation_editing/AnimationEditingCommands.h rename to src/modules/animation/editing/AnimationEditingCommands.h diff --git a/src/modules/animation_editing/AnimationEditingTypes.h b/src/modules/animation/editing/AnimationEditingTypes.h similarity index 100% rename from src/modules/animation_editing/AnimationEditingTypes.h rename to src/modules/animation/editing/AnimationEditingTypes.h diff --git a/src/modules/animation_editing/AnimationGraph.cpp b/src/modules/animation/editing/AnimationGraph.cpp similarity index 99% rename from src/modules/animation_editing/AnimationGraph.cpp rename to src/modules/animation/editing/AnimationGraph.cpp index 4a1b449b..7fa66311 100644 --- a/src/modules/animation_editing/AnimationGraph.cpp +++ b/src/modules/animation/editing/AnimationGraph.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationGraph.h" +#include "animation/editing/AnimationGraph.h" #include #include diff --git a/src/modules/animation_editing/AnimationGraph.h b/src/modules/animation/editing/AnimationGraph.h similarity index 98% rename from src/modules/animation_editing/AnimationGraph.h rename to src/modules/animation/editing/AnimationGraph.h index c1a2fc52..134f2370 100644 --- a/src/modules/animation_editing/AnimationGraph.h +++ b/src/modules/animation/editing/AnimationGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "animation_editing/AnimationEditingTypes.h" +#include "animation/editing/AnimationEditingTypes.h" #include "editing/EditingGraph.h" #include diff --git a/src/modules/animation_editing/AnimationGraphRuntime.cpp b/src/modules/animation/editing/AnimationGraphRuntime.cpp similarity index 99% rename from src/modules/animation_editing/AnimationGraphRuntime.cpp rename to src/modules/animation/editing/AnimationGraphRuntime.cpp index e4d863ca..e68398ee 100644 --- a/src/modules/animation_editing/AnimationGraphRuntime.cpp +++ b/src/modules/animation/editing/AnimationGraphRuntime.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationGraph.h" +#include "animation/editing/AnimationGraph.h" #include "animation/AnimClip.h" #include "animation/AnimStateMachine.h" diff --git a/src/modules/animation_editing/ProceduralBoneOverlay.cpp b/src/modules/animation/editing/ProceduralBoneOverlay.cpp similarity index 98% rename from src/modules/animation_editing/ProceduralBoneOverlay.cpp rename to src/modules/animation/editing/ProceduralBoneOverlay.cpp index 8f5c56d2..22ddb123 100644 --- a/src/modules/animation_editing/ProceduralBoneOverlay.cpp +++ b/src/modules/animation/editing/ProceduralBoneOverlay.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/ProceduralBoneOverlay.h" +#include "animation/editing/ProceduralBoneOverlay.h" #include "animation/DynamicBoneSolver.h" #include "animation/FootIKSolver.h" diff --git a/src/modules/animation_editing/ProceduralBoneOverlay.h b/src/modules/animation/editing/ProceduralBoneOverlay.h similarity index 100% rename from src/modules/animation_editing/ProceduralBoneOverlay.h rename to src/modules/animation/editing/ProceduralBoneOverlay.h diff --git a/src/modules/animation_editing/SkeletonOverlay.cpp b/src/modules/animation/editing/SkeletonOverlay.cpp similarity index 99% rename from src/modules/animation_editing/SkeletonOverlay.cpp rename to src/modules/animation/editing/SkeletonOverlay.cpp index cef0d34f..087888bc 100644 --- a/src/modules/animation_editing/SkeletonOverlay.cpp +++ b/src/modules/animation/editing/SkeletonOverlay.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/SkeletonOverlay.h" +#include "animation/editing/SkeletonOverlay.h" #include #include diff --git a/src/modules/animation_editing/SkeletonOverlay.h b/src/modules/animation/editing/SkeletonOverlay.h similarity index 100% rename from src/modules/animation_editing/SkeletonOverlay.h rename to src/modules/animation/editing/SkeletonOverlay.h diff --git a/src/modules/animation_editing/SkeletonOverlayRuntime.cpp b/src/modules/animation/editing/SkeletonOverlayRuntime.cpp similarity index 98% rename from src/modules/animation_editing/SkeletonOverlayRuntime.cpp rename to src/modules/animation/editing/SkeletonOverlayRuntime.cpp index 9ccb34f9..0f2464cc 100644 --- a/src/modules/animation_editing/SkeletonOverlayRuntime.cpp +++ b/src/modules/animation/editing/SkeletonOverlayRuntime.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/SkeletonOverlay.h" +#include "animation/editing/SkeletonOverlay.h" #include "animation/AnimPose.h" #include "animation/AnimSkeleton.h" diff --git a/src/modules/animation_editor/AnimationClipEditor.cpp b/src/modules/animation/editor/AnimationClipEditor.cpp similarity index 99% rename from src/modules/animation_editor/AnimationClipEditor.cpp rename to src/modules/animation/editor/AnimationClipEditor.cpp index 0460d4d8..64d094a6 100644 --- a/src/modules/animation_editor/AnimationClipEditor.cpp +++ b/src/modules/animation/editor/AnimationClipEditor.cpp @@ -1,4 +1,4 @@ -#include "animation_editor/AnimationClipEditor.h" +#include "animation/editor/AnimationClipEditor.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/animation_editor/AnimationClipEditor.h b/src/modules/animation/editor/AnimationClipEditor.h similarity index 98% rename from src/modules/animation_editor/AnimationClipEditor.h rename to src/modules/animation/editor/AnimationClipEditor.h index 8d8182f3..221021dc 100644 --- a/src/modules/animation_editor/AnimationClipEditor.h +++ b/src/modules/animation/editor/AnimationClipEditor.h @@ -5,8 +5,8 @@ * @brief UI-neutral animation clip editor: workspace, pose scrub, dope sheet, undo. */ -#include "animation_editing/AnimationClip.h" -#include "animation_editing/SkeletonOverlay.h" +#include "animation/editing/AnimationClip.h" +#include "animation/editing/SkeletonOverlay.h" #include "editing/EditingGizmo.h" #include "editor/EditorAuthority.h" #include "editor/EditorTransactionService.h" diff --git a/src/modules/animation_editor/AnimationClipEditorScriptBindings.cpp b/src/modules/animation/editor/AnimationClipEditorScriptBindings.cpp similarity index 98% rename from src/modules/animation_editor/AnimationClipEditorScriptBindings.cpp rename to src/modules/animation/editor/AnimationClipEditorScriptBindings.cpp index a88ff741..536f3e96 100644 --- a/src/modules/animation_editor/AnimationClipEditorScriptBindings.cpp +++ b/src/modules/animation/editor/AnimationClipEditorScriptBindings.cpp @@ -1,7 +1,7 @@ -#include "animation_editor/AnimationClipEditorScriptBindings.h" +#include "animation/editor/AnimationClipEditorScriptBindings.h" -#include "animation_editor/AnimationClipEditor.h" -#include "animation_editor/AnimationEditorModule.h" +#include "animation/editor/AnimationClipEditor.h" +#include "animation/editor/AnimationEditorModule.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" diff --git a/src/modules/animation_editor/AnimationClipEditorScriptBindings.h b/src/modules/animation/editor/AnimationClipEditorScriptBindings.h similarity index 100% rename from src/modules/animation_editor/AnimationClipEditorScriptBindings.h rename to src/modules/animation/editor/AnimationClipEditorScriptBindings.h diff --git a/src/modules/animation_editor/AnimationEditorModule.cpp b/src/modules/animation/editor/AnimationEditorModule.cpp similarity index 92% rename from src/modules/animation_editor/AnimationEditorModule.cpp rename to src/modules/animation/editor/AnimationEditorModule.cpp index 2e680c96..a573f695 100644 --- a/src/modules/animation_editor/AnimationEditorModule.cpp +++ b/src/modules/animation/editor/AnimationEditorModule.cpp @@ -1,8 +1,8 @@ -#include "animation_editor/AnimationEditorModule.h" +#include "animation/editor/AnimationEditorModule.h" -#include "animation_editing/AnimationClip.h" -#include "animation_editing/AnimationEditingCommands.h" -#include "animation_editor/AnimationClipEditorScriptBindings.h" +#include "animation/editing/AnimationClip.h" +#include "animation/editing/AnimationEditingCommands.h" +#include "animation/editor/AnimationClipEditorScriptBindings.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" diff --git a/src/modules/animation_editor/AnimationEditorModule.h b/src/modules/animation/editor/AnimationEditorModule.h similarity index 100% rename from src/modules/animation_editor/AnimationEditorModule.h rename to src/modules/animation/editor/AnimationEditorModule.h diff --git a/src/modules/animation_editor/EditorAnimationClip.h b/src/modules/animation/editor/EditorAnimationClip.h similarity index 95% rename from src/modules/animation_editor/EditorAnimationClip.h rename to src/modules/animation/editor/EditorAnimationClip.h index cbbe1489..c343e1dd 100644 --- a/src/modules/animation_editor/EditorAnimationClip.h +++ b/src/modules/animation/editor/EditorAnimationClip.h @@ -1,7 +1,7 @@ #pragma once /** @file @brief Compatibility include for canonical animation clip authoring. */ -#include "animation_editing/AnimationClip.h" +#include "animation/editing/AnimationClip.h" #include "editor/EditorAuthority.h" namespace eve::editor { diff --git a/src/modules/animation_editor/EditorAnimationGraph.h b/src/modules/animation/editor/EditorAnimationGraph.h similarity index 88% rename from src/modules/animation_editor/EditorAnimationGraph.h rename to src/modules/animation/editor/EditorAnimationGraph.h index 71bcc0e6..97ceef82 100644 --- a/src/modules/animation_editor/EditorAnimationGraph.h +++ b/src/modules/animation/editor/EditorAnimationGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "animation_editing/AnimationGraph.h" +#include "animation/editing/AnimationGraph.h" namespace eve::editor { using AnimationGraphCompileResult = animation_editing::AnimationGraphCompileResult; diff --git a/src/modules/animation_editor/EditorSkeletonOverlay.h b/src/modules/animation/editor/EditorSkeletonOverlay.h similarity index 90% rename from src/modules/animation_editor/EditorSkeletonOverlay.h rename to src/modules/animation/editor/EditorSkeletonOverlay.h index d6ea0a74..cb5a41dc 100644 --- a/src/modules/animation_editor/EditorSkeletonOverlay.h +++ b/src/modules/animation/editor/EditorSkeletonOverlay.h @@ -1,5 +1,5 @@ #pragma once -#include "animation_editing/SkeletonOverlay.h" +#include "animation/editing/SkeletonOverlay.h" namespace eve::editor { using SkeletonRetargetState=eve::animation_editing::SkeletonRetargetState; using SkeletonOverlayBone=eve::animation_editing::SkeletonOverlayBone; diff --git a/src/modules/animation/editor/animation_editor.cpp b/src/modules/animation/editor/animation_editor.cpp new file mode 100644 index 00000000..aace8117 --- /dev/null +++ b/src/modules/animation/editor/animation_editor.cpp @@ -0,0 +1,4 @@ +#include "animation/editor/AnimationEditorModule.h" +#include "animation/editor/EditorAnimationClip.h" +#include "animation/editor/EditorAnimationGraph.h" +#include "animation/editor/EditorSkeletonOverlay.h" diff --git a/src/modules/animation_editor/animation_editor.cpp b/src/modules/animation_editor/animation_editor.cpp deleted file mode 100644 index a92fcf39..00000000 --- a/src/modules/animation_editor/animation_editor.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "animation_editor/AnimationEditorModule.h" -#include "animation_editor/EditorAnimationClip.h" -#include "animation_editor/EditorAnimationGraph.h" -#include "animation_editor/EditorSkeletonOverlay.h" diff --git a/src/modules/asset_graphics/EvpackGraphicsLoader.cpp b/src/modules/asset/graphics/EvpackGraphicsLoader.cpp similarity index 99% rename from src/modules/asset_graphics/EvpackGraphicsLoader.cpp rename to src/modules/asset/graphics/EvpackGraphicsLoader.cpp index 3b302589..fc68a8a6 100644 --- a/src/modules/asset_graphics/EvpackGraphicsLoader.cpp +++ b/src/modules/asset/graphics/EvpackGraphicsLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_graphics/EvpackGraphicsLoader.h" +#include "asset/graphics/EvpackGraphicsLoader.h" #include "graphics/IMeshResourceFactory.h" diff --git a/src/modules/asset_graphics/EvpackGraphicsLoader.h b/src/modules/asset/graphics/EvpackGraphicsLoader.h similarity index 100% rename from src/modules/asset_graphics/EvpackGraphicsLoader.h rename to src/modules/asset/graphics/EvpackGraphicsLoader.h diff --git a/src/modules/asset_graphics/EvpackImageLoader.cpp b/src/modules/asset/graphics/EvpackImageLoader.cpp similarity index 98% rename from src/modules/asset_graphics/EvpackImageLoader.cpp rename to src/modules/asset/graphics/EvpackImageLoader.cpp index afc237a1..756cde4c 100644 --- a/src/modules/asset_graphics/EvpackImageLoader.cpp +++ b/src/modules/asset/graphics/EvpackImageLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_graphics/EvpackImageLoader.h" +#include "asset/graphics/EvpackImageLoader.h" #include #include diff --git a/src/modules/asset_graphics/EvpackImageLoader.h b/src/modules/asset/graphics/EvpackImageLoader.h similarity index 100% rename from src/modules/asset_graphics/EvpackImageLoader.h rename to src/modules/asset/graphics/EvpackImageLoader.h diff --git a/src/modules/asset_graphics/GraphicsImageFactoryAdapter.cpp b/src/modules/asset/graphics/GraphicsImageFactoryAdapter.cpp similarity index 97% rename from src/modules/asset_graphics/GraphicsImageFactoryAdapter.cpp rename to src/modules/asset/graphics/GraphicsImageFactoryAdapter.cpp index a1ad3558..48daf394 100644 --- a/src/modules/asset_graphics/GraphicsImageFactoryAdapter.cpp +++ b/src/modules/asset/graphics/GraphicsImageFactoryAdapter.cpp @@ -1,4 +1,4 @@ -#include "asset_graphics/EvpackImageLoader.h" +#include "asset/graphics/EvpackImageLoader.h" #include "graphics/IResourceFactory.h" diff --git a/src/modules/asset_graphics/GraphicsMeshFactoryAdapter.cpp b/src/modules/asset/graphics/GraphicsMeshFactoryAdapter.cpp similarity index 96% rename from src/modules/asset_graphics/GraphicsMeshFactoryAdapter.cpp rename to src/modules/asset/graphics/GraphicsMeshFactoryAdapter.cpp index d5512255..f3132879 100644 --- a/src/modules/asset_graphics/GraphicsMeshFactoryAdapter.cpp +++ b/src/modules/asset/graphics/GraphicsMeshFactoryAdapter.cpp @@ -1,4 +1,4 @@ -#include "asset_graphics/EvpackGraphicsLoader.h" +#include "asset/graphics/EvpackGraphicsLoader.h" #include "graphics/IResourceFactory.h" diff --git a/src/modules/asset_import/AssetCommand.cpp b/src/modules/asset/import/AssetCommand.cpp similarity index 99% rename from src/modules/asset_import/AssetCommand.cpp rename to src/modules/asset/import/AssetCommand.cpp index 297b4d2a..f7b7d0e0 100644 --- a/src/modules/asset_import/AssetCommand.cpp +++ b/src/modules/asset/import/AssetCommand.cpp @@ -2,10 +2,10 @@ #include "asset/AssetMigration.h" #include "asset/AssetDiff.h" #include "asset/AssetPackageStore.h" -#include "asset_import/AssetImporter.h" -#include "asset_import/UnityImporter.h" -#include "asset_import/UnrealImporter.h" -#include "asset_import/LegacyAnimationImporter.h" +#include "asset/import/AssetImporter.h" +#include "asset/import/UnityImporter.h" +#include "asset/import/UnrealImporter.h" +#include "asset/import/LegacyAnimationImporter.h" #include "cmdline/cmdline.h" diff --git a/src/modules/asset_import/AssetImporter.h b/src/modules/asset/import/AssetImporter.h similarity index 100% rename from src/modules/asset_import/AssetImporter.h rename to src/modules/asset/import/AssetImporter.h diff --git a/src/modules/asset_import/GltfImporter.cpp b/src/modules/asset/import/GltfImporter.cpp similarity index 99% rename from src/modules/asset_import/GltfImporter.cpp rename to src/modules/asset/import/GltfImporter.cpp index 92712496..12fd24da 100644 --- a/src/modules/asset_import/GltfImporter.cpp +++ b/src/modules/asset/import/GltfImporter.cpp @@ -1,6 +1,6 @@ -#include "asset_import/AssetImporter.h" +#include "asset/import/AssetImporter.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include #include diff --git a/src/modules/asset_import/ImageImporter.cpp b/src/modules/asset/import/ImageImporter.cpp similarity index 99% rename from src/modules/asset_import/ImageImporter.cpp rename to src/modules/asset/import/ImageImporter.cpp index 294095cf..ad6c3936 100644 --- a/src/modules/asset_import/ImageImporter.cpp +++ b/src/modules/asset/import/ImageImporter.cpp @@ -1,7 +1,7 @@ -#include "asset_import/AssetImporter.h" +#include "asset/import/AssetImporter.h" #include "asset/CanonicalImageCook.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" namespace eve::asset_import { namespace { diff --git a/src/modules/asset_import/ImportCommon.h b/src/modules/asset/import/ImportCommon.h similarity index 98% rename from src/modules/asset_import/ImportCommon.h rename to src/modules/asset/import/ImportCommon.h index 97d975ae..e43683fe 100644 --- a/src/modules/asset_import/ImportCommon.h +++ b/src/modules/asset/import/ImportCommon.h @@ -1,6 +1,6 @@ #pragma once -#include "asset_import/AssetImporter.h" +#include "asset/import/AssetImporter.h" #include "data/HashFunction.h" diff --git a/src/modules/asset_import/ImportReport.cpp b/src/modules/asset/import/ImportReport.cpp similarity index 99% rename from src/modules/asset_import/ImportReport.cpp rename to src/modules/asset/import/ImportReport.cpp index 8af06e75..45d1b5a3 100644 --- a/src/modules/asset_import/ImportReport.cpp +++ b/src/modules/asset/import/ImportReport.cpp @@ -1,4 +1,4 @@ -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include #include diff --git a/src/modules/asset_import/LegacyAnimationImporter.cpp b/src/modules/asset/import/LegacyAnimationImporter.cpp similarity index 99% rename from src/modules/asset_import/LegacyAnimationImporter.cpp rename to src/modules/asset/import/LegacyAnimationImporter.cpp index 9c9c2625..cd9a0687 100644 --- a/src/modules/asset_import/LegacyAnimationImporter.cpp +++ b/src/modules/asset/import/LegacyAnimationImporter.cpp @@ -1,6 +1,6 @@ -#include "asset_import/LegacyAnimationImporter.h" +#include "asset/import/LegacyAnimationImporter.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include #include diff --git a/src/modules/asset_import/LegacyAnimationImporter.h b/src/modules/asset/import/LegacyAnimationImporter.h similarity index 94% rename from src/modules/asset_import/LegacyAnimationImporter.h rename to src/modules/asset/import/LegacyAnimationImporter.h index 1d6a49f2..7811f3ca 100644 --- a/src/modules/asset_import/LegacyAnimationImporter.h +++ b/src/modules/asset/import/LegacyAnimationImporter.h @@ -2,7 +2,7 @@ /** @file LegacyAnimationImporter.h @brief Migration of legacy `*.anim.txt` fixtures to `.eva`. */ -#include "asset_import/AssetImporter.h" +#include "asset/import/AssetImporter.h" namespace eve::asset_import { diff --git a/src/modules/asset_import/TerrainImporter.cpp b/src/modules/asset/import/TerrainImporter.cpp similarity index 99% rename from src/modules/asset_import/TerrainImporter.cpp rename to src/modules/asset/import/TerrainImporter.cpp index 0b364be3..85c93b59 100644 --- a/src/modules/asset_import/TerrainImporter.cpp +++ b/src/modules/asset/import/TerrainImporter.cpp @@ -1,6 +1,6 @@ -#include "asset_import/TerrainImporter.h" +#include "asset/import/TerrainImporter.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include "common/Utf8Validation.h" diff --git a/src/modules/asset_import/TerrainImporter.h b/src/modules/asset/import/TerrainImporter.h similarity index 98% rename from src/modules/asset_import/TerrainImporter.h rename to src/modules/asset/import/TerrainImporter.h index e826f92d..ce18bd6f 100644 --- a/src/modules/asset_import/TerrainImporter.h +++ b/src/modules/asset/import/TerrainImporter.h @@ -5,7 +5,7 @@ * @brief Shared canonical terrain inputs used by Unreal and Unity adapters. */ -#include "asset_import/AssetImporter.h" +#include "asset/import/AssetImporter.h" namespace eve::asset_import { diff --git a/src/modules/asset_import/UnityImporter.cpp b/src/modules/asset/import/UnityImporter.cpp similarity index 99% rename from src/modules/asset_import/UnityImporter.cpp rename to src/modules/asset/import/UnityImporter.cpp index 7dc97797..3e620f33 100644 --- a/src/modules/asset_import/UnityImporter.cpp +++ b/src/modules/asset/import/UnityImporter.cpp @@ -1,6 +1,6 @@ -#include "asset_import/UnityImporter.h" +#include "asset/import/UnityImporter.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include #include diff --git a/src/modules/asset_import/UnityImporter.h b/src/modules/asset/import/UnityImporter.h similarity index 96% rename from src/modules/asset_import/UnityImporter.h rename to src/modules/asset/import/UnityImporter.h index d6c97eb9..56ab9935 100644 --- a/src/modules/asset_import/UnityImporter.h +++ b/src/modules/asset/import/UnityImporter.h @@ -5,7 +5,7 @@ * @brief Direct Unity text-serialization adapter for TerrainData and Prefab assets. */ -#include "asset_import/TerrainImporter.h" +#include "asset/import/TerrainImporter.h" namespace eve::asset_import { diff --git a/src/modules/asset_import/UnrealImporter.cpp b/src/modules/asset/import/UnrealImporter.cpp similarity index 99% rename from src/modules/asset_import/UnrealImporter.cpp rename to src/modules/asset/import/UnrealImporter.cpp index 05185b07..6959ee9c 100644 --- a/src/modules/asset_import/UnrealImporter.cpp +++ b/src/modules/asset/import/UnrealImporter.cpp @@ -1,6 +1,6 @@ -#include "asset_import/UnrealImporter.h" +#include "asset/import/UnrealImporter.h" -#include "asset_import/ImportCommon.h" +#include "asset/import/ImportCommon.h" #include #include diff --git a/src/modules/asset_import/UnrealImporter.h b/src/modules/asset/import/UnrealImporter.h similarity index 96% rename from src/modules/asset_import/UnrealImporter.h rename to src/modules/asset/import/UnrealImporter.h index d04d3784..65dc0fdd 100644 --- a/src/modules/asset_import/UnrealImporter.h +++ b/src/modules/asset/import/UnrealImporter.h @@ -5,7 +5,7 @@ * @brief UE5/M⁴ landscape adapter that does not execute or link Unreal Engine. */ -#include "asset_import/TerrainImporter.h" +#include "asset/import/TerrainImporter.h" namespace eve::asset_import { diff --git a/src/modules/asset_procgen/EvpackInstanceSetLoader.cpp b/src/modules/asset/procgen/EvpackInstanceSetLoader.cpp similarity index 99% rename from src/modules/asset_procgen/EvpackInstanceSetLoader.cpp rename to src/modules/asset/procgen/EvpackInstanceSetLoader.cpp index f843dd28..9b6157c1 100644 --- a/src/modules/asset_procgen/EvpackInstanceSetLoader.cpp +++ b/src/modules/asset/procgen/EvpackInstanceSetLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_procgen/EvpackInstanceSetLoader.h" +#include "asset/procgen/EvpackInstanceSetLoader.h" #include "asset/RuntimeDefinition.h" #include "common/Utf8Validation.h" diff --git a/src/modules/asset_procgen/EvpackInstanceSetLoader.h b/src/modules/asset/procgen/EvpackInstanceSetLoader.h similarity index 100% rename from src/modules/asset_procgen/EvpackInstanceSetLoader.h rename to src/modules/asset/procgen/EvpackInstanceSetLoader.h diff --git a/src/modules/asset_procgen/EvpackPointGraphLoader.cpp b/src/modules/asset/procgen/EvpackPointGraphLoader.cpp similarity index 99% rename from src/modules/asset_procgen/EvpackPointGraphLoader.cpp rename to src/modules/asset/procgen/EvpackPointGraphLoader.cpp index c08abf0b..0e59efd4 100644 --- a/src/modules/asset_procgen/EvpackPointGraphLoader.cpp +++ b/src/modules/asset/procgen/EvpackPointGraphLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_procgen/EvpackPointGraphLoader.h" +#include "asset/procgen/EvpackPointGraphLoader.h" #include "common/Value.h" #include "asset/RuntimeDefinition.h" diff --git a/src/modules/asset_procgen/EvpackPointGraphLoader.h b/src/modules/asset/procgen/EvpackPointGraphLoader.h similarity index 100% rename from src/modules/asset_procgen/EvpackPointGraphLoader.h rename to src/modules/asset/procgen/EvpackPointGraphLoader.h diff --git a/src/modules/asset_procgen/EvpackTerrainLoader.cpp b/src/modules/asset/procgen/EvpackTerrainLoader.cpp similarity index 99% rename from src/modules/asset_procgen/EvpackTerrainLoader.cpp rename to src/modules/asset/procgen/EvpackTerrainLoader.cpp index 668683f4..3be7e808 100644 --- a/src/modules/asset_procgen/EvpackTerrainLoader.cpp +++ b/src/modules/asset/procgen/EvpackTerrainLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_procgen/EvpackTerrainLoader.h" +#include "asset/procgen/EvpackTerrainLoader.h" #include "common/Value.h" #include "asset/RuntimeDefinition.h" diff --git a/src/modules/asset_procgen/EvpackTerrainLoader.h b/src/modules/asset/procgen/EvpackTerrainLoader.h similarity index 100% rename from src/modules/asset_procgen/EvpackTerrainLoader.h rename to src/modules/asset/procgen/EvpackTerrainLoader.h diff --git a/src/modules/asset_procgen/EvpackTerrainMaterialLoader.cpp b/src/modules/asset/procgen/EvpackTerrainMaterialLoader.cpp similarity index 99% rename from src/modules/asset_procgen/EvpackTerrainMaterialLoader.cpp rename to src/modules/asset/procgen/EvpackTerrainMaterialLoader.cpp index 8b4e4f76..2bedef4b 100644 --- a/src/modules/asset_procgen/EvpackTerrainMaterialLoader.cpp +++ b/src/modules/asset/procgen/EvpackTerrainMaterialLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_procgen/EvpackTerrainMaterialLoader.h" +#include "asset/procgen/EvpackTerrainMaterialLoader.h" #include "asset/RuntimeDefinition.h" #include "common/Utf8Validation.h" diff --git a/src/modules/asset_procgen/EvpackTerrainMaterialLoader.h b/src/modules/asset/procgen/EvpackTerrainMaterialLoader.h similarity index 100% rename from src/modules/asset_procgen/EvpackTerrainMaterialLoader.h rename to src/modules/asset/procgen/EvpackTerrainMaterialLoader.h diff --git a/src/modules/asset_scene/EvpackSceneTemplateLoader.cpp b/src/modules/asset/scene/EvpackSceneTemplateLoader.cpp similarity index 99% rename from src/modules/asset_scene/EvpackSceneTemplateLoader.cpp rename to src/modules/asset/scene/EvpackSceneTemplateLoader.cpp index f6cd6ffa..7fa0f4b4 100644 --- a/src/modules/asset_scene/EvpackSceneTemplateLoader.cpp +++ b/src/modules/asset/scene/EvpackSceneTemplateLoader.cpp @@ -1,4 +1,4 @@ -#include "asset_scene/EvpackSceneTemplateLoader.h" +#include "asset/scene/EvpackSceneTemplateLoader.h" #include "common/Value.h" #include "asset/RuntimeDefinition.h" diff --git a/src/modules/asset_scene/EvpackSceneTemplateLoader.h b/src/modules/asset/scene/EvpackSceneTemplateLoader.h similarity index 100% rename from src/modules/asset_scene/EvpackSceneTemplateLoader.h rename to src/modules/asset/scene/EvpackSceneTemplateLoader.h diff --git a/src/modules/audio_editing/AudioEditingCommands.cpp b/src/modules/audio/editing/AudioEditingCommands.cpp similarity index 97% rename from src/modules/audio_editing/AudioEditingCommands.cpp rename to src/modules/audio/editing/AudioEditingCommands.cpp index 3da075b0..057de429 100644 --- a/src/modules/audio_editing/AudioEditingCommands.cpp +++ b/src/modules/audio/editing/AudioEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "audio_editing/AudioEditingCommands.h" +#include "audio/editing/AudioEditingCommands.h" -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include diff --git a/src/modules/audio_editing/AudioEditingCommands.h b/src/modules/audio/editing/AudioEditingCommands.h similarity index 100% rename from src/modules/audio_editing/AudioEditingCommands.h rename to src/modules/audio/editing/AudioEditingCommands.h diff --git a/src/modules/audio_editing/AudioEditingProvider.cpp b/src/modules/audio/editing/AudioEditingProvider.cpp similarity index 95% rename from src/modules/audio_editing/AudioEditingProvider.cpp rename to src/modules/audio/editing/AudioEditingProvider.cpp index 7e5fa88d..6bb19eaa 100644 --- a/src/modules/audio_editing/AudioEditingProvider.cpp +++ b/src/modules/audio/editing/AudioEditingProvider.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioEditingProvider.h" +#include "audio/editing/AudioEditingProvider.h" #include diff --git a/src/modules/audio_editing/AudioEditingProvider.h b/src/modules/audio/editing/AudioEditingProvider.h similarity index 97% rename from src/modules/audio_editing/AudioEditingProvider.h rename to src/modules/audio/editing/AudioEditingProvider.h index 391a2e92..6712cd36 100644 --- a/src/modules/audio_editing/AudioEditingProvider.h +++ b/src/modules/audio/editing/AudioEditingProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include "editing/EditingExtension.h" #include diff --git a/src/modules/audio_editing/AudioEditingTypes.h b/src/modules/audio/editing/AudioEditingTypes.h similarity index 100% rename from src/modules/audio_editing/AudioEditingTypes.h rename to src/modules/audio/editing/AudioEditingTypes.h diff --git a/src/modules/audio_editing/AudioEffects.cpp b/src/modules/audio/editing/AudioEffects.cpp similarity index 99% rename from src/modules/audio_editing/AudioEffects.cpp rename to src/modules/audio/editing/AudioEffects.cpp index 9916172b..d5ccc05c 100644 --- a/src/modules/audio_editing/AudioEffects.cpp +++ b/src/modules/audio/editing/AudioEffects.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioEffects.h" +#include "audio/editing/AudioEffects.h" #include #include diff --git a/src/modules/audio_editing/AudioEffects.h b/src/modules/audio/editing/AudioEffects.h similarity index 98% rename from src/modules/audio_editing/AudioEffects.h rename to src/modules/audio/editing/AudioEffects.h index 18ad115e..9104daf4 100644 --- a/src/modules/audio_editing/AudioEffects.h +++ b/src/modules/audio/editing/AudioEffects.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include #include diff --git a/src/modules/audio_editing/AudioImportDiagnostics.cpp b/src/modules/audio/editing/AudioImportDiagnostics.cpp similarity index 99% rename from src/modules/audio_editing/AudioImportDiagnostics.cpp rename to src/modules/audio/editing/AudioImportDiagnostics.cpp index e3106da3..ceb17bfb 100644 --- a/src/modules/audio_editing/AudioImportDiagnostics.cpp +++ b/src/modules/audio/editing/AudioImportDiagnostics.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioImportDiagnostics.h" +#include "audio/editing/AudioImportDiagnostics.h" #include #include diff --git a/src/modules/audio_editing/AudioImportDiagnostics.h b/src/modules/audio/editing/AudioImportDiagnostics.h similarity index 97% rename from src/modules/audio_editing/AudioImportDiagnostics.h rename to src/modules/audio/editing/AudioImportDiagnostics.h index 8c0aaf92..be15f7cc 100644 --- a/src/modules/audio_editing/AudioImportDiagnostics.h +++ b/src/modules/audio/editing/AudioImportDiagnostics.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioWaveform.h" +#include "audio/editing/AudioWaveform.h" #include #include diff --git a/src/modules/audio_editing/AudioMixerTarget.cpp b/src/modules/audio/editing/AudioMixerTarget.cpp similarity index 99% rename from src/modules/audio_editing/AudioMixerTarget.cpp rename to src/modules/audio/editing/AudioMixerTarget.cpp index 0ce3683b..2175a649 100644 --- a/src/modules/audio_editing/AudioMixerTarget.cpp +++ b/src/modules/audio/editing/AudioMixerTarget.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include diff --git a/src/modules/audio_editing/AudioPublishingTarget.cpp b/src/modules/audio/editing/AudioPublishingTarget.cpp similarity index 98% rename from src/modules/audio_editing/AudioPublishingTarget.cpp rename to src/modules/audio/editing/AudioPublishingTarget.cpp index 22762473..87e0b13f 100644 --- a/src/modules/audio_editing/AudioPublishingTarget.cpp +++ b/src/modules/audio/editing/AudioPublishingTarget.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" namespace eve::audio_editing { namespace { diff --git a/src/modules/audio_editing/AudioRuntime.cpp b/src/modules/audio/editing/AudioRuntime.cpp similarity index 98% rename from src/modules/audio_editing/AudioRuntime.cpp rename to src/modules/audio/editing/AudioRuntime.cpp index 0b196fdb..e5e8e00b 100644 --- a/src/modules/audio_editing/AudioRuntime.cpp +++ b/src/modules/audio/editing/AudioRuntime.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include "audio/Source.h" diff --git a/src/modules/audio_editing/AudioSerialization.cpp b/src/modules/audio/editing/AudioSerialization.cpp similarity index 99% rename from src/modules/audio_editing/AudioSerialization.cpp rename to src/modules/audio/editing/AudioSerialization.cpp index 07991fd9..55a2bcdc 100644 --- a/src/modules/audio_editing/AudioSerialization.cpp +++ b/src/modules/audio/editing/AudioSerialization.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include #include diff --git a/src/modules/audio_editing/AudioTarget.cpp b/src/modules/audio/editing/AudioTarget.cpp similarity index 99% rename from src/modules/audio_editing/AudioTarget.cpp rename to src/modules/audio/editing/AudioTarget.cpp index cf1c1ae3..8cf1866d 100644 --- a/src/modules/audio_editing/AudioTarget.cpp +++ b/src/modules/audio/editing/AudioTarget.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include #include diff --git a/src/modules/audio_editing/AudioTarget.h b/src/modules/audio/editing/AudioTarget.h similarity index 99% rename from src/modules/audio_editing/AudioTarget.h rename to src/modules/audio/editing/AudioTarget.h index 933c029b..527813ce 100644 --- a/src/modules/audio_editing/AudioTarget.h +++ b/src/modules/audio/editing/AudioTarget.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioEditingTypes.h" +#include "audio/editing/AudioEditingTypes.h" #include #include diff --git a/src/modules/audio_editing/AudioTransport.cpp b/src/modules/audio/editing/AudioTransport.cpp similarity index 99% rename from src/modules/audio_editing/AudioTransport.cpp rename to src/modules/audio/editing/AudioTransport.cpp index 8bfb65a7..3497f7bc 100644 --- a/src/modules/audio_editing/AudioTransport.cpp +++ b/src/modules/audio/editing/AudioTransport.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTransport.h" +#include "audio/editing/AudioTransport.h" #include #include diff --git a/src/modules/audio_editing/AudioTransport.h b/src/modules/audio/editing/AudioTransport.h similarity index 98% rename from src/modules/audio_editing/AudioTransport.h rename to src/modules/audio/editing/AudioTransport.h index 12de6607..072aa5b5 100644 --- a/src/modules/audio_editing/AudioTransport.h +++ b/src/modules/audio/editing/AudioTransport.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioEditingTypes.h" +#include "audio/editing/AudioEditingTypes.h" #include diff --git a/src/modules/audio_editing/AudioTransportRuntime.cpp b/src/modules/audio/editing/AudioTransportRuntime.cpp similarity index 96% rename from src/modules/audio_editing/AudioTransportRuntime.cpp rename to src/modules/audio/editing/AudioTransportRuntime.cpp index 7d663b69..5cc7a462 100644 --- a/src/modules/audio_editing/AudioTransportRuntime.cpp +++ b/src/modules/audio/editing/AudioTransportRuntime.cpp @@ -1,5 +1,5 @@ #include "audio/Source.h" -#include "audio_editing/AudioTransport.h" +#include "audio/editing/AudioTransport.h" namespace eve::audio_editing { void AudioSourceTransportBackend::play() { diff --git a/src/modules/audio_editing/AudioWaveform.cpp b/src/modules/audio/editing/AudioWaveform.cpp similarity index 99% rename from src/modules/audio_editing/AudioWaveform.cpp rename to src/modules/audio/editing/AudioWaveform.cpp index efd9af70..4b93ad82 100644 --- a/src/modules/audio_editing/AudioWaveform.cpp +++ b/src/modules/audio/editing/AudioWaveform.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioWaveform.h" +#include "audio/editing/AudioWaveform.h" #include #include diff --git a/src/modules/audio_editing/AudioWaveform.h b/src/modules/audio/editing/AudioWaveform.h similarity index 97% rename from src/modules/audio_editing/AudioWaveform.h rename to src/modules/audio/editing/AudioWaveform.h index 7f2ad53d..31a40bb7 100644 --- a/src/modules/audio_editing/AudioWaveform.h +++ b/src/modules/audio/editing/AudioWaveform.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editing/AudioEditingTypes.h" +#include "audio/editing/AudioEditingTypes.h" #include #include diff --git a/src/modules/audio_editor/AudioEditorModule.cpp b/src/modules/audio/editor/AudioEditorModule.cpp similarity index 91% rename from src/modules/audio_editor/AudioEditorModule.cpp rename to src/modules/audio/editor/AudioEditorModule.cpp index 8ae0fc9b..1872e1e6 100644 --- a/src/modules/audio_editor/AudioEditorModule.cpp +++ b/src/modules/audio/editor/AudioEditorModule.cpp @@ -1,9 +1,9 @@ -#include "audio_editor/AudioEditorModule.h" +#include "audio/editor/AudioEditorModule.h" -#include "audio_editing/AudioEditingCommands.h" -#include "audio_editor/AudioSourceEditorScriptBindings.h" -#include "audio_editing/AudioEffects.h" -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioEditingCommands.h" +#include "audio/editor/AudioSourceEditorScriptBindings.h" +#include "audio/editing/AudioEffects.h" +#include "audio/editing/AudioTarget.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" diff --git a/src/modules/audio_editor/AudioEditorModule.h b/src/modules/audio/editor/AudioEditorModule.h similarity index 100% rename from src/modules/audio_editor/AudioEditorModule.h rename to src/modules/audio/editor/AudioEditorModule.h diff --git a/src/modules/audio_editor/AudioSourceEditor.cpp b/src/modules/audio/editor/AudioSourceEditor.cpp similarity index 99% rename from src/modules/audio_editor/AudioSourceEditor.cpp rename to src/modules/audio/editor/AudioSourceEditor.cpp index 473e317c..52771ee4 100644 --- a/src/modules/audio_editor/AudioSourceEditor.cpp +++ b/src/modules/audio/editor/AudioSourceEditor.cpp @@ -1,6 +1,6 @@ -#include "audio_editor/AudioSourceEditor.h" +#include "audio/editor/AudioSourceEditor.h" -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include "common/Exception.h" #include "common/Module.h" diff --git a/src/modules/audio_editor/AudioSourceEditor.h b/src/modules/audio/editor/AudioSourceEditor.h similarity index 98% rename from src/modules/audio_editor/AudioSourceEditor.h rename to src/modules/audio/editor/AudioSourceEditor.h index 30cb0444..8efead4f 100644 --- a/src/modules/audio_editor/AudioSourceEditor.h +++ b/src/modules/audio/editor/AudioSourceEditor.h @@ -5,9 +5,9 @@ * @brief UI-neutral audio source editor: workspace, waveform, audition, undo. */ -#include "audio_editing/AudioTarget.h" -#include "audio_editing/AudioTransport.h" -#include "audio_editing/AudioWaveform.h" +#include "audio/editing/AudioTarget.h" +#include "audio/editing/AudioTransport.h" +#include "audio/editing/AudioWaveform.h" #include "editor/EditorAuthority.h" #include "editor/EditorSelection.h" #include "editor/EditorTransactionService.h" diff --git a/src/modules/audio_editor/AudioSourceEditorScriptBindings.cpp b/src/modules/audio/editor/AudioSourceEditorScriptBindings.cpp similarity index 98% rename from src/modules/audio_editor/AudioSourceEditorScriptBindings.cpp rename to src/modules/audio/editor/AudioSourceEditorScriptBindings.cpp index 1710c32c..1ec17f6e 100644 --- a/src/modules/audio_editor/AudioSourceEditorScriptBindings.cpp +++ b/src/modules/audio/editor/AudioSourceEditorScriptBindings.cpp @@ -1,7 +1,7 @@ -#include "audio_editor/AudioSourceEditorScriptBindings.h" +#include "audio/editor/AudioSourceEditorScriptBindings.h" -#include "audio_editor/AudioEditorModule.h" -#include "audio_editor/AudioSourceEditor.h" +#include "audio/editor/AudioEditorModule.h" +#include "audio/editor/AudioSourceEditor.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" diff --git a/src/modules/audio_editor/AudioSourceEditorScriptBindings.h b/src/modules/audio/editor/AudioSourceEditorScriptBindings.h similarity index 100% rename from src/modules/audio_editor/AudioSourceEditorScriptBindings.h rename to src/modules/audio/editor/AudioSourceEditorScriptBindings.h diff --git a/src/modules/audio_editor/EditorAudioEffects.h b/src/modules/audio/editor/EditorAudioEffects.h similarity index 87% rename from src/modules/audio_editor/EditorAudioEffects.h rename to src/modules/audio/editor/EditorAudioEffects.h index 0d8156cf..09d0bdfe 100644 --- a/src/modules/audio_editor/EditorAudioEffects.h +++ b/src/modules/audio/editor/EditorAudioEffects.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editor/EditorAudioTarget.h" +#include "audio/editor/EditorAudioTarget.h" /** * @file @@ -9,7 +9,7 @@ * The canonical implementation belongs to the optional audio_editing * satellite. New code should include audio_editing/AudioEffects.h directly. */ -#include "audio_editing/AudioEffects.h" +#include "audio/editing/AudioEffects.h" namespace eve::editor { using AudioEffectRecord = audio_editing::AudioEffectRecord; diff --git a/src/modules/audio_editor/EditorAudioImportDiagnostics.h b/src/modules/audio/editor/EditorAudioImportDiagnostics.h similarity index 86% rename from src/modules/audio_editor/EditorAudioImportDiagnostics.h rename to src/modules/audio/editor/EditorAudioImportDiagnostics.h index 941e5415..049aaa0d 100644 --- a/src/modules/audio_editor/EditorAudioImportDiagnostics.h +++ b/src/modules/audio/editor/EditorAudioImportDiagnostics.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editor/EditorAudioWaveform.h" +#include "audio/editor/EditorAudioWaveform.h" /** * @file @@ -9,7 +9,7 @@ * The canonical implementation belongs to the optional audio_editing * satellite. New code should include audio_editing/AudioImportDiagnostics.h directly. */ -#include "audio_editing/AudioImportDiagnostics.h" +#include "audio/editing/AudioImportDiagnostics.h" namespace eve::editor { using AudioImportInspectionRequest = audio_editing::AudioImportInspectionRequest; diff --git a/src/modules/audio_editor/EditorAudioTarget.h b/src/modules/audio/editor/EditorAudioTarget.h similarity index 95% rename from src/modules/audio_editor/EditorAudioTarget.h rename to src/modules/audio/editor/EditorAudioTarget.h index f0216113..3db13790 100644 --- a/src/modules/audio_editor/EditorAudioTarget.h +++ b/src/modules/audio/editor/EditorAudioTarget.h @@ -11,7 +11,7 @@ * The canonical implementation belongs to the optional audio_editing * satellite. New code should include audio_editing/AudioTarget.h directly. */ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" namespace eve::editor { using AudioSourceTarget = audio_editing::AudioSourceTarget; diff --git a/src/modules/audio_editor/EditorAudioTransport.h b/src/modules/audio/editor/EditorAudioTransport.h similarity index 94% rename from src/modules/audio_editor/EditorAudioTransport.h rename to src/modules/audio/editor/EditorAudioTransport.h index 1b29ac47..b63bc2a6 100644 --- a/src/modules/audio_editor/EditorAudioTransport.h +++ b/src/modules/audio/editor/EditorAudioTransport.h @@ -9,7 +9,7 @@ * The canonical implementation belongs to the optional audio_editing * satellite. New code should include audio_editing/AudioTransport.h directly. */ -#include "audio_editing/AudioTransport.h" +#include "audio/editing/AudioTransport.h" namespace eve::editor { using AudioTransportState = audio_editing::AudioTransportState; diff --git a/src/modules/audio_editor/EditorAudioWaveform.h b/src/modules/audio/editor/EditorAudioWaveform.h similarity index 94% rename from src/modules/audio_editor/EditorAudioWaveform.h rename to src/modules/audio/editor/EditorAudioWaveform.h index 0f45cf7a..4f771dff 100644 --- a/src/modules/audio_editor/EditorAudioWaveform.h +++ b/src/modules/audio/editor/EditorAudioWaveform.h @@ -9,7 +9,7 @@ * The canonical implementation belongs to the optional audio_editing * satellite. New code should include audio_editing/AudioWaveform.h directly. */ -#include "audio_editing/AudioWaveform.h" +#include "audio/editing/AudioWaveform.h" namespace eve::editor { using EditorAudioPcm = audio_editing::EditorAudioPcm; diff --git a/src/modules/audio/editor/audio_editor.cpp b/src/modules/audio/editor/audio_editor.cpp new file mode 100644 index 00000000..d4abe3da --- /dev/null +++ b/src/modules/audio/editor/audio_editor.cpp @@ -0,0 +1,6 @@ +#include "audio/editor/AudioEditorModule.h" +#include "audio/editor/EditorAudioEffects.h" +#include "audio/editor/EditorAudioImportDiagnostics.h" +#include "audio/editor/EditorAudioTarget.h" +#include "audio/editor/EditorAudioTransport.h" +#include "audio/editor/EditorAudioWaveform.h" diff --git a/src/modules/audio_editor/audio_editor.cpp b/src/modules/audio_editor/audio_editor.cpp deleted file mode 100644 index b38180cf..00000000 --- a/src/modules/audio_editor/audio_editor.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "audio_editor/AudioEditorModule.h" -#include "audio_editor/EditorAudioEffects.h" -#include "audio_editor/EditorAudioImportDiagnostics.h" -#include "audio_editor/EditorAudioTarget.h" -#include "audio_editor/EditorAudioTransport.h" -#include "audio_editor/EditorAudioWaveform.h" diff --git a/src/modules/avatar_editing/AvatarEditingCommands.cpp b/src/modules/avatar/editing/AvatarEditingCommands.cpp similarity index 98% rename from src/modules/avatar_editing/AvatarEditingCommands.cpp rename to src/modules/avatar/editing/AvatarEditingCommands.cpp index b273254e..bc66628d 100644 --- a/src/modules/avatar_editing/AvatarEditingCommands.cpp +++ b/src/modules/avatar/editing/AvatarEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "avatar_editing/AvatarEditingCommands.h" +#include "avatar/editing/AvatarEditingCommands.h" -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include "editing/EditingProperty.h" diff --git a/src/modules/avatar_editing/AvatarEditingCommands.h b/src/modules/avatar/editing/AvatarEditingCommands.h similarity index 100% rename from src/modules/avatar_editing/AvatarEditingCommands.h rename to src/modules/avatar/editing/AvatarEditingCommands.h diff --git a/src/modules/avatar_editing/AvatarRuntime.cpp b/src/modules/avatar/editing/AvatarRuntime.cpp similarity index 98% rename from src/modules/avatar_editing/AvatarRuntime.cpp rename to src/modules/avatar/editing/AvatarRuntime.cpp index 25e9b15b..8b171df2 100644 --- a/src/modules/avatar_editing/AvatarRuntime.cpp +++ b/src/modules/avatar/editing/AvatarRuntime.cpp @@ -1,4 +1,4 @@ -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include "avatar/AvatarInstance.h" diff --git a/src/modules/avatar_editing/AvatarTarget.cpp b/src/modules/avatar/editing/AvatarTarget.cpp similarity index 99% rename from src/modules/avatar_editing/AvatarTarget.cpp rename to src/modules/avatar/editing/AvatarTarget.cpp index 4cb68fca..924b75a9 100644 --- a/src/modules/avatar_editing/AvatarTarget.cpp +++ b/src/modules/avatar/editing/AvatarTarget.cpp @@ -1,4 +1,4 @@ -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include #include diff --git a/src/modules/avatar_editing/AvatarTarget.h b/src/modules/avatar/editing/AvatarTarget.h similarity index 100% rename from src/modules/avatar_editing/AvatarTarget.h rename to src/modules/avatar/editing/AvatarTarget.h diff --git a/src/modules/avatar_editor/AvatarDocumentEditor.cpp b/src/modules/avatar/editor/AvatarDocumentEditor.cpp similarity index 99% rename from src/modules/avatar_editor/AvatarDocumentEditor.cpp rename to src/modules/avatar/editor/AvatarDocumentEditor.cpp index 12117c1a..36cd46ed 100644 --- a/src/modules/avatar_editor/AvatarDocumentEditor.cpp +++ b/src/modules/avatar/editor/AvatarDocumentEditor.cpp @@ -1,4 +1,4 @@ -#include "avatar_editor/AvatarDocumentEditor.h" +#include "avatar/editor/AvatarDocumentEditor.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/avatar_editor/AvatarDocumentEditor.h b/src/modules/avatar/editor/AvatarDocumentEditor.h similarity index 99% rename from src/modules/avatar_editor/AvatarDocumentEditor.h rename to src/modules/avatar/editor/AvatarDocumentEditor.h index a6bae329..a57423c3 100644 --- a/src/modules/avatar_editor/AvatarDocumentEditor.h +++ b/src/modules/avatar/editor/AvatarDocumentEditor.h @@ -5,7 +5,7 @@ * @brief UI-neutral avatar editor: workspace, layer composite preview, undo. */ -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include "editor/EditorAuthority.h" #include "editor/EditorSelection.h" #include "editor/EditorTransactionService.h" diff --git a/src/modules/avatar_editor/AvatarDocumentEditorScriptBindings.cpp b/src/modules/avatar/editor/AvatarDocumentEditorScriptBindings.cpp similarity index 98% rename from src/modules/avatar_editor/AvatarDocumentEditorScriptBindings.cpp rename to src/modules/avatar/editor/AvatarDocumentEditorScriptBindings.cpp index 4922ae13..e985d341 100644 --- a/src/modules/avatar_editor/AvatarDocumentEditorScriptBindings.cpp +++ b/src/modules/avatar/editor/AvatarDocumentEditorScriptBindings.cpp @@ -1,7 +1,7 @@ -#include "avatar_editor/AvatarDocumentEditorScriptBindings.h" +#include "avatar/editor/AvatarDocumentEditorScriptBindings.h" -#include "avatar_editor/AvatarDocumentEditor.h" -#include "avatar_editor/AvatarEditorModule.h" +#include "avatar/editor/AvatarDocumentEditor.h" +#include "avatar/editor/AvatarEditorModule.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" diff --git a/src/modules/avatar_editor/AvatarDocumentEditorScriptBindings.h b/src/modules/avatar/editor/AvatarDocumentEditorScriptBindings.h similarity index 100% rename from src/modules/avatar_editor/AvatarDocumentEditorScriptBindings.h rename to src/modules/avatar/editor/AvatarDocumentEditorScriptBindings.h diff --git a/src/modules/avatar_editor/AvatarEditorModule.h b/src/modules/avatar/editor/AvatarEditorModule.h similarity index 100% rename from src/modules/avatar_editor/AvatarEditorModule.h rename to src/modules/avatar/editor/AvatarEditorModule.h diff --git a/src/modules/avatar_editor/EditorAvatarTarget.h b/src/modules/avatar/editor/EditorAvatarTarget.h similarity index 90% rename from src/modules/avatar_editor/EditorAvatarTarget.h rename to src/modules/avatar/editor/EditorAvatarTarget.h index 64476113..edd80da1 100644 --- a/src/modules/avatar_editor/EditorAvatarTarget.h +++ b/src/modules/avatar/editor/EditorAvatarTarget.h @@ -1,6 +1,6 @@ #pragma once -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/avatar_editor/avatar_editor.cpp b/src/modules/avatar/editor/avatar_editor.cpp similarity index 94% rename from src/modules/avatar_editor/avatar_editor.cpp rename to src/modules/avatar/editor/avatar_editor.cpp index edc73c17..153ac822 100644 --- a/src/modules/avatar_editor/avatar_editor.cpp +++ b/src/modules/avatar/editor/avatar_editor.cpp @@ -1,9 +1,9 @@ -#include "avatar_editor/AvatarEditorModule.h" -#include "avatar_editor/EditorAvatarTarget.h" +#include "avatar/editor/AvatarEditorModule.h" +#include "avatar/editor/EditorAvatarTarget.h" -#include "avatar_editing/AvatarEditingCommands.h" -#include "avatar_editing/AvatarTarget.h" -#include "avatar_editor/AvatarDocumentEditorScriptBindings.h" +#include "avatar/editing/AvatarEditingCommands.h" +#include "avatar/editing/AvatarTarget.h" +#include "avatar/editor/AvatarDocumentEditorScriptBindings.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" diff --git a/src/modules/building_editing/BuildingTarget.cpp b/src/modules/building/editing/BuildingTarget.cpp similarity index 99% rename from src/modules/building_editing/BuildingTarget.cpp rename to src/modules/building/editing/BuildingTarget.cpp index b8b0effd..299f1192 100644 --- a/src/modules/building_editing/BuildingTarget.cpp +++ b/src/modules/building/editing/BuildingTarget.cpp @@ -1,4 +1,4 @@ -#include "building_editing/BuildingTarget.h" +#include "building/editing/BuildingTarget.h" #include "building/BuildingDef.h" #include "building/PlacementSystem.h" diff --git a/src/modules/building_editing/BuildingTarget.h b/src/modules/building/editing/BuildingTarget.h similarity index 100% rename from src/modules/building_editing/BuildingTarget.h rename to src/modules/building/editing/BuildingTarget.h diff --git a/src/modules/building_editor/BuildingEdgeCurveTool.cpp b/src/modules/building/editor/BuildingEdgeCurveTool.cpp similarity index 99% rename from src/modules/building_editor/BuildingEdgeCurveTool.cpp rename to src/modules/building/editor/BuildingEdgeCurveTool.cpp index 506960bb..235db5e9 100644 --- a/src/modules/building_editor/BuildingEdgeCurveTool.cpp +++ b/src/modules/building/editor/BuildingEdgeCurveTool.cpp @@ -1,4 +1,4 @@ -#include "building_editor/EditorBuildingTarget.h" +#include "building/editor/EditorBuildingTarget.h" #include "editor/EditorSession.h" diff --git a/src/modules/building_editor/EditorBuildingTarget.h b/src/modules/building/editor/EditorBuildingTarget.h similarity index 99% rename from src/modules/building_editor/EditorBuildingTarget.h rename to src/modules/building/editor/EditorBuildingTarget.h index 0ba8b616..d5997213 100644 --- a/src/modules/building_editor/EditorBuildingTarget.h +++ b/src/modules/building/editor/EditorBuildingTarget.h @@ -1,5 +1,5 @@ #pragma once -#include "building_editing/BuildingTarget.h" +#include "building/editing/BuildingTarget.h" #include "editor/EditorPresentation.h" #include "editor/EditorTool.h" diff --git a/src/modules/building_editor/building_editor.cpp b/src/modules/building/editor/building_editor.cpp similarity index 69% rename from src/modules/building_editor/building_editor.cpp rename to src/modules/building/editor/building_editor.cpp index 712957df..5237ab96 100644 --- a/src/modules/building_editor/building_editor.cpp +++ b/src/modules/building/editor/building_editor.cpp @@ -1,4 +1,4 @@ -#include "building_editor/EditorBuildingTarget.h" +#include "building/editor/EditorBuildingTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/buildingfx/BuildingFx.cpp b/src/modules/building/fx/BuildingFx.cpp similarity index 99% rename from src/modules/buildingfx/BuildingFx.cpp rename to src/modules/building/fx/BuildingFx.cpp index f379fe67..202dbf5e 100644 --- a/src/modules/buildingfx/BuildingFx.cpp +++ b/src/modules/building/fx/BuildingFx.cpp @@ -1,4 +1,4 @@ -#include "buildingfx/BuildingFx.h" +#include "building/fx/BuildingFx.h" #include "building/BuildingDef.h" #include "building/Ghost.h" diff --git a/src/modules/buildingfx/BuildingFx.h b/src/modules/building/fx/BuildingFx.h similarity index 100% rename from src/modules/buildingfx/BuildingFx.h rename to src/modules/building/fx/BuildingFx.h diff --git a/src/modules/camera_editing/CameraRuntime.cpp b/src/modules/camera/editing/CameraRuntime.cpp similarity index 98% rename from src/modules/camera_editing/CameraRuntime.cpp rename to src/modules/camera/editing/CameraRuntime.cpp index 0b5d73eb..f7f20b68 100644 --- a/src/modules/camera_editing/CameraRuntime.cpp +++ b/src/modules/camera/editing/CameraRuntime.cpp @@ -1,4 +1,4 @@ -#include "camera_editing/CameraTarget.h" +#include "camera/editing/CameraTarget.h" #include "camera/CameraController.h" diff --git a/src/modules/camera_editing/CameraTarget.cpp b/src/modules/camera/editing/CameraTarget.cpp similarity index 99% rename from src/modules/camera_editing/CameraTarget.cpp rename to src/modules/camera/editing/CameraTarget.cpp index d6c8cd94..a128dbca 100644 --- a/src/modules/camera_editing/CameraTarget.cpp +++ b/src/modules/camera/editing/CameraTarget.cpp @@ -1,4 +1,4 @@ -#include "camera_editing/CameraTarget.h" +#include "camera/editing/CameraTarget.h" #include #include diff --git a/src/modules/camera_editing/CameraTarget.h b/src/modules/camera/editing/CameraTarget.h similarity index 100% rename from src/modules/camera_editing/CameraTarget.h rename to src/modules/camera/editing/CameraTarget.h diff --git a/src/modules/camera_editor/EditorCameraTarget.h b/src/modules/camera/editor/EditorCameraTarget.h similarity index 80% rename from src/modules/camera_editor/EditorCameraTarget.h rename to src/modules/camera/editor/EditorCameraTarget.h index 656032bb..918670da 100644 --- a/src/modules/camera_editor/EditorCameraTarget.h +++ b/src/modules/camera/editor/EditorCameraTarget.h @@ -1,7 +1,7 @@ #pragma once -#include "camera_editing/CameraTarget.h" -#include "domain_gizmo_editor/EditorGizmoPreview.h" +#include "camera/editing/CameraTarget.h" +#include "editor/gizmo/editor/EditorGizmoPreview.h" #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/camera_editor/camera_editor.cpp b/src/modules/camera/editor/camera_editor.cpp similarity index 70% rename from src/modules/camera_editor/camera_editor.cpp rename to src/modules/camera/editor/camera_editor.cpp index aa391775..58a2a235 100644 --- a/src/modules/camera_editor/camera_editor.cpp +++ b/src/modules/camera/editor/camera_editor.cpp @@ -1,4 +1,4 @@ -#include "camera_editor/EditorCameraTarget.h" +#include "camera/editor/EditorCameraTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/crowd_editing/CrowdDocument.cpp b/src/modules/crowd/editing/CrowdDocument.cpp similarity index 99% rename from src/modules/crowd_editing/CrowdDocument.cpp rename to src/modules/crowd/editing/CrowdDocument.cpp index 43376dcc..44702e53 100644 --- a/src/modules/crowd_editing/CrowdDocument.cpp +++ b/src/modules/crowd/editing/CrowdDocument.cpp @@ -1,4 +1,4 @@ -#include "crowd_editing/CrowdDocument.h" +#include "crowd/editing/CrowdDocument.h" #include #include diff --git a/src/modules/crowd_editing/CrowdDocument.h b/src/modules/crowd/editing/CrowdDocument.h similarity index 100% rename from src/modules/crowd_editing/CrowdDocument.h rename to src/modules/crowd/editing/CrowdDocument.h diff --git a/src/modules/crowd_editing/CrowdRuntime.cpp b/src/modules/crowd/editing/CrowdRuntime.cpp similarity index 98% rename from src/modules/crowd_editing/CrowdRuntime.cpp rename to src/modules/crowd/editing/CrowdRuntime.cpp index e368d884..290af9a0 100644 --- a/src/modules/crowd_editing/CrowdRuntime.cpp +++ b/src/modules/crowd/editing/CrowdRuntime.cpp @@ -1,4 +1,4 @@ -#include "crowd_editing/CrowdDocument.h" +#include "crowd/editing/CrowdDocument.h" #include "crowd/Crowd.h" diff --git a/src/modules/crowd_editor/EditorCrowdDocument.h b/src/modules/crowd/editor/EditorCrowdDocument.h similarity index 93% rename from src/modules/crowd_editor/EditorCrowdDocument.h rename to src/modules/crowd/editor/EditorCrowdDocument.h index b97bec34..a3e42b4f 100644 --- a/src/modules/crowd_editor/EditorCrowdDocument.h +++ b/src/modules/crowd/editor/EditorCrowdDocument.h @@ -1,5 +1,5 @@ #pragma once -#include "crowd_editing/CrowdDocument.h" +#include "crowd/editing/CrowdDocument.h" namespace eve::editor { using CrowdAgentRecord=eve::crowd_editing::CrowdAgentRecord; using CrowdZoneRecord=eve::crowd_editing::CrowdZoneRecord; diff --git a/src/modules/crowd_editor/crowd_editor.cpp b/src/modules/crowd/editor/crowd_editor.cpp similarity index 70% rename from src/modules/crowd_editor/crowd_editor.cpp rename to src/modules/crowd/editor/crowd_editor.cpp index 141aad09..6ebd60d9 100644 --- a/src/modules/crowd_editor/crowd_editor.cpp +++ b/src/modules/crowd/editor/crowd_editor.cpp @@ -1,4 +1,4 @@ -#include "crowd_editor/EditorCrowdDocument.h" +#include "crowd/editor/EditorCrowdDocument.h" namespace eve::editor { namespace { diff --git a/src/modules/decal_editing/DecalGizmo.cpp b/src/modules/decal/editing/DecalGizmo.cpp similarity index 97% rename from src/modules/decal_editing/DecalGizmo.cpp rename to src/modules/decal/editing/DecalGizmo.cpp index 33cf95c4..837419f0 100644 --- a/src/modules/decal_editing/DecalGizmo.cpp +++ b/src/modules/decal/editing/DecalGizmo.cpp @@ -1,4 +1,4 @@ -#include "decal_editing/DecalTarget.h" +#include "decal/editing/DecalTarget.h" #include diff --git a/src/modules/decal_editing/DecalRuntime.cpp b/src/modules/decal/editing/DecalRuntime.cpp similarity index 99% rename from src/modules/decal_editing/DecalRuntime.cpp rename to src/modules/decal/editing/DecalRuntime.cpp index 842e3d97..9ba1eb34 100644 --- a/src/modules/decal_editing/DecalRuntime.cpp +++ b/src/modules/decal/editing/DecalRuntime.cpp @@ -1,4 +1,4 @@ -#include "decal_editing/DecalTarget.h" +#include "decal/editing/DecalTarget.h" #include "decal/DecalManager.h" diff --git a/src/modules/decal_editing/DecalTarget.cpp b/src/modules/decal/editing/DecalTarget.cpp similarity index 99% rename from src/modules/decal_editing/DecalTarget.cpp rename to src/modules/decal/editing/DecalTarget.cpp index d09451f9..b33070bb 100644 --- a/src/modules/decal_editing/DecalTarget.cpp +++ b/src/modules/decal/editing/DecalTarget.cpp @@ -1,4 +1,4 @@ -#include "decal_editing/DecalTarget.h" +#include "decal/editing/DecalTarget.h" #include #include diff --git a/src/modules/decal_editing/DecalTarget.h b/src/modules/decal/editing/DecalTarget.h similarity index 100% rename from src/modules/decal_editing/DecalTarget.h rename to src/modules/decal/editing/DecalTarget.h diff --git a/src/modules/decal_editor/EditorDecalTarget.h b/src/modules/decal/editor/EditorDecalTarget.h similarity index 93% rename from src/modules/decal_editor/EditorDecalTarget.h rename to src/modules/decal/editor/EditorDecalTarget.h index 24c94846..9667bd5a 100644 --- a/src/modules/decal_editor/EditorDecalTarget.h +++ b/src/modules/decal/editor/EditorDecalTarget.h @@ -1,7 +1,7 @@ #pragma once #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "decal_editing/DecalTarget.h" +#include "decal/editing/DecalTarget.h" namespace eve::editor { using DecalDocumentTarget=decal_editing::DecalDocumentTarget; using IDecalRuntimeAssetResolver=decal_editing::IDecalRuntimeAssetResolver; diff --git a/src/modules/decal_editor/decal_editor.cpp b/src/modules/decal/editor/decal_editor.cpp similarity index 71% rename from src/modules/decal_editor/decal_editor.cpp rename to src/modules/decal/editor/decal_editor.cpp index ed4d0c19..d643d1ac 100644 --- a/src/modules/decal_editor/decal_editor.cpp +++ b/src/modules/decal/editor/decal_editor.cpp @@ -1,4 +1,4 @@ -#include "decal_editor/EditorDecalTarget.h" +#include "decal/editor/EditorDecalTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/definitions_editing/DefinitionForm.h b/src/modules/definitions/editing/DefinitionForm.h similarity index 97% rename from src/modules/definitions_editing/DefinitionForm.h rename to src/modules/definitions/editing/DefinitionForm.h index 918032dd..5d46db8b 100644 --- a/src/modules/definitions_editing/DefinitionForm.h +++ b/src/modules/definitions/editing/DefinitionForm.h @@ -1,6 +1,6 @@ #pragma once -#include "definitions_editing/DefinitionTarget.h" +#include "definitions/editing/DefinitionTarget.h" #include "editing/EditingProperty.h" namespace eve::schema { diff --git a/src/modules/definitions_editing/DefinitionFormRuntime.cpp b/src/modules/definitions/editing/DefinitionFormRuntime.cpp similarity index 99% rename from src/modules/definitions_editing/DefinitionFormRuntime.cpp rename to src/modules/definitions/editing/DefinitionFormRuntime.cpp index 0a16eb6a..8d0f7dd2 100644 --- a/src/modules/definitions_editing/DefinitionFormRuntime.cpp +++ b/src/modules/definitions/editing/DefinitionFormRuntime.cpp @@ -1,4 +1,4 @@ -#include "definitions_editing/DefinitionForm.h" +#include "definitions/editing/DefinitionForm.h" #include "editing/EditingValueJson.h" #include "schema/SchemaTypes.h" diff --git a/src/modules/definitions_editing/DefinitionRuntime.cpp b/src/modules/definitions/editing/DefinitionRuntime.cpp similarity index 96% rename from src/modules/definitions_editing/DefinitionRuntime.cpp rename to src/modules/definitions/editing/DefinitionRuntime.cpp index 28d642f6..d4c271f0 100644 --- a/src/modules/definitions_editing/DefinitionRuntime.cpp +++ b/src/modules/definitions/editing/DefinitionRuntime.cpp @@ -1,4 +1,4 @@ -#include "definitions_editing/DefinitionTarget.h" +#include "definitions/editing/DefinitionTarget.h" #include "definitions/Definitions.h" diff --git a/src/modules/definitions_editing/DefinitionTarget.cpp b/src/modules/definitions/editing/DefinitionTarget.cpp similarity index 99% rename from src/modules/definitions_editing/DefinitionTarget.cpp rename to src/modules/definitions/editing/DefinitionTarget.cpp index 9f700ae1..968246e6 100644 --- a/src/modules/definitions_editing/DefinitionTarget.cpp +++ b/src/modules/definitions/editing/DefinitionTarget.cpp @@ -1,4 +1,4 @@ -#include "definitions_editing/DefinitionTarget.h" +#include "definitions/editing/DefinitionTarget.h" #include "editing/EditingValueJson.h" #include diff --git a/src/modules/definitions_editing/DefinitionTarget.h b/src/modules/definitions/editing/DefinitionTarget.h similarity index 100% rename from src/modules/definitions_editing/DefinitionTarget.h rename to src/modules/definitions/editing/DefinitionTarget.h diff --git a/src/modules/definitions_editor/EditorDefinitionForm.h b/src/modules/definitions/editor/EditorDefinitionForm.h similarity index 76% rename from src/modules/definitions_editor/EditorDefinitionForm.h rename to src/modules/definitions/editor/EditorDefinitionForm.h index bbd10d92..005d975d 100644 --- a/src/modules/definitions_editor/EditorDefinitionForm.h +++ b/src/modules/definitions/editor/EditorDefinitionForm.h @@ -1,6 +1,6 @@ #pragma once -#include "definitions_editing/DefinitionForm.h" +#include "definitions/editing/DefinitionForm.h" namespace eve::editor { using DefinitionSchemaFormTarget = eve::definitions_editing::DefinitionSchemaFormTarget; diff --git a/src/modules/definitions_editor/EditorDefinitionTarget.h b/src/modules/definitions/editor/EditorDefinitionTarget.h similarity index 86% rename from src/modules/definitions_editor/EditorDefinitionTarget.h rename to src/modules/definitions/editor/EditorDefinitionTarget.h index a3909067..78bc8289 100644 --- a/src/modules/definitions_editor/EditorDefinitionTarget.h +++ b/src/modules/definitions/editor/EditorDefinitionTarget.h @@ -1,6 +1,6 @@ #pragma once -#include "definitions_editing/DefinitionTarget.h" +#include "definitions/editing/DefinitionTarget.h" namespace eve::editor { using DefinitionReferenceField = eve::definitions_editing::DefinitionReferenceField; diff --git a/src/modules/definitions_editor/definitions_editor.cpp b/src/modules/definitions/editor/definitions_editor.cpp similarity index 67% rename from src/modules/definitions_editor/definitions_editor.cpp rename to src/modules/definitions/editor/definitions_editor.cpp index 8c9ed3a6..42dac8b2 100644 --- a/src/modules/definitions_editor/definitions_editor.cpp +++ b/src/modules/definitions/editor/definitions_editor.cpp @@ -1,4 +1,4 @@ -#include "definitions_editor/EditorDefinitionTarget.h" +#include "definitions/editor/EditorDefinitionTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/dialogue_editing/DialogueEditingTypes.h b/src/modules/dialogue/editing/DialogueEditingTypes.h similarity index 100% rename from src/modules/dialogue_editing/DialogueEditingTypes.h rename to src/modules/dialogue/editing/DialogueEditingTypes.h diff --git a/src/modules/dialogue_editing/DialogueGraph.cpp b/src/modules/dialogue/editing/DialogueGraph.cpp similarity index 99% rename from src/modules/dialogue_editing/DialogueGraph.cpp rename to src/modules/dialogue/editing/DialogueGraph.cpp index c1eed3e0..558f39a6 100644 --- a/src/modules/dialogue_editing/DialogueGraph.cpp +++ b/src/modules/dialogue/editing/DialogueGraph.cpp @@ -1,4 +1,4 @@ -#include "dialogue_editing/DialogueGraph.h" +#include "dialogue/editing/DialogueGraph.h" #include #include diff --git a/src/modules/dialogue_editing/DialogueGraph.h b/src/modules/dialogue/editing/DialogueGraph.h similarity index 97% rename from src/modules/dialogue_editing/DialogueGraph.h rename to src/modules/dialogue/editing/DialogueGraph.h index 71b9eef8..c79c8783 100644 --- a/src/modules/dialogue_editing/DialogueGraph.h +++ b/src/modules/dialogue/editing/DialogueGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "dialogue_editing/DialogueEditingTypes.h" +#include "dialogue/editing/DialogueEditingTypes.h" #include #include diff --git a/src/modules/dialogue_editing/DialogueGraphRuntime.cpp b/src/modules/dialogue/editing/DialogueGraphRuntime.cpp similarity index 99% rename from src/modules/dialogue_editing/DialogueGraphRuntime.cpp rename to src/modules/dialogue/editing/DialogueGraphRuntime.cpp index 298b350e..55296e95 100644 --- a/src/modules/dialogue_editing/DialogueGraphRuntime.cpp +++ b/src/modules/dialogue/editing/DialogueGraphRuntime.cpp @@ -1,4 +1,4 @@ -#include "dialogue_editing/DialogueGraph.h" +#include "dialogue/editing/DialogueGraph.h" #include "dialogue/ConversationAuthoring.h" diff --git a/src/modules/dialogue_editor/EditorDialogueGraph.h b/src/modules/dialogue/editor/EditorDialogueGraph.h similarity index 87% rename from src/modules/dialogue_editor/EditorDialogueGraph.h rename to src/modules/dialogue/editor/EditorDialogueGraph.h index 56b5d050..a0ae9baf 100644 --- a/src/modules/dialogue_editor/EditorDialogueGraph.h +++ b/src/modules/dialogue/editor/EditorDialogueGraph.h @@ -1,5 +1,5 @@ #pragma once -#include "dialogue_editing/DialogueGraph.h" +#include "dialogue/editing/DialogueGraph.h" namespace eve::editor { using DialogueGraphCompileResult = dialogue_editing::DialogueGraphCompileResult; using DialogueGraphDomain = dialogue_editing::DialogueGraphDomain; diff --git a/src/modules/dialogue_editor/EditorDialoguePreview.cpp b/src/modules/dialogue/editor/EditorDialoguePreview.cpp similarity index 98% rename from src/modules/dialogue_editor/EditorDialoguePreview.cpp rename to src/modules/dialogue/editor/EditorDialoguePreview.cpp index 01f3334e..315b05d4 100644 --- a/src/modules/dialogue_editor/EditorDialoguePreview.cpp +++ b/src/modules/dialogue/editor/EditorDialoguePreview.cpp @@ -1,4 +1,4 @@ -#include "dialogue_editor/EditorDialoguePreview.h" +#include "dialogue/editor/EditorDialoguePreview.h" #include #include diff --git a/src/modules/dialogue_editor/EditorDialoguePreview.h b/src/modules/dialogue/editor/EditorDialoguePreview.h similarity index 97% rename from src/modules/dialogue_editor/EditorDialoguePreview.h rename to src/modules/dialogue/editor/EditorDialoguePreview.h index 7f9da2d3..26cef4cd 100644 --- a/src/modules/dialogue_editor/EditorDialoguePreview.h +++ b/src/modules/dialogue/editor/EditorDialoguePreview.h @@ -1,6 +1,6 @@ #pragma once -#include "audio_editor/EditorAudioWaveform.h" +#include "audio/editor/EditorAudioWaveform.h" #include #include diff --git a/src/modules/domain_gizmo_editing/DomainGizmoPreview.cpp b/src/modules/editor/gizmo/editing/DomainGizmoPreview.cpp similarity index 98% rename from src/modules/domain_gizmo_editing/DomainGizmoPreview.cpp rename to src/modules/editor/gizmo/editing/DomainGizmoPreview.cpp index f3b863d8..14cb3367 100644 --- a/src/modules/domain_gizmo_editing/DomainGizmoPreview.cpp +++ b/src/modules/editor/gizmo/editing/DomainGizmoPreview.cpp @@ -1,8 +1,8 @@ -#include "domain_gizmo_editing/DomainGizmoPreview.h" +#include "editor/gizmo/editing/DomainGizmoPreview.h" -#include "audio_editing/AudioTarget.h" -#include "lighting_editing/LightingTarget.h" -#include "physics_editing/PhysicsTarget.h" +#include "audio/editing/AudioTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" +#include "physics/editing/PhysicsTarget.h" #include #include diff --git a/src/modules/domain_gizmo_editing/DomainGizmoPreview.h b/src/modules/editor/gizmo/editing/DomainGizmoPreview.h similarity index 92% rename from src/modules/domain_gizmo_editing/DomainGizmoPreview.h rename to src/modules/editor/gizmo/editing/DomainGizmoPreview.h index e05a1ec1..890c7708 100644 --- a/src/modules/domain_gizmo_editing/DomainGizmoPreview.h +++ b/src/modules/editor/gizmo/editing/DomainGizmoPreview.h @@ -1,11 +1,11 @@ #pragma once #include "editing/EditingGizmo.h" -#include "audio_editing/AudioTarget.h" -#include "lighting_editing/LightingTarget.h" +#include "audio/editing/AudioTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include "editing/EditingProtocol.h" -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include #include diff --git a/src/modules/domain_gizmo_editor/EditorGizmoPreview.h b/src/modules/editor/gizmo/editor/EditorGizmoPreview.h similarity index 81% rename from src/modules/domain_gizmo_editor/EditorGizmoPreview.h rename to src/modules/editor/gizmo/editor/EditorGizmoPreview.h index 2f7b0e58..9213f342 100644 --- a/src/modules/domain_gizmo_editor/EditorGizmoPreview.h +++ b/src/modules/editor/gizmo/editor/EditorGizmoPreview.h @@ -1,5 +1,5 @@ #pragma once -#include "domain_gizmo_editing/DomainGizmoPreview.h" +#include "editor/gizmo/editing/DomainGizmoPreview.h" namespace eve::editor { using EditorGizmoPrimitive=editing::GizmoPrimitive; using EditorGizmoSnapshot=editing::GizmoSnapshot; diff --git a/src/modules/domain_gizmo_editor/domain_gizmo_editor.cpp b/src/modules/editor/gizmo/editor/domain_gizmo_editor.cpp similarity index 69% rename from src/modules/domain_gizmo_editor/domain_gizmo_editor.cpp rename to src/modules/editor/gizmo/editor/domain_gizmo_editor.cpp index e24d5be8..15ccb456 100644 --- a/src/modules/domain_gizmo_editor/domain_gizmo_editor.cpp +++ b/src/modules/editor/gizmo/editor/domain_gizmo_editor.cpp @@ -1,4 +1,4 @@ -#include "domain_gizmo_editor/EditorGizmoPreview.h" +#include "editor/gizmo/editor/EditorGizmoPreview.h" namespace eve::editor { namespace { diff --git a/src/modules/input_editing/InputMapTarget.cpp b/src/modules/editor/input/editing/InputMapTarget.cpp similarity index 99% rename from src/modules/input_editing/InputMapTarget.cpp rename to src/modules/editor/input/editing/InputMapTarget.cpp index 92d55002..645a9dd6 100644 --- a/src/modules/input_editing/InputMapTarget.cpp +++ b/src/modules/editor/input/editing/InputMapTarget.cpp @@ -1,4 +1,4 @@ -#include "input_editing/InputMapTarget.h" +#include "editor/input/editing/InputMapTarget.h" #include #include #include diff --git a/src/modules/input_editing/InputMapTarget.h b/src/modules/editor/input/editing/InputMapTarget.h similarity index 100% rename from src/modules/input_editing/InputMapTarget.h rename to src/modules/editor/input/editing/InputMapTarget.h diff --git a/src/modules/input_editor/EditorInputMapTarget.h b/src/modules/editor/input/editor/EditorInputMapTarget.h similarity index 88% rename from src/modules/input_editor/EditorInputMapTarget.h rename to src/modules/editor/input/editor/EditorInputMapTarget.h index 0e735529..5c3e1b21 100644 --- a/src/modules/input_editor/EditorInputMapTarget.h +++ b/src/modules/editor/input/editor/EditorInputMapTarget.h @@ -1,7 +1,7 @@ #pragma once // Compatibility facade. Canonical implementation is owned by input_editing. -#include "input_editing/InputMapTarget.h" +#include "editor/input/editing/InputMapTarget.h" namespace eve::editor { using input_editing::InputActionValue; diff --git a/src/modules/input_editor/input_editor.cpp b/src/modules/editor/input/editor/input_editor.cpp similarity index 67% rename from src/modules/input_editor/input_editor.cpp rename to src/modules/editor/input/editor/input_editor.cpp index fe3c1050..a4635ac2 100644 --- a/src/modules/input_editor/input_editor.cpp +++ b/src/modules/editor/input/editor/input_editor.cpp @@ -1,4 +1,4 @@ -#include "input_editor/EditorInputMapTarget.h" +#include "editor/input/editor/EditorInputMapTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/queue_editing/QueueInspector.cpp b/src/modules/editor/queue/editing/QueueInspector.cpp similarity index 98% rename from src/modules/queue_editing/QueueInspector.cpp rename to src/modules/editor/queue/editing/QueueInspector.cpp index 0841bd85..c5bdceb0 100644 --- a/src/modules/queue_editing/QueueInspector.cpp +++ b/src/modules/editor/queue/editing/QueueInspector.cpp @@ -1,4 +1,4 @@ -#include "queue_editing/QueueInspector.h" +#include "editor/queue/editing/QueueInspector.h" #include "orders/CommandQueue.h" #include "production/Production.h" diff --git a/src/modules/queue_editing/QueueInspector.h b/src/modules/editor/queue/editing/QueueInspector.h similarity index 100% rename from src/modules/queue_editing/QueueInspector.h rename to src/modules/editor/queue/editing/QueueInspector.h diff --git a/src/modules/queue_editor/EditorQueueInspector.h b/src/modules/editor/queue/editor/EditorQueueInspector.h similarity index 86% rename from src/modules/queue_editor/EditorQueueInspector.h rename to src/modules/editor/queue/editor/EditorQueueInspector.h index 20626f8a..8529842f 100644 --- a/src/modules/queue_editor/EditorQueueInspector.h +++ b/src/modules/editor/queue/editor/EditorQueueInspector.h @@ -1,5 +1,5 @@ #pragma once -#include "queue_editing/QueueInspector.h" +#include "editor/queue/editing/QueueInspector.h" namespace eve::editor { using QueueItemSnapshot=eve::queue_editing::QueueItemSnapshot; using QueueEventSnapshot=eve::queue_editing::QueueEventSnapshot; diff --git a/src/modules/queue_editor/queue_editor.cpp b/src/modules/editor/queue/editor/queue_editor.cpp similarity index 67% rename from src/modules/queue_editor/queue_editor.cpp rename to src/modules/editor/queue/editor/queue_editor.cpp index 420ac33b..73532f33 100644 --- a/src/modules/queue_editor/queue_editor.cpp +++ b/src/modules/editor/queue/editor/queue_editor.cpp @@ -1,4 +1,4 @@ -#include "queue_editor/EditorQueueInspector.h" +#include "editor/queue/editor/EditorQueueInspector.h" namespace eve::editor { namespace { diff --git a/src/modules/fluids_editing/FluidRuntime.cpp b/src/modules/fluids/editing/FluidRuntime.cpp similarity index 98% rename from src/modules/fluids_editing/FluidRuntime.cpp rename to src/modules/fluids/editing/FluidRuntime.cpp index db57aeec..5eb60e4f 100644 --- a/src/modules/fluids_editing/FluidRuntime.cpp +++ b/src/modules/fluids/editing/FluidRuntime.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/FluidTarget.h" +#include "fluids/editing/FluidTarget.h" #include "fluids/FluidSimulation.h" diff --git a/src/modules/fluids_editing/FluidTarget.cpp b/src/modules/fluids/editing/FluidTarget.cpp similarity index 99% rename from src/modules/fluids_editing/FluidTarget.cpp rename to src/modules/fluids/editing/FluidTarget.cpp index 096956f4..40dadd4e 100644 --- a/src/modules/fluids_editing/FluidTarget.cpp +++ b/src/modules/fluids/editing/FluidTarget.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/FluidTarget.h" +#include "fluids/editing/FluidTarget.h" #include #include diff --git a/src/modules/fluids_editing/FluidTarget.h b/src/modules/fluids/editing/FluidTarget.h similarity index 100% rename from src/modules/fluids_editing/FluidTarget.h rename to src/modules/fluids/editing/FluidTarget.h diff --git a/src/modules/fluids_editing/SurfaceFluidRuntime.cpp b/src/modules/fluids/editing/SurfaceFluidRuntime.cpp similarity index 98% rename from src/modules/fluids_editing/SurfaceFluidRuntime.cpp rename to src/modules/fluids/editing/SurfaceFluidRuntime.cpp index 284e4aef..6ba4a40f 100644 --- a/src/modules/fluids_editing/SurfaceFluidRuntime.cpp +++ b/src/modules/fluids/editing/SurfaceFluidRuntime.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/SurfaceFluidTarget.h" +#include "fluids/editing/SurfaceFluidTarget.h" #include "fluids/SurfaceDropletSimulation.h" #include "fluids/SurfaceFluidRenderData.h" diff --git a/src/modules/fluids_editing/SurfaceFluidTarget.cpp b/src/modules/fluids/editing/SurfaceFluidTarget.cpp similarity index 99% rename from src/modules/fluids_editing/SurfaceFluidTarget.cpp rename to src/modules/fluids/editing/SurfaceFluidTarget.cpp index 0714c066..fc9616a2 100644 --- a/src/modules/fluids_editing/SurfaceFluidTarget.cpp +++ b/src/modules/fluids/editing/SurfaceFluidTarget.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/SurfaceFluidTarget.h" +#include "fluids/editing/SurfaceFluidTarget.h" #include #include diff --git a/src/modules/fluids_editing/SurfaceFluidTarget.h b/src/modules/fluids/editing/SurfaceFluidTarget.h similarity index 100% rename from src/modules/fluids_editing/SurfaceFluidTarget.h rename to src/modules/fluids/editing/SurfaceFluidTarget.h diff --git a/src/modules/fluids_editor/EditorFluidTarget.h b/src/modules/fluids/editor/EditorFluidTarget.h similarity index 89% rename from src/modules/fluids_editor/EditorFluidTarget.h rename to src/modules/fluids/editor/EditorFluidTarget.h index 0c3bf4f9..7f1e4858 100644 --- a/src/modules/fluids_editor/EditorFluidTarget.h +++ b/src/modules/fluids/editor/EditorFluidTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "fluids_editing/FluidTarget.h" +#include "fluids/editing/FluidTarget.h" namespace eve::editor { using fluids_editing::FluidSimulationPreview; diff --git a/src/modules/fluids_editor/EditorSurfaceFluidOffscreen.cpp b/src/modules/fluids/editor/EditorSurfaceFluidOffscreen.cpp similarity index 95% rename from src/modules/fluids_editor/EditorSurfaceFluidOffscreen.cpp rename to src/modules/fluids/editor/EditorSurfaceFluidOffscreen.cpp index 0b4ac1c4..25279088 100644 --- a/src/modules/fluids_editor/EditorSurfaceFluidOffscreen.cpp +++ b/src/modules/fluids/editor/EditorSurfaceFluidOffscreen.cpp @@ -1,4 +1,4 @@ -#include "fluids_editor/EditorSurfaceFluidPreview.h" +#include "fluids/editor/EditorSurfaceFluidPreview.h" namespace eve::editor { diff --git a/src/modules/fluids_editor/EditorSurfaceFluidPreview.cpp b/src/modules/fluids/editor/EditorSurfaceFluidPreview.cpp similarity index 99% rename from src/modules/fluids_editor/EditorSurfaceFluidPreview.cpp rename to src/modules/fluids/editor/EditorSurfaceFluidPreview.cpp index 7435b306..8fb8e99b 100644 --- a/src/modules/fluids_editor/EditorSurfaceFluidPreview.cpp +++ b/src/modules/fluids/editor/EditorSurfaceFluidPreview.cpp @@ -1,4 +1,4 @@ -#include "fluids_editor/EditorSurfaceFluidPreview.h" +#include "fluids/editor/EditorSurfaceFluidPreview.h" #include "fluids/FluidSurfaceBinding.h" #include "fluids/SurfaceDropletSimulation.h" diff --git a/src/modules/fluids_editor/EditorSurfaceFluidPreview.h b/src/modules/fluids/editor/EditorSurfaceFluidPreview.h similarity index 97% rename from src/modules/fluids_editor/EditorSurfaceFluidPreview.h rename to src/modules/fluids/editor/EditorSurfaceFluidPreview.h index 5c336076..99e1b680 100644 --- a/src/modules/fluids_editor/EditorSurfaceFluidPreview.h +++ b/src/modules/fluids/editor/EditorSurfaceFluidPreview.h @@ -1,7 +1,7 @@ #pragma once -#include "fluids_editor/EditorSurfaceFluidTarget.h" -#include "graphics_editor/EditorOffscreenPreview.h" +#include "fluids/editor/EditorSurfaceFluidTarget.h" +#include "graphics/editor/EditorOffscreenPreview.h" #include #include diff --git a/src/modules/fluids_editor/EditorSurfaceFluidTarget.h b/src/modules/fluids/editor/EditorSurfaceFluidTarget.h similarity index 85% rename from src/modules/fluids_editor/EditorSurfaceFluidTarget.h rename to src/modules/fluids/editor/EditorSurfaceFluidTarget.h index 96f922df..76bfc50b 100644 --- a/src/modules/fluids_editor/EditorSurfaceFluidTarget.h +++ b/src/modules/fluids/editor/EditorSurfaceFluidTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "fluids_editing/SurfaceFluidTarget.h" +#include "fluids/editing/SurfaceFluidTarget.h" namespace eve::editor { using fluids_editing::SurfaceFluidRuntimeApplier; diff --git a/src/modules/graphics_editing/OffscreenPreview.cpp b/src/modules/graphics/editing/OffscreenPreview.cpp similarity index 99% rename from src/modules/graphics_editing/OffscreenPreview.cpp rename to src/modules/graphics/editing/OffscreenPreview.cpp index f14420bb..e3276579 100644 --- a/src/modules/graphics_editing/OffscreenPreview.cpp +++ b/src/modules/graphics/editing/OffscreenPreview.cpp @@ -1,4 +1,4 @@ -#include "graphics_editing/OffscreenPreview.h" +#include "graphics/editing/OffscreenPreview.h" #include "graphics/Canvas.h" #include "graphics/ICanvasFactory.h" diff --git a/src/modules/graphics_editing/OffscreenPreview.h b/src/modules/graphics/editing/OffscreenPreview.h similarity index 100% rename from src/modules/graphics_editing/OffscreenPreview.h rename to src/modules/graphics/editing/OffscreenPreview.h diff --git a/src/modules/graphics_editing/PrimitiveGizmoRenderer.cpp b/src/modules/graphics/editing/PrimitiveGizmoRenderer.cpp similarity index 99% rename from src/modules/graphics_editing/PrimitiveGizmoRenderer.cpp rename to src/modules/graphics/editing/PrimitiveGizmoRenderer.cpp index e9bff7c5..144e972e 100644 --- a/src/modules/graphics_editing/PrimitiveGizmoRenderer.cpp +++ b/src/modules/graphics/editing/PrimitiveGizmoRenderer.cpp @@ -1,4 +1,4 @@ -#include "graphics_editing/PrimitiveGizmoRenderer.h" +#include "graphics/editing/PrimitiveGizmoRenderer.h" #include "graphics/IGraphics3D.h" #include "graphics/PrimitiveDrawList.h" diff --git a/src/modules/graphics_editing/PrimitiveGizmoRenderer.h b/src/modules/graphics/editing/PrimitiveGizmoRenderer.h similarity index 100% rename from src/modules/graphics_editing/PrimitiveGizmoRenderer.h rename to src/modules/graphics/editing/PrimitiveGizmoRenderer.h diff --git a/src/modules/graphics_editor/EditorOffscreenPreview.h b/src/modules/graphics/editor/EditorOffscreenPreview.h similarity index 86% rename from src/modules/graphics_editor/EditorOffscreenPreview.h rename to src/modules/graphics/editor/EditorOffscreenPreview.h index 6bc9dda5..a1f32c39 100644 --- a/src/modules/graphics_editor/EditorOffscreenPreview.h +++ b/src/modules/graphics/editor/EditorOffscreenPreview.h @@ -1,5 +1,5 @@ #pragma once -#include "graphics_editing/OffscreenPreview.h" +#include "graphics/editing/OffscreenPreview.h" namespace eve::editor { using OffscreenPreviewRequest=eve::graphics_editing::OffscreenPreviewRequest; using OffscreenPreviewArtifact=eve::graphics_editing::OffscreenPreviewArtifact; diff --git a/src/modules/graphics_editor/GraphicsEditorModule.cpp b/src/modules/graphics/editor/GraphicsEditorModule.cpp similarity index 95% rename from src/modules/graphics_editor/GraphicsEditorModule.cpp rename to src/modules/graphics/editor/GraphicsEditorModule.cpp index f9680e9b..b98ef79a 100644 --- a/src/modules/graphics_editor/GraphicsEditorModule.cpp +++ b/src/modules/graphics/editor/GraphicsEditorModule.cpp @@ -1,6 +1,6 @@ -#include "graphics_editor/GraphicsEditorModule.h" +#include "graphics/editor/GraphicsEditorModule.h" -#include "graphics_editor/ReflectionProbeVisualizer.h" +#include "graphics/editor/ReflectionProbeVisualizer.h" #include diff --git a/src/modules/graphics_editor/GraphicsEditorModule.h b/src/modules/graphics/editor/GraphicsEditorModule.h similarity index 100% rename from src/modules/graphics_editor/GraphicsEditorModule.h rename to src/modules/graphics/editor/GraphicsEditorModule.h diff --git a/src/modules/graphics_editor/ReflectionProbeVisualizer.cpp b/src/modules/graphics/editor/ReflectionProbeVisualizer.cpp similarity index 98% rename from src/modules/graphics_editor/ReflectionProbeVisualizer.cpp rename to src/modules/graphics/editor/ReflectionProbeVisualizer.cpp index 7c49663c..592b6e24 100644 --- a/src/modules/graphics_editor/ReflectionProbeVisualizer.cpp +++ b/src/modules/graphics/editor/ReflectionProbeVisualizer.cpp @@ -1,4 +1,4 @@ -#include "graphics_editor/ReflectionProbeVisualizer.h" +#include "graphics/editor/ReflectionProbeVisualizer.h" #include "graphics/ReflectionProbeCapture.h" diff --git a/src/modules/graphics_editor/ReflectionProbeVisualizer.h b/src/modules/graphics/editor/ReflectionProbeVisualizer.h similarity index 100% rename from src/modules/graphics_editor/ReflectionProbeVisualizer.h rename to src/modules/graphics/editor/ReflectionProbeVisualizer.h diff --git a/src/modules/lighting_editing/EnvironmentDayNightRuntime.cpp b/src/modules/graphics/lighting/editing/EnvironmentDayNightRuntime.cpp similarity index 97% rename from src/modules/lighting_editing/EnvironmentDayNightRuntime.cpp rename to src/modules/graphics/lighting/editing/EnvironmentDayNightRuntime.cpp index b099c01f..0b59e0c0 100644 --- a/src/modules/lighting_editing/EnvironmentDayNightRuntime.cpp +++ b/src/modules/graphics/lighting/editing/EnvironmentDayNightRuntime.cpp @@ -1,4 +1,4 @@ -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include "daynight/DayNight.h" diff --git a/src/modules/lighting_editing/EnvironmentWeatherRuntime.cpp b/src/modules/graphics/lighting/editing/EnvironmentWeatherRuntime.cpp similarity index 97% rename from src/modules/lighting_editing/EnvironmentWeatherRuntime.cpp rename to src/modules/graphics/lighting/editing/EnvironmentWeatherRuntime.cpp index 87a93381..382a41cd 100644 --- a/src/modules/lighting_editing/EnvironmentWeatherRuntime.cpp +++ b/src/modules/graphics/lighting/editing/EnvironmentWeatherRuntime.cpp @@ -1,4 +1,4 @@ -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include "weather/Weather.h" diff --git a/src/modules/lighting_editing/LightingRuntime.cpp b/src/modules/graphics/lighting/editing/LightingRuntime.cpp similarity index 98% rename from src/modules/lighting_editing/LightingRuntime.cpp rename to src/modules/graphics/lighting/editing/LightingRuntime.cpp index 7cebdc94..8bfcbdb1 100644 --- a/src/modules/lighting_editing/LightingRuntime.cpp +++ b/src/modules/graphics/lighting/editing/LightingRuntime.cpp @@ -1,4 +1,4 @@ -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include "graphics/Light.h" diff --git a/src/modules/lighting_editing/LightingTarget.cpp b/src/modules/graphics/lighting/editing/LightingTarget.cpp similarity index 99% rename from src/modules/lighting_editing/LightingTarget.cpp rename to src/modules/graphics/lighting/editing/LightingTarget.cpp index 79105506..80f050da 100644 --- a/src/modules/lighting_editing/LightingTarget.cpp +++ b/src/modules/graphics/lighting/editing/LightingTarget.cpp @@ -1,4 +1,4 @@ -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include #include diff --git a/src/modules/lighting_editing/LightingTarget.h b/src/modules/graphics/lighting/editing/LightingTarget.h similarity index 100% rename from src/modules/lighting_editing/LightingTarget.h rename to src/modules/graphics/lighting/editing/LightingTarget.h diff --git a/src/modules/lighting_editor/EditorLightingTarget.h b/src/modules/graphics/lighting/editor/EditorLightingTarget.h similarity index 87% rename from src/modules/lighting_editor/EditorLightingTarget.h rename to src/modules/graphics/lighting/editor/EditorLightingTarget.h index 517f68d9..d6c40275 100644 --- a/src/modules/lighting_editor/EditorLightingTarget.h +++ b/src/modules/graphics/lighting/editor/EditorLightingTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" namespace eve::editor { using lighting_editing::EnvironmentDocumentTarget; diff --git a/src/modules/lighting_editor/lighting_editor.cpp b/src/modules/graphics/lighting/editor/lighting_editor.cpp similarity index 65% rename from src/modules/lighting_editor/lighting_editor.cpp rename to src/modules/graphics/lighting/editor/lighting_editor.cpp index d6fa9077..4ba5b97f 100644 --- a/src/modules/lighting_editor/lighting_editor.cpp +++ b/src/modules/graphics/lighting/editor/lighting_editor.cpp @@ -1,4 +1,4 @@ -#include "lighting_editor/EditorLightingTarget.h" +#include "graphics/lighting/editor/EditorLightingTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/material_editing/MaterialEditingCommands.cpp b/src/modules/graphics/material/editing/MaterialEditingCommands.cpp similarity index 97% rename from src/modules/material_editing/MaterialEditingCommands.cpp rename to src/modules/graphics/material/editing/MaterialEditingCommands.cpp index 22560ec1..0deb5b9a 100644 --- a/src/modules/material_editing/MaterialEditingCommands.cpp +++ b/src/modules/graphics/material/editing/MaterialEditingCommands.cpp @@ -1,4 +1,4 @@ -#include "material_editing/MaterialEditingCommands.h" +#include "graphics/material/editing/MaterialEditingCommands.h" #include "editing/EditingProperty.h" diff --git a/src/modules/material_editing/MaterialEditingCommands.h b/src/modules/graphics/material/editing/MaterialEditingCommands.h similarity index 100% rename from src/modules/material_editing/MaterialEditingCommands.h rename to src/modules/graphics/material/editing/MaterialEditingCommands.h diff --git a/src/modules/material_editing/MaterialGraph.cpp b/src/modules/graphics/material/editing/MaterialGraph.cpp similarity index 99% rename from src/modules/material_editing/MaterialGraph.cpp rename to src/modules/graphics/material/editing/MaterialGraph.cpp index 0da6f93a..9de37271 100644 --- a/src/modules/material_editing/MaterialGraph.cpp +++ b/src/modules/graphics/material/editing/MaterialGraph.cpp @@ -1,4 +1,4 @@ -#include "material_editing/MaterialGraph.h" +#include "graphics/material/editing/MaterialGraph.h" #include diff --git a/src/modules/material_editing/MaterialGraph.h b/src/modules/graphics/material/editing/MaterialGraph.h similarity index 100% rename from src/modules/material_editing/MaterialGraph.h rename to src/modules/graphics/material/editing/MaterialGraph.h diff --git a/src/modules/material_editing/MaterialPublishingTarget.cpp b/src/modules/graphics/material/editing/MaterialPublishingTarget.cpp similarity index 97% rename from src/modules/material_editing/MaterialPublishingTarget.cpp rename to src/modules/graphics/material/editing/MaterialPublishingTarget.cpp index b9d028ff..960e66bc 100644 --- a/src/modules/material_editing/MaterialPublishingTarget.cpp +++ b/src/modules/graphics/material/editing/MaterialPublishingTarget.cpp @@ -1,4 +1,4 @@ -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialTarget.h" namespace eve::material_editing { namespace { diff --git a/src/modules/material_editing/MaterialTarget.cpp b/src/modules/graphics/material/editing/MaterialTarget.cpp similarity index 99% rename from src/modules/material_editing/MaterialTarget.cpp rename to src/modules/graphics/material/editing/MaterialTarget.cpp index da7bd0e5..e51c0fd0 100644 --- a/src/modules/material_editing/MaterialTarget.cpp +++ b/src/modules/graphics/material/editing/MaterialTarget.cpp @@ -1,4 +1,4 @@ -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialTarget.h" #include #include diff --git a/src/modules/material_editing/MaterialTarget.h b/src/modules/graphics/material/editing/MaterialTarget.h similarity index 100% rename from src/modules/material_editing/MaterialTarget.h rename to src/modules/graphics/material/editing/MaterialTarget.h diff --git a/src/modules/material_editor/EditorGraph.h b/src/modules/graphics/material/editor/EditorGraph.h similarity index 94% rename from src/modules/material_editor/EditorGraph.h rename to src/modules/graphics/material/editor/EditorGraph.h index cd8f94e4..935e6ada 100644 --- a/src/modules/material_editor/EditorGraph.h +++ b/src/modules/graphics/material/editor/EditorGraph.h @@ -1,7 +1,7 @@ #pragma once #include "editor/EditorProtocol.h" -#include "material_editing/MaterialGraph.h" +#include "graphics/material/editing/MaterialGraph.h" namespace eve::editor { using GraphPinDirection = editing::GraphPinDirection; diff --git a/src/modules/material_editor/EditorMaterialOffscreen.cpp b/src/modules/graphics/material/editor/EditorMaterialOffscreen.cpp similarity index 95% rename from src/modules/material_editor/EditorMaterialOffscreen.cpp rename to src/modules/graphics/material/editor/EditorMaterialOffscreen.cpp index c84b87ee..a3c2dfa6 100644 --- a/src/modules/material_editor/EditorMaterialOffscreen.cpp +++ b/src/modules/graphics/material/editor/EditorMaterialOffscreen.cpp @@ -1,4 +1,4 @@ -#include "material_editor/EditorMaterialOffscreen.h" +#include "graphics/material/editor/EditorMaterialOffscreen.h" namespace eve::editor { diff --git a/src/modules/material_editor/EditorMaterialOffscreen.h b/src/modules/graphics/material/editor/EditorMaterialOffscreen.h similarity index 87% rename from src/modules/material_editor/EditorMaterialOffscreen.h rename to src/modules/graphics/material/editor/EditorMaterialOffscreen.h index 1fe6c95d..e7369f38 100644 --- a/src/modules/material_editor/EditorMaterialOffscreen.h +++ b/src/modules/graphics/material/editor/EditorMaterialOffscreen.h @@ -1,7 +1,7 @@ #pragma once -#include "material_editor/EditorMaterialPreview.h" -#include "graphics_editor/EditorOffscreenPreview.h" +#include "graphics/material/editor/EditorMaterialPreview.h" +#include "graphics/editor/EditorOffscreenPreview.h" #include diff --git a/src/modules/material_editor/EditorMaterialPreview.cpp b/src/modules/graphics/material/editor/EditorMaterialPreview.cpp similarity index 98% rename from src/modules/material_editor/EditorMaterialPreview.cpp rename to src/modules/graphics/material/editor/EditorMaterialPreview.cpp index 7a6a2fef..733409ce 100644 --- a/src/modules/material_editor/EditorMaterialPreview.cpp +++ b/src/modules/graphics/material/editor/EditorMaterialPreview.cpp @@ -1,4 +1,4 @@ -#include "material_editor/EditorMaterialPreview.h" +#include "graphics/material/editor/EditorMaterialPreview.h" #include #include diff --git a/src/modules/material_editor/EditorMaterialPreview.h b/src/modules/graphics/material/editor/EditorMaterialPreview.h similarity index 97% rename from src/modules/material_editor/EditorMaterialPreview.h rename to src/modules/graphics/material/editor/EditorMaterialPreview.h index 215575b0..627f97f9 100644 --- a/src/modules/material_editor/EditorMaterialPreview.h +++ b/src/modules/graphics/material/editor/EditorMaterialPreview.h @@ -1,6 +1,6 @@ #pragma once -#include "material_editor/EditorMaterialTarget.h" +#include "graphics/material/editor/EditorMaterialTarget.h" #include #include diff --git a/src/modules/material_editor/EditorMaterialStudio.cpp b/src/modules/graphics/material/editor/EditorMaterialStudio.cpp similarity index 99% rename from src/modules/material_editor/EditorMaterialStudio.cpp rename to src/modules/graphics/material/editor/EditorMaterialStudio.cpp index 84eafe13..51f8fcd2 100644 --- a/src/modules/material_editor/EditorMaterialStudio.cpp +++ b/src/modules/graphics/material/editor/EditorMaterialStudio.cpp @@ -1,4 +1,4 @@ -#include "material_editor/EditorMaterialStudio.h" +#include "graphics/material/editor/EditorMaterialStudio.h" #include #include diff --git a/src/modules/material_editor/EditorMaterialStudio.h b/src/modules/graphics/material/editor/EditorMaterialStudio.h similarity index 98% rename from src/modules/material_editor/EditorMaterialStudio.h rename to src/modules/graphics/material/editor/EditorMaterialStudio.h index 82053b89..95c87c70 100644 --- a/src/modules/material_editor/EditorMaterialStudio.h +++ b/src/modules/graphics/material/editor/EditorMaterialStudio.h @@ -1,6 +1,6 @@ #pragma once -#include "material_editor/EditorMaterialPreview.h" +#include "graphics/material/editor/EditorMaterialPreview.h" #include "editor/EditorTransactionService.h" #include diff --git a/src/modules/material_editor/EditorMaterialTarget.h b/src/modules/graphics/material/editor/EditorMaterialTarget.h similarity index 90% rename from src/modules/material_editor/EditorMaterialTarget.h rename to src/modules/graphics/material/editor/EditorMaterialTarget.h index 88ababa6..a45587c5 100644 --- a/src/modules/material_editor/EditorMaterialTarget.h +++ b/src/modules/graphics/material/editor/EditorMaterialTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialTarget.h" namespace eve::editor { diff --git a/src/modules/material_editor/MaterialEditorModule.cpp b/src/modules/graphics/material/editor/MaterialEditorModule.cpp similarity index 97% rename from src/modules/material_editor/MaterialEditorModule.cpp rename to src/modules/graphics/material/editor/MaterialEditorModule.cpp index 6feacd28..a43a555d 100644 --- a/src/modules/material_editor/MaterialEditorModule.cpp +++ b/src/modules/graphics/material/editor/MaterialEditorModule.cpp @@ -1,11 +1,11 @@ -#include "material_editor/MaterialEditorModule.h" +#include "graphics/material/editor/MaterialEditorModule.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" #include "graphics/RenderSystem3D.h" -#include "material_editing/MaterialEditingCommands.h" -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialEditingCommands.h" +#include "graphics/material/editing/MaterialTarget.h" #include diff --git a/src/modules/material_editor/MaterialEditorModule.h b/src/modules/graphics/material/editor/MaterialEditorModule.h similarity index 100% rename from src/modules/material_editor/MaterialEditorModule.h rename to src/modules/graphics/material/editor/MaterialEditorModule.h diff --git a/src/modules/material_graphics_editing/MaterialRuntime.cpp b/src/modules/graphics/material/graphics_editing/MaterialRuntime.cpp similarity index 99% rename from src/modules/material_graphics_editing/MaterialRuntime.cpp rename to src/modules/graphics/material/graphics_editing/MaterialRuntime.cpp index 0e64cdbd..8e93997e 100644 --- a/src/modules/material_graphics_editing/MaterialRuntime.cpp +++ b/src/modules/graphics/material/graphics_editing/MaterialRuntime.cpp @@ -1,4 +1,4 @@ -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialTarget.h" // Optional graphics adapter for the renderer-neutral material authoring contract. diff --git a/src/modules/hd2d_editing/Hd2dRuntime.cpp b/src/modules/hd2d/editing/Hd2dRuntime.cpp similarity index 99% rename from src/modules/hd2d_editing/Hd2dRuntime.cpp rename to src/modules/hd2d/editing/Hd2dRuntime.cpp index 03f2e631..f449465d 100644 --- a/src/modules/hd2d_editing/Hd2dRuntime.cpp +++ b/src/modules/hd2d/editing/Hd2dRuntime.cpp @@ -1,7 +1,7 @@ #include #include #include "hd2d/Hd2d.h" -#include "hd2d_editing/Hd2dTarget.h" +#include "hd2d/editing/Hd2dTarget.h" namespace eve::hd2d_editing { namespace { template diff --git a/src/modules/hd2d_editing/Hd2dTarget.cpp b/src/modules/hd2d/editing/Hd2dTarget.cpp similarity index 99% rename from src/modules/hd2d_editing/Hd2dTarget.cpp rename to src/modules/hd2d/editing/Hd2dTarget.cpp index 151317e6..ef6a696a 100644 --- a/src/modules/hd2d_editing/Hd2dTarget.cpp +++ b/src/modules/hd2d/editing/Hd2dTarget.cpp @@ -1,4 +1,4 @@ -#include "hd2d_editing/Hd2dTarget.h" +#include "hd2d/editing/Hd2dTarget.h" #include #include #include diff --git a/src/modules/hd2d_editing/Hd2dTarget.h b/src/modules/hd2d/editing/Hd2dTarget.h similarity index 100% rename from src/modules/hd2d_editing/Hd2dTarget.h rename to src/modules/hd2d/editing/Hd2dTarget.h diff --git a/src/modules/hd2d_editor/EditorHd2dTarget.h b/src/modules/hd2d/editor/EditorHd2dTarget.h similarity index 91% rename from src/modules/hd2d_editor/EditorHd2dTarget.h rename to src/modules/hd2d/editor/EditorHd2dTarget.h index 4728ce68..3ef2f41b 100644 --- a/src/modules/hd2d_editor/EditorHd2dTarget.h +++ b/src/modules/hd2d/editor/EditorHd2dTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "hd2d_editing/Hd2dTarget.h" +#include "hd2d/editing/Hd2dTarget.h" namespace eve::editor { using hd2d_editing::Hd2dAssetValue; diff --git a/src/modules/hd2d_editor/hd2d_editor.cpp b/src/modules/hd2d/editor/hd2d_editor.cpp similarity index 72% rename from src/modules/hd2d_editor/hd2d_editor.cpp rename to src/modules/hd2d/editor/hd2d_editor.cpp index 634d0fc0..b57242ee 100644 --- a/src/modules/hd2d_editor/hd2d_editor.cpp +++ b/src/modules/hd2d/editor/hd2d_editor.cpp @@ -1,4 +1,4 @@ -#include "hd2d_editor/EditorHd2dTarget.h" +#include "hd2d/editor/EditorHd2dTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/housegen_editing/HouseGenRuntime.cpp b/src/modules/housegen/editing/HouseGenRuntime.cpp similarity index 98% rename from src/modules/housegen_editing/HouseGenRuntime.cpp rename to src/modules/housegen/editing/HouseGenRuntime.cpp index ddd65225..ebb65683 100644 --- a/src/modules/housegen_editing/HouseGenRuntime.cpp +++ b/src/modules/housegen/editing/HouseGenRuntime.cpp @@ -1,4 +1,4 @@ -#include "housegen_editing/HouseGenTarget.h" +#include "housegen/editing/HouseGenTarget.h" #include "housegen/HouseComponentLibrary.h" #include "housegen/HouseGenerator.h" diff --git a/src/modules/housegen_editing/HouseGenTarget.cpp b/src/modules/housegen/editing/HouseGenTarget.cpp similarity index 99% rename from src/modules/housegen_editing/HouseGenTarget.cpp rename to src/modules/housegen/editing/HouseGenTarget.cpp index bd134689..9bdc217b 100644 --- a/src/modules/housegen_editing/HouseGenTarget.cpp +++ b/src/modules/housegen/editing/HouseGenTarget.cpp @@ -1,4 +1,4 @@ -#include "housegen_editing/HouseGenTarget.h" +#include "housegen/editing/HouseGenTarget.h" #include "housegen/HouseComponentLibrary.h" diff --git a/src/modules/housegen_editing/HouseGenTarget.h b/src/modules/housegen/editing/HouseGenTarget.h similarity index 100% rename from src/modules/housegen_editing/HouseGenTarget.h rename to src/modules/housegen/editing/HouseGenTarget.h diff --git a/src/modules/housegen_editor/EditorHouseGenTarget.h b/src/modules/housegen/editor/EditorHouseGenTarget.h similarity index 74% rename from src/modules/housegen_editor/EditorHouseGenTarget.h rename to src/modules/housegen/editor/EditorHouseGenTarget.h index e4f10719..7c574178 100644 --- a/src/modules/housegen_editor/EditorHouseGenTarget.h +++ b/src/modules/housegen/editor/EditorHouseGenTarget.h @@ -1,9 +1,9 @@ #pragma once -#include "domain_gizmo_editor/EditorGizmoPreview.h" +#include "editor/gizmo/editor/EditorGizmoPreview.h" #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "housegen_editing/HouseGenTarget.h" +#include "housegen/editing/HouseGenTarget.h" namespace eve::editor { using housegen_editing::HouseGenDocumentTarget; diff --git a/src/modules/housegen_editor/housegen_editor.cpp b/src/modules/housegen/editor/housegen_editor.cpp similarity index 69% rename from src/modules/housegen_editor/housegen_editor.cpp rename to src/modules/housegen/editor/housegen_editor.cpp index e6d6d3ff..5371fcfa 100644 --- a/src/modules/housegen_editor/housegen_editor.cpp +++ b/src/modules/housegen/editor/housegen_editor.cpp @@ -1,4 +1,4 @@ -#include "housegen_editor/EditorHouseGenTarget.h" +#include "housegen/editor/EditorHouseGenTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/localization_editing/LocalizationDocument.cpp b/src/modules/i18n/editing/LocalizationDocument.cpp similarity index 99% rename from src/modules/localization_editing/LocalizationDocument.cpp rename to src/modules/i18n/editing/LocalizationDocument.cpp index b42c7ea4..a0b93635 100644 --- a/src/modules/localization_editing/LocalizationDocument.cpp +++ b/src/modules/i18n/editing/LocalizationDocument.cpp @@ -1,4 +1,4 @@ -#include "localization_editing/LocalizationDocument.h" +#include "i18n/editing/LocalizationDocument.h" #include #include diff --git a/src/modules/localization_editing/LocalizationDocument.h b/src/modules/i18n/editing/LocalizationDocument.h similarity index 100% rename from src/modules/localization_editing/LocalizationDocument.h rename to src/modules/i18n/editing/LocalizationDocument.h diff --git a/src/modules/localization_editing/LocalizationRuntime.cpp b/src/modules/i18n/editing/LocalizationRuntime.cpp similarity index 97% rename from src/modules/localization_editing/LocalizationRuntime.cpp rename to src/modules/i18n/editing/LocalizationRuntime.cpp index ea8b8db9..d0b9e099 100644 --- a/src/modules/localization_editing/LocalizationRuntime.cpp +++ b/src/modules/i18n/editing/LocalizationRuntime.cpp @@ -1,4 +1,4 @@ -#include "localization_editing/LocalizationDocument.h" +#include "i18n/editing/LocalizationDocument.h" #include "audio/Source.h" #include "dialogue/DialogueVoice.h" diff --git a/src/modules/localization_editor/EditorLocalization.h b/src/modules/i18n/editor/EditorLocalization.h similarity index 90% rename from src/modules/localization_editor/EditorLocalization.h rename to src/modules/i18n/editor/EditorLocalization.h index 2a2fc992..ee9cfc14 100644 --- a/src/modules/localization_editor/EditorLocalization.h +++ b/src/modules/i18n/editor/EditorLocalization.h @@ -1,5 +1,5 @@ #pragma once -#include "localization_editing/LocalizationDocument.h" +#include "i18n/editing/LocalizationDocument.h" namespace eve::editor { using LocalizationVariant=eve::localization_editing::LocalizationVariant; using LocalizationRow=eve::localization_editing::LocalizationRow; diff --git a/src/modules/localization_editor/localization_editor.cpp b/src/modules/i18n/editor/localization_editor.cpp similarity index 69% rename from src/modules/localization_editor/localization_editor.cpp rename to src/modules/i18n/editor/localization_editor.cpp index ced5a501..3e46e9be 100644 --- a/src/modules/localization_editor/localization_editor.cpp +++ b/src/modules/i18n/editor/localization_editor.cpp @@ -1,4 +1,4 @@ -#include "localization_editor/EditorLocalization.h" +#include "i18n/editor/EditorLocalization.h" namespace eve::editor { namespace { diff --git a/src/modules/map_editing/MapDocument.cpp b/src/modules/map/editing/MapDocument.cpp similarity index 99% rename from src/modules/map_editing/MapDocument.cpp rename to src/modules/map/editing/MapDocument.cpp index 95571ad6..cae0139d 100644 --- a/src/modules/map_editing/MapDocument.cpp +++ b/src/modules/map/editing/MapDocument.cpp @@ -1,4 +1,4 @@ -#include "map_editing/MapDocument.h" +#include "map/editing/MapDocument.h" #include #include diff --git a/src/modules/map_editing/MapDocument.h b/src/modules/map/editing/MapDocument.h similarity index 99% rename from src/modules/map_editing/MapDocument.h rename to src/modules/map/editing/MapDocument.h index a14f4899..d406b9e5 100644 --- a/src/modules/map_editing/MapDocument.h +++ b/src/modules/map/editing/MapDocument.h @@ -1,6 +1,6 @@ #pragma once -#include "map_editing/MapEditingTypes.h" +#include "map/editing/MapEditingTypes.h" #include #include diff --git a/src/modules/map_editing/MapEditingTypes.h b/src/modules/map/editing/MapEditingTypes.h similarity index 100% rename from src/modules/map_editing/MapEditingTypes.h rename to src/modules/map/editing/MapEditingTypes.h diff --git a/src/modules/map_editing/MapIntegration.cpp b/src/modules/map/editing/MapIntegration.cpp similarity index 99% rename from src/modules/map_editing/MapIntegration.cpp rename to src/modules/map/editing/MapIntegration.cpp index 8f8d0ee7..2c516da3 100644 --- a/src/modules/map_editing/MapIntegration.cpp +++ b/src/modules/map/editing/MapIntegration.cpp @@ -1,4 +1,4 @@ -#include "map_editing/MapDocument.h" +#include "map/editing/MapDocument.h" #include #include diff --git a/src/modules/map_editing/TileLayerTarget.cpp b/src/modules/map/editing/TileLayerTarget.cpp similarity index 96% rename from src/modules/map_editing/TileLayerTarget.cpp rename to src/modules/map/editing/TileLayerTarget.cpp index c3f84ebf..eafadef5 100644 --- a/src/modules/map_editing/TileLayerTarget.cpp +++ b/src/modules/map/editing/TileLayerTarget.cpp @@ -1,4 +1,4 @@ -#include "map_editing/TileLayerTarget.h" +#include "map/editing/TileLayerTarget.h" #include "map/TileLayer.h" diff --git a/src/modules/map_editing/TileLayerTarget.h b/src/modules/map/editing/TileLayerTarget.h similarity index 100% rename from src/modules/map_editing/TileLayerTarget.h rename to src/modules/map/editing/TileLayerTarget.h diff --git a/src/modules/map_editor/EditorMapDocument.h b/src/modules/map/editor/EditorMapDocument.h similarity index 96% rename from src/modules/map_editor/EditorMapDocument.h rename to src/modules/map/editor/EditorMapDocument.h index 4895098d..18ba7528 100644 --- a/src/modules/map_editor/EditorMapDocument.h +++ b/src/modules/map/editor/EditorMapDocument.h @@ -2,7 +2,7 @@ /** @file @brief Compatibility include for canonical map editing documents. */ #include "editor/EditorAuthority.h" -#include "map_editing/MapDocument.h" +#include "map/editing/MapDocument.h" namespace eve::editor { using MapLayerRecord = map_editing::MapLayerRecord; diff --git a/src/modules/map_editor/map_editor.cpp b/src/modules/map/editor/map_editor.cpp similarity index 72% rename from src/modules/map_editor/map_editor.cpp rename to src/modules/map/editor/map_editor.cpp index eae00d5c..699d562a 100644 --- a/src/modules/map_editor/map_editor.cpp +++ b/src/modules/map/editor/map_editor.cpp @@ -1,4 +1,4 @@ -#include "map_editor/EditorMapDocument.h" +#include "map/editor/EditorMapDocument.h" namespace eve::editor { namespace { diff --git a/src/modules/level_editing/Brush.cpp b/src/modules/map/level/editing/Brush.cpp similarity index 99% rename from src/modules/level_editing/Brush.cpp rename to src/modules/map/level/editing/Brush.cpp index 491a4a46..710d9e3d 100644 --- a/src/modules/level_editing/Brush.cpp +++ b/src/modules/map/level/editing/Brush.cpp @@ -1,4 +1,4 @@ -#include "level_editing/Brush.h" +#include "map/level/editing/Brush.h" #include "common/Exception.h" diff --git a/src/modules/level_editing/Brush.h b/src/modules/map/level/editing/Brush.h similarity index 98% rename from src/modules/level_editing/Brush.h rename to src/modules/map/level/editing/Brush.h index c8ceef7f..eb9498dc 100644 --- a/src/modules/level_editing/Brush.h +++ b/src/modules/map/level/editing/Brush.h @@ -1,6 +1,6 @@ #pragma once -#include "level_editing/TileBuffer.h" +#include "map/level/editing/TileBuffer.h" #include #include diff --git a/src/modules/level_editing/EditorHistory.cpp b/src/modules/map/level/editing/EditorHistory.cpp similarity index 99% rename from src/modules/level_editing/EditorHistory.cpp rename to src/modules/map/level/editing/EditorHistory.cpp index db680c00..32020bae 100644 --- a/src/modules/level_editing/EditorHistory.cpp +++ b/src/modules/map/level/editing/EditorHistory.cpp @@ -1,4 +1,4 @@ -#include "level_editing/EditorHistory.h" +#include "map/level/editing/EditorHistory.h" #include "common/Exception.h" diff --git a/src/modules/level_editing/EditorHistory.h b/src/modules/map/level/editing/EditorHistory.h similarity index 98% rename from src/modules/level_editing/EditorHistory.h rename to src/modules/map/level/editing/EditorHistory.h index 535ca2a5..7ab15c68 100644 --- a/src/modules/level_editing/EditorHistory.h +++ b/src/modules/map/level/editing/EditorHistory.h @@ -1,6 +1,6 @@ #pragma once -#include "level_editing/TileBuffer.h" +#include "map/level/editing/TileBuffer.h" #include "editing/EditingResult.h" #include diff --git a/src/modules/level_editing/FieldTargets.cpp b/src/modules/map/level/editing/FieldTargets.cpp similarity index 91% rename from src/modules/level_editing/FieldTargets.cpp rename to src/modules/map/level/editing/FieldTargets.cpp index 8fc5185a..015103fe 100644 --- a/src/modules/level_editing/FieldTargets.cpp +++ b/src/modules/map/level/editing/FieldTargets.cpp @@ -1,6 +1,6 @@ -#include "level_editing/FieldTargets.h" +#include "map/level/editing/FieldTargets.h" -#include "level_editing/TileBuffer.h" +#include "map/level/editing/TileBuffer.h" #include namespace eve::level_editing { diff --git a/src/modules/level_editing/FieldTargets.h b/src/modules/map/level/editing/FieldTargets.h similarity index 100% rename from src/modules/level_editing/FieldTargets.h rename to src/modules/map/level/editing/FieldTargets.h diff --git a/src/modules/level_editing/LevelDocument.cpp b/src/modules/map/level/editing/LevelDocument.cpp similarity index 99% rename from src/modules/level_editing/LevelDocument.cpp rename to src/modules/map/level/editing/LevelDocument.cpp index 980c8a07..4360cb3b 100644 --- a/src/modules/level_editing/LevelDocument.cpp +++ b/src/modules/map/level/editing/LevelDocument.cpp @@ -1,4 +1,4 @@ -#include "level_editing/LevelDocument.h" +#include "map/level/editing/LevelDocument.h" #include "common/Exception.h" diff --git a/src/modules/level_editing/LevelDocument.h b/src/modules/map/level/editing/LevelDocument.h similarity index 99% rename from src/modules/level_editing/LevelDocument.h rename to src/modules/map/level/editing/LevelDocument.h index 9e2a897b..0fc116b1 100644 --- a/src/modules/level_editing/LevelDocument.h +++ b/src/modules/map/level/editing/LevelDocument.h @@ -1,7 +1,7 @@ #pragma once #include "common/BorrowedRef.h" -#include "level_editing/TileBuffer.h" +#include "map/level/editing/TileBuffer.h" #include #include diff --git a/src/modules/level_editing/LevelFormat.cpp b/src/modules/map/level/editing/LevelFormat.cpp similarity index 99% rename from src/modules/level_editing/LevelFormat.cpp rename to src/modules/map/level/editing/LevelFormat.cpp index 113cdfce..a58c1285 100644 --- a/src/modules/level_editing/LevelFormat.cpp +++ b/src/modules/map/level/editing/LevelFormat.cpp @@ -1,6 +1,6 @@ -#include "level_editing/LevelFormat.h" +#include "map/level/editing/LevelFormat.h" #include "common/Json.h" -#include "level_editing/LevelDocument.h" +#include "map/level/editing/LevelDocument.h" #include #include diff --git a/src/modules/level_editing/LevelFormat.h b/src/modules/map/level/editing/LevelFormat.h similarity index 100% rename from src/modules/level_editing/LevelFormat.h rename to src/modules/map/level/editing/LevelFormat.h diff --git a/src/modules/level_editing/TileBuffer.cpp b/src/modules/map/level/editing/TileBuffer.cpp similarity index 97% rename from src/modules/level_editing/TileBuffer.cpp rename to src/modules/map/level/editing/TileBuffer.cpp index fb391046..2967f213 100644 --- a/src/modules/level_editing/TileBuffer.cpp +++ b/src/modules/map/level/editing/TileBuffer.cpp @@ -1,4 +1,4 @@ -#include "level_editing/TileBuffer.h" +#include "map/level/editing/TileBuffer.h" #include "common/Exception.h" diff --git a/src/modules/level_editing/TileBuffer.h b/src/modules/map/level/editing/TileBuffer.h similarity index 100% rename from src/modules/level_editing/TileBuffer.h rename to src/modules/map/level/editing/TileBuffer.h diff --git a/src/modules/level_editor/LevelEditorModule.cpp b/src/modules/map/level/editor/LevelEditorModule.cpp similarity index 97% rename from src/modules/level_editor/LevelEditorModule.cpp rename to src/modules/map/level/editor/LevelEditorModule.cpp index b0129db3..dc3e7e79 100644 --- a/src/modules/level_editor/LevelEditorModule.cpp +++ b/src/modules/map/level/editor/LevelEditorModule.cpp @@ -1,10 +1,10 @@ -#include "level_editor/LevelEditorModule.h" +#include "map/level/editor/LevelEditorModule.h" #include "editor/EditorSession.h" -#include "level_editing/Brush.h" -#include "level_editing/EditorHistory.h" -#include "level_editing/FieldTargets.h" -#include "level_editing/TileBuffer.h" +#include "map/level/editing/Brush.h" +#include "map/level/editing/EditorHistory.h" +#include "map/level/editing/FieldTargets.h" +#include "map/level/editing/TileBuffer.h" #include diff --git a/src/modules/level_editor/LevelEditorModule.h b/src/modules/map/level/editor/LevelEditorModule.h similarity index 100% rename from src/modules/level_editor/LevelEditorModule.h rename to src/modules/map/level/editor/LevelEditorModule.h diff --git a/src/modules/tilelayer_target/TileLayerTargetModule.cpp b/src/modules/map/tilelayer_target/TileLayerTargetModule.cpp similarity index 95% rename from src/modules/tilelayer_target/TileLayerTargetModule.cpp rename to src/modules/map/tilelayer_target/TileLayerTargetModule.cpp index 746c3b28..70d9ccb2 100644 --- a/src/modules/tilelayer_target/TileLayerTargetModule.cpp +++ b/src/modules/map/tilelayer_target/TileLayerTargetModule.cpp @@ -1,7 +1,7 @@ -#include "tilelayer_target/TileLayerTargetModule.h" +#include "map/tilelayer_target/TileLayerTargetModule.h" #include "editor/EditorSession.h" -#include "map_editing/TileLayerTarget.h" +#include "map/editing/TileLayerTarget.h" #include diff --git a/src/modules/tilelayer_target/TileLayerTargetModule.h b/src/modules/map/tilelayer_target/TileLayerTargetModule.h similarity index 100% rename from src/modules/tilelayer_target/TileLayerTargetModule.h rename to src/modules/map/tilelayer_target/TileLayerTargetModule.h diff --git a/src/modules/network_editing/NetworkTelemetry.cpp b/src/modules/network/editing/NetworkTelemetry.cpp similarity index 98% rename from src/modules/network_editing/NetworkTelemetry.cpp rename to src/modules/network/editing/NetworkTelemetry.cpp index d299429c..b9a90951 100644 --- a/src/modules/network_editing/NetworkTelemetry.cpp +++ b/src/modules/network/editing/NetworkTelemetry.cpp @@ -1,4 +1,4 @@ -#include "network_editing/NetworkTelemetry.h" +#include "network/editing/NetworkTelemetry.h" #include #include #include diff --git a/src/modules/network_editing/NetworkTelemetry.h b/src/modules/network/editing/NetworkTelemetry.h similarity index 100% rename from src/modules/network_editing/NetworkTelemetry.h rename to src/modules/network/editing/NetworkTelemetry.h diff --git a/src/modules/network_editing/NetworkTelemetryRuntime.cpp b/src/modules/network/editing/NetworkTelemetryRuntime.cpp similarity index 95% rename from src/modules/network_editing/NetworkTelemetryRuntime.cpp rename to src/modules/network/editing/NetworkTelemetryRuntime.cpp index e7eb97b8..4800be85 100644 --- a/src/modules/network_editing/NetworkTelemetryRuntime.cpp +++ b/src/modules/network/editing/NetworkTelemetryRuntime.cpp @@ -1,4 +1,4 @@ -#include "network_editing/NetworkTelemetry.h" +#include "network/editing/NetworkTelemetry.h" #include "network/Network.h" #include namespace eve::network_editing { namespace { diff --git a/src/modules/network_editor/EditorNetworkTelemetry.h b/src/modules/network/editor/EditorNetworkTelemetry.h similarity index 85% rename from src/modules/network_editor/EditorNetworkTelemetry.h rename to src/modules/network/editor/EditorNetworkTelemetry.h index 2de43be4..d259cd7a 100644 --- a/src/modules/network_editor/EditorNetworkTelemetry.h +++ b/src/modules/network/editor/EditorNetworkTelemetry.h @@ -1,5 +1,5 @@ #pragma once -#include "network_editing/NetworkTelemetry.h" +#include "network/editing/NetworkTelemetry.h" namespace eve::editor { using NetworkTelemetrySample=eve::network_editing::NetworkTelemetrySample; using NetworkTelemetryModel=eve::network_editing::NetworkTelemetryModel; diff --git a/src/modules/network_editor/network_editor.cpp b/src/modules/network/editor/network_editor.cpp similarity index 68% rename from src/modules/network_editor/network_editor.cpp rename to src/modules/network/editor/network_editor.cpp index 00b9deb5..8bc9d392 100644 --- a/src/modules/network_editor/network_editor.cpp +++ b/src/modules/network/editor/network_editor.cpp @@ -1,4 +1,4 @@ -#include "network_editor/EditorNetworkTelemetry.h" +#include "network/editor/EditorNetworkTelemetry.h" namespace eve::editor { namespace { diff --git a/src/modules/npc_ai_editing/BehaviorGraph.cpp b/src/modules/npc_ai/editing/BehaviorGraph.cpp similarity index 99% rename from src/modules/npc_ai_editing/BehaviorGraph.cpp rename to src/modules/npc_ai/editing/BehaviorGraph.cpp index a94dde98..ce88be20 100644 --- a/src/modules/npc_ai_editing/BehaviorGraph.cpp +++ b/src/modules/npc_ai/editing/BehaviorGraph.cpp @@ -1,4 +1,4 @@ -#include "npc_ai_editing/BehaviorGraph.h" +#include "npc_ai/editing/BehaviorGraph.h" #include #include diff --git a/src/modules/npc_ai_editing/BehaviorGraph.h b/src/modules/npc_ai/editing/BehaviorGraph.h similarity index 96% rename from src/modules/npc_ai_editing/BehaviorGraph.h rename to src/modules/npc_ai/editing/BehaviorGraph.h index cfbe8bf6..c10ac900 100644 --- a/src/modules/npc_ai_editing/BehaviorGraph.h +++ b/src/modules/npc_ai/editing/BehaviorGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "npc_ai_editing/NpcAiEditingTypes.h" +#include "npc_ai/editing/NpcAiEditingTypes.h" #include #include diff --git a/src/modules/npc_ai_editing/NpcAiEditingTypes.h b/src/modules/npc_ai/editing/NpcAiEditingTypes.h similarity index 100% rename from src/modules/npc_ai_editing/NpcAiEditingTypes.h rename to src/modules/npc_ai/editing/NpcAiEditingTypes.h diff --git a/src/modules/npc_ai_editor/EditorBehaviorGraph.h b/src/modules/npc_ai/editor/EditorBehaviorGraph.h similarity index 86% rename from src/modules/npc_ai_editor/EditorBehaviorGraph.h rename to src/modules/npc_ai/editor/EditorBehaviorGraph.h index 36ed8742..6cbde941 100644 --- a/src/modules/npc_ai_editor/EditorBehaviorGraph.h +++ b/src/modules/npc_ai/editor/EditorBehaviorGraph.h @@ -1,5 +1,5 @@ #pragma once -#include "npc_ai_editing/BehaviorGraph.h" +#include "npc_ai/editing/BehaviorGraph.h" namespace eve::editor { using BehaviorInstruction = npc_ai_editing::BehaviorInstruction; using BehaviorCompileResult = npc_ai_editing::BehaviorCompileResult; diff --git a/src/modules/npc_ai_editor/npc_ai_editor.cpp b/src/modules/npc_ai/editor/npc_ai_editor.cpp similarity index 70% rename from src/modules/npc_ai_editor/npc_ai_editor.cpp rename to src/modules/npc_ai/editor/npc_ai_editor.cpp index 58633c7d..046aea80 100644 --- a/src/modules/npc_ai_editor/npc_ai_editor.cpp +++ b/src/modules/npc_ai/editor/npc_ai_editor.cpp @@ -1,4 +1,4 @@ -#include "npc_ai_editor/EditorBehaviorGraph.h" +#include "npc_ai/editor/EditorBehaviorGraph.h" namespace eve::editor { namespace { diff --git a/src/modules/particles_editing/ParticleGraph.cpp b/src/modules/particles/editing/ParticleGraph.cpp similarity index 99% rename from src/modules/particles_editing/ParticleGraph.cpp rename to src/modules/particles/editing/ParticleGraph.cpp index ca8f8efb..17efa2e0 100644 --- a/src/modules/particles_editing/ParticleGraph.cpp +++ b/src/modules/particles/editing/ParticleGraph.cpp @@ -1,4 +1,4 @@ -#include "particles_editing/ParticleGraph.h" +#include "particles/editing/ParticleGraph.h" #include #include diff --git a/src/modules/particles_editing/ParticleGraph.h b/src/modules/particles/editing/ParticleGraph.h similarity index 97% rename from src/modules/particles_editing/ParticleGraph.h rename to src/modules/particles/editing/ParticleGraph.h index e75f71bd..8d914f5e 100644 --- a/src/modules/particles_editing/ParticleGraph.h +++ b/src/modules/particles/editing/ParticleGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "particles_editing/ParticlesEditingTypes.h" +#include "particles/editing/ParticlesEditingTypes.h" #include #include diff --git a/src/modules/particles_editing/ParticleGraphRuntime.cpp b/src/modules/particles/editing/ParticleGraphRuntime.cpp similarity index 99% rename from src/modules/particles_editing/ParticleGraphRuntime.cpp rename to src/modules/particles/editing/ParticleGraphRuntime.cpp index af7d7d7c..53289a4b 100644 --- a/src/modules/particles_editing/ParticleGraphRuntime.cpp +++ b/src/modules/particles/editing/ParticleGraphRuntime.cpp @@ -1,4 +1,4 @@ -#include "particles_editing/ParticleGraph.h" +#include "particles/editing/ParticleGraph.h" #include "particles/ParticleEmitter.h" diff --git a/src/modules/particles_editing/ParticlesEditingTypes.h b/src/modules/particles/editing/ParticlesEditingTypes.h similarity index 100% rename from src/modules/particles_editing/ParticlesEditingTypes.h rename to src/modules/particles/editing/ParticlesEditingTypes.h diff --git a/src/modules/particles_editor/EditorParticleGraph.h b/src/modules/particles/editor/EditorParticleGraph.h similarity index 91% rename from src/modules/particles_editor/EditorParticleGraph.h rename to src/modules/particles/editor/EditorParticleGraph.h index c5b7755d..b26298cf 100644 --- a/src/modules/particles_editor/EditorParticleGraph.h +++ b/src/modules/particles/editor/EditorParticleGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "particles_editing/ParticleGraph.h" +#include "particles/editing/ParticleGraph.h" namespace eve::editor { using GraphDocumentData = editing::GraphDocumentData; diff --git a/src/modules/particles_editor/EditorParticleOffscreen.h b/src/modules/particles/editor/EditorParticleOffscreen.h similarity index 88% rename from src/modules/particles_editor/EditorParticleOffscreen.h rename to src/modules/particles/editor/EditorParticleOffscreen.h index 9b92499b..761a850f 100644 --- a/src/modules/particles_editor/EditorParticleOffscreen.h +++ b/src/modules/particles/editor/EditorParticleOffscreen.h @@ -1,5 +1,5 @@ #pragma once -#include "particles_graphics_editing/ParticleOffscreen.h" +#include "particles/graphics_editing/ParticleOffscreen.h" namespace eve::editor { using ParticleOffscreenPreviewRequest=eve::particles_graphics_editing::ParticleOffscreenPreviewRequest; using IParticleOffscreenPresenter=eve::particles_graphics_editing::IParticleOffscreenPresenter; diff --git a/src/modules/particles_editor/particles_editor.cpp b/src/modules/particles/editor/particles_editor.cpp similarity index 69% rename from src/modules/particles_editor/particles_editor.cpp rename to src/modules/particles/editor/particles_editor.cpp index 53a709d7..d0ff246f 100644 --- a/src/modules/particles_editor/particles_editor.cpp +++ b/src/modules/particles/editor/particles_editor.cpp @@ -1,4 +1,4 @@ -#include "particles_editor/EditorParticleGraph.h" +#include "particles/editor/EditorParticleGraph.h" namespace eve::editor { namespace { diff --git a/src/modules/particles_graphics_editing/ParticleOffscreen.cpp b/src/modules/particles/graphics_editing/ParticleOffscreen.cpp similarity index 96% rename from src/modules/particles_graphics_editing/ParticleOffscreen.cpp rename to src/modules/particles/graphics_editing/ParticleOffscreen.cpp index ff4bb1ae..f1733446 100644 --- a/src/modules/particles_graphics_editing/ParticleOffscreen.cpp +++ b/src/modules/particles/graphics_editing/ParticleOffscreen.cpp @@ -1,4 +1,4 @@ -#include "particles_graphics_editing/ParticleOffscreen.h" +#include "particles/graphics_editing/ParticleOffscreen.h" namespace eve::particles_graphics_editing { diff --git a/src/modules/particles_graphics_editing/ParticleOffscreen.h b/src/modules/particles/graphics_editing/ParticleOffscreen.h similarity index 97% rename from src/modules/particles_graphics_editing/ParticleOffscreen.h rename to src/modules/particles/graphics_editing/ParticleOffscreen.h index 0654999f..61feb614 100644 --- a/src/modules/particles_graphics_editing/ParticleOffscreen.h +++ b/src/modules/particles/graphics_editing/ParticleOffscreen.h @@ -1,7 +1,7 @@ #pragma once -#include "graphics_editing/OffscreenPreview.h" -#include "particles_editing/ParticleGraph.h" +#include "graphics/editing/OffscreenPreview.h" +#include "particles/editing/ParticleGraph.h" #include diff --git a/src/modules/particles_graphics_editing/ParticleOffscreenRuntime.cpp b/src/modules/particles/graphics_editing/ParticleOffscreenRuntime.cpp similarity index 98% rename from src/modules/particles_graphics_editing/ParticleOffscreenRuntime.cpp rename to src/modules/particles/graphics_editing/ParticleOffscreenRuntime.cpp index 0aa62d81..bcdcbe41 100644 --- a/src/modules/particles_graphics_editing/ParticleOffscreenRuntime.cpp +++ b/src/modules/particles/graphics_editing/ParticleOffscreenRuntime.cpp @@ -1,4 +1,4 @@ -#include "particles_graphics_editing/ParticleOffscreen.h" +#include "particles/graphics_editing/ParticleOffscreen.h" #include "graphics/Canvas.h" #include "particles/ParticleEmitter.h" diff --git a/src/modules/physics_editing/PhysicsColliderAsset.cpp b/src/modules/physics/editing/PhysicsColliderAsset.cpp similarity index 76% rename from src/modules/physics_editing/PhysicsColliderAsset.cpp rename to src/modules/physics/editing/PhysicsColliderAsset.cpp index a05cd59c..061404ed 100644 --- a/src/modules/physics_editing/PhysicsColliderAsset.cpp +++ b/src/modules/physics/editing/PhysicsColliderAsset.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsColliderAsset.h" +#include "physics/editing/PhysicsColliderAsset.h" #include diff --git a/src/modules/physics_editing/PhysicsColliderAsset.h b/src/modules/physics/editing/PhysicsColliderAsset.h similarity index 100% rename from src/modules/physics_editing/PhysicsColliderAsset.h rename to src/modules/physics/editing/PhysicsColliderAsset.h diff --git a/src/modules/physics_editing/PhysicsEditingProvider.cpp b/src/modules/physics/editing/PhysicsEditingProvider.cpp similarity index 95% rename from src/modules/physics_editing/PhysicsEditingProvider.cpp rename to src/modules/physics/editing/PhysicsEditingProvider.cpp index 84c669aa..00cfc6e1 100644 --- a/src/modules/physics_editing/PhysicsEditingProvider.cpp +++ b/src/modules/physics/editing/PhysicsEditingProvider.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsEditingProvider.h" +#include "physics/editing/PhysicsEditingProvider.h" #include diff --git a/src/modules/physics_editing/PhysicsEditingProvider.h b/src/modules/physics/editing/PhysicsEditingProvider.h similarity index 97% rename from src/modules/physics_editing/PhysicsEditingProvider.h rename to src/modules/physics/editing/PhysicsEditingProvider.h index 1afcdefb..f4b482d9 100644 --- a/src/modules/physics_editing/PhysicsEditingProvider.h +++ b/src/modules/physics/editing/PhysicsEditingProvider.h @@ -1,7 +1,7 @@ #pragma once #include "editing/EditingExtension.h" -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include #include diff --git a/src/modules/physics_editing/PhysicsJointTarget.cpp b/src/modules/physics/editing/PhysicsJointTarget.cpp similarity index 99% rename from src/modules/physics_editing/PhysicsJointTarget.cpp rename to src/modules/physics/editing/PhysicsJointTarget.cpp index 3cc15498..1efb807d 100644 --- a/src/modules/physics_editing/PhysicsJointTarget.cpp +++ b/src/modules/physics/editing/PhysicsJointTarget.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include #include diff --git a/src/modules/physics_editing/PhysicsPublishingTarget.cpp b/src/modules/physics/editing/PhysicsPublishingTarget.cpp similarity index 98% rename from src/modules/physics_editing/PhysicsPublishingTarget.cpp rename to src/modules/physics/editing/PhysicsPublishingTarget.cpp index c1545c86..70617618 100644 --- a/src/modules/physics_editing/PhysicsPublishingTarget.cpp +++ b/src/modules/physics/editing/PhysicsPublishingTarget.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" namespace eve::physics_editing { namespace { diff --git a/src/modules/physics_editing/PhysicsRuntime.cpp b/src/modules/physics/editing/PhysicsRuntime.cpp similarity index 99% rename from src/modules/physics_editing/PhysicsRuntime.cpp rename to src/modules/physics/editing/PhysicsRuntime.cpp index ea27d051..a655600a 100644 --- a/src/modules/physics_editing/PhysicsRuntime.cpp +++ b/src/modules/physics/editing/PhysicsRuntime.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include "physics/Body.h" #include "physics/Body3D.h" diff --git a/src/modules/physics_editing/PhysicsSerialization.cpp b/src/modules/physics/editing/PhysicsSerialization.cpp similarity index 99% rename from src/modules/physics_editing/PhysicsSerialization.cpp rename to src/modules/physics/editing/PhysicsSerialization.cpp index 1eba701e..f45a8251 100644 --- a/src/modules/physics_editing/PhysicsSerialization.cpp +++ b/src/modules/physics/editing/PhysicsSerialization.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include diff --git a/src/modules/physics_editing/PhysicsTarget.cpp b/src/modules/physics/editing/PhysicsTarget.cpp similarity index 99% rename from src/modules/physics_editing/PhysicsTarget.cpp rename to src/modules/physics/editing/PhysicsTarget.cpp index dc639e50..da4b45df 100644 --- a/src/modules/physics_editing/PhysicsTarget.cpp +++ b/src/modules/physics/editing/PhysicsTarget.cpp @@ -1,4 +1,4 @@ -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" #include diff --git a/src/modules/physics_editing/PhysicsTarget.h b/src/modules/physics/editing/PhysicsTarget.h similarity index 99% rename from src/modules/physics_editing/PhysicsTarget.h rename to src/modules/physics/editing/PhysicsTarget.h index 4ab950c8..344d489d 100644 --- a/src/modules/physics_editing/PhysicsTarget.h +++ b/src/modules/physics/editing/PhysicsTarget.h @@ -3,7 +3,7 @@ #include "editing/EditingProperty.h" #include "editing/EditingTargetOperations.h" #include "editing/EditableTarget.h" -#include "physics_editing/PhysicsColliderAsset.h" +#include "physics/editing/PhysicsColliderAsset.h" #include #include diff --git a/src/modules/physics_editor/EditorPhysicsAsset.cpp b/src/modules/physics/editor/EditorPhysicsAsset.cpp similarity index 99% rename from src/modules/physics_editor/EditorPhysicsAsset.cpp rename to src/modules/physics/editor/EditorPhysicsAsset.cpp index e88c4c15..ecb28b39 100644 --- a/src/modules/physics_editor/EditorPhysicsAsset.cpp +++ b/src/modules/physics/editor/EditorPhysicsAsset.cpp @@ -1,4 +1,4 @@ -#include "physics_editor/EditorPhysicsAsset.h" +#include "physics/editor/EditorPhysicsAsset.h" #include #include diff --git a/src/modules/physics_editor/EditorPhysicsAsset.h b/src/modules/physics/editor/EditorPhysicsAsset.h similarity index 94% rename from src/modules/physics_editor/EditorPhysicsAsset.h rename to src/modules/physics/editor/EditorPhysicsAsset.h index 8667fa25..2fd8e7c6 100644 --- a/src/modules/physics_editor/EditorPhysicsAsset.h +++ b/src/modules/physics/editor/EditorPhysicsAsset.h @@ -1,7 +1,7 @@ #pragma once #include "editor/EditorAssetDatabase.h" -#include "physics_editing/PhysicsColliderAsset.h" +#include "physics/editing/PhysicsColliderAsset.h" namespace eve::editor { diff --git a/src/modules/physics_editor/EditorPhysicsTarget.h b/src/modules/physics/editor/EditorPhysicsTarget.h similarity index 95% rename from src/modules/physics_editor/EditorPhysicsTarget.h rename to src/modules/physics/editor/EditorPhysicsTarget.h index 0b91e6cc..f4ce229c 100644 --- a/src/modules/physics_editor/EditorPhysicsTarget.h +++ b/src/modules/physics/editor/EditorPhysicsTarget.h @@ -3,7 +3,7 @@ #include "editor/EditorAuthority.h" #include "editor/EditorProperty.h" #include "editing/EditableTarget.h" -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsTarget.h" namespace eve::editor { diff --git a/src/modules/pixelworld_editor/PixelWorldCatalogPanel.cpp b/src/modules/pixelworld/editor/PixelWorldCatalogPanel.cpp similarity index 99% rename from src/modules/pixelworld_editor/PixelWorldCatalogPanel.cpp rename to src/modules/pixelworld/editor/PixelWorldCatalogPanel.cpp index 44c4a196..d4d80aee 100644 --- a/src/modules/pixelworld_editor/PixelWorldCatalogPanel.cpp +++ b/src/modules/pixelworld/editor/PixelWorldCatalogPanel.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_editor/PixelWorldCatalogPanel.h" +#include "pixelworld/editor/PixelWorldCatalogPanel.h" #include "pixelworld/PixelMaterialCatalogCodec.h" #include "ui/UIHost.h" diff --git a/src/modules/pixelworld_editor/PixelWorldCatalogPanel.h b/src/modules/pixelworld/editor/PixelWorldCatalogPanel.h similarity index 100% rename from src/modules/pixelworld_editor/PixelWorldCatalogPanel.h rename to src/modules/pixelworld/editor/PixelWorldCatalogPanel.h diff --git a/src/modules/pixelworld_editor/PixelWorldEditorModule.cpp b/src/modules/pixelworld/editor/PixelWorldEditorModule.cpp similarity index 96% rename from src/modules/pixelworld_editor/PixelWorldEditorModule.cpp rename to src/modules/pixelworld/editor/PixelWorldEditorModule.cpp index 37688b7a..8f0294db 100644 --- a/src/modules/pixelworld_editor/PixelWorldEditorModule.cpp +++ b/src/modules/pixelworld/editor/PixelWorldEditorModule.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_editor/PixelWorldEditorModule.h" +#include "pixelworld/editor/PixelWorldEditorModule.h" #include diff --git a/src/modules/pixelworld_editor/PixelWorldEditorModule.h b/src/modules/pixelworld/editor/PixelWorldEditorModule.h similarity index 94% rename from src/modules/pixelworld_editor/PixelWorldEditorModule.h rename to src/modules/pixelworld/editor/PixelWorldEditorModule.h index f7ee2e60..9d62db3e 100644 --- a/src/modules/pixelworld_editor/PixelWorldEditorModule.h +++ b/src/modules/pixelworld/editor/PixelWorldEditorModule.h @@ -1,7 +1,7 @@ #pragma once #include "common/Module.h" -#include "pixelworld_editor/PixelWorldCatalogPanel.h" +#include "pixelworld/editor/PixelWorldCatalogPanel.h" #include diff --git a/src/modules/pixelworld_graphics/PixelWorldGraphics.cpp b/src/modules/pixelworld/graphics/PixelWorldGraphics.cpp similarity index 99% rename from src/modules/pixelworld_graphics/PixelWorldGraphics.cpp rename to src/modules/pixelworld/graphics/PixelWorldGraphics.cpp index ff255186..05694250 100644 --- a/src/modules/pixelworld_graphics/PixelWorldGraphics.cpp +++ b/src/modules/pixelworld/graphics/PixelWorldGraphics.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_graphics/PixelWorldGraphics.h" +#include "pixelworld/graphics/PixelWorldGraphics.h" #include "common/Exception.h" #include "graphics/Graphics.h" diff --git a/src/modules/pixelworld_graphics/PixelWorldGraphics.h b/src/modules/pixelworld/graphics/PixelWorldGraphics.h similarity index 100% rename from src/modules/pixelworld_graphics/PixelWorldGraphics.h rename to src/modules/pixelworld/graphics/PixelWorldGraphics.h diff --git a/src/modules/pixelworld_physics/PixelWorldPhysics.cpp b/src/modules/pixelworld/physics/PixelWorldPhysics.cpp similarity index 99% rename from src/modules/pixelworld_physics/PixelWorldPhysics.cpp rename to src/modules/pixelworld/physics/PixelWorldPhysics.cpp index 3288a405..07e033ce 100644 --- a/src/modules/pixelworld_physics/PixelWorldPhysics.cpp +++ b/src/modules/pixelworld/physics/PixelWorldPhysics.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_physics/PixelWorldPhysics.h" +#include "pixelworld/physics/PixelWorldPhysics.h" #include "common/Exception.h" #include "physics/Body.h" diff --git a/src/modules/pixelworld_physics/PixelWorldPhysics.h b/src/modules/pixelworld/physics/PixelWorldPhysics.h similarity index 100% rename from src/modules/pixelworld_physics/PixelWorldPhysics.h rename to src/modules/pixelworld/physics/PixelWorldPhysics.h diff --git a/src/modules/pixelworld_replay/PixelWorldReplay.cpp b/src/modules/pixelworld/replay/PixelWorldReplay.cpp similarity index 99% rename from src/modules/pixelworld_replay/PixelWorldReplay.cpp rename to src/modules/pixelworld/replay/PixelWorldReplay.cpp index e729e08b..4d2f1865 100644 --- a/src/modules/pixelworld_replay/PixelWorldReplay.cpp +++ b/src/modules/pixelworld/replay/PixelWorldReplay.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_replay/PixelWorldReplay.h" +#include "pixelworld/replay/PixelWorldReplay.h" #include #include diff --git a/src/modules/pixelworld_replay/PixelWorldReplay.h b/src/modules/pixelworld/replay/PixelWorldReplay.h similarity index 100% rename from src/modules/pixelworld_replay/PixelWorldReplay.h rename to src/modules/pixelworld/replay/PixelWorldReplay.h diff --git a/src/modules/pixelworld_streaming/PixelWorldArchive.cpp b/src/modules/pixelworld/streaming/PixelWorldArchive.cpp similarity index 99% rename from src/modules/pixelworld_streaming/PixelWorldArchive.cpp rename to src/modules/pixelworld/streaming/PixelWorldArchive.cpp index f6e072c1..dd791683 100644 --- a/src/modules/pixelworld_streaming/PixelWorldArchive.cpp +++ b/src/modules/pixelworld/streaming/PixelWorldArchive.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_streaming/PixelWorldStreaming.h" +#include "pixelworld/streaming/PixelWorldStreaming.h" #include "asset/EvpackCompression.h" diff --git a/src/modules/pixelworld_streaming/PixelWorldStreaming.cpp b/src/modules/pixelworld/streaming/PixelWorldStreaming.cpp similarity index 98% rename from src/modules/pixelworld_streaming/PixelWorldStreaming.cpp rename to src/modules/pixelworld/streaming/PixelWorldStreaming.cpp index 58258639..bcff6f56 100644 --- a/src/modules/pixelworld_streaming/PixelWorldStreaming.cpp +++ b/src/modules/pixelworld/streaming/PixelWorldStreaming.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_streaming/PixelWorldStreaming.h" +#include "pixelworld/streaming/PixelWorldStreaming.h" #include #include diff --git a/src/modules/pixelworld_streaming/PixelWorldStreaming.h b/src/modules/pixelworld/streaming/PixelWorldStreaming.h similarity index 100% rename from src/modules/pixelworld_streaming/PixelWorldStreaming.h rename to src/modules/pixelworld/streaming/PixelWorldStreaming.h diff --git a/src/modules/pixelworld_streaming/PixelWorldTransport.cpp b/src/modules/pixelworld/streaming/PixelWorldTransport.cpp similarity index 99% rename from src/modules/pixelworld_streaming/PixelWorldTransport.cpp rename to src/modules/pixelworld/streaming/PixelWorldTransport.cpp index fbf80c0c..dbf7c368 100644 --- a/src/modules/pixelworld_streaming/PixelWorldTransport.cpp +++ b/src/modules/pixelworld/streaming/PixelWorldTransport.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_streaming/PixelWorldTransport.h" +#include "pixelworld/streaming/PixelWorldTransport.h" #include #include diff --git a/src/modules/pixelworld_streaming/PixelWorldTransport.h b/src/modules/pixelworld/streaming/PixelWorldTransport.h similarity index 98% rename from src/modules/pixelworld_streaming/PixelWorldTransport.h rename to src/modules/pixelworld/streaming/PixelWorldTransport.h index f5fbdc35..6dafdc02 100644 --- a/src/modules/pixelworld_streaming/PixelWorldTransport.h +++ b/src/modules/pixelworld/streaming/PixelWorldTransport.h @@ -2,7 +2,7 @@ #include "common/Result.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_streaming/PixelWorldStreaming.h" +#include "pixelworld/streaming/PixelWorldStreaming.h" #include #include diff --git a/src/modules/pixelworld_thread/PixelWorldThread.cpp b/src/modules/pixelworld/thread/PixelWorldThread.cpp similarity index 95% rename from src/modules/pixelworld_thread/PixelWorldThread.cpp rename to src/modules/pixelworld/thread/PixelWorldThread.cpp index 0c84723c..4c3376d8 100644 --- a/src/modules/pixelworld_thread/PixelWorldThread.cpp +++ b/src/modules/pixelworld/thread/PixelWorldThread.cpp @@ -1,4 +1,4 @@ -#include "pixelworld_thread/PixelWorldThread.h" +#include "pixelworld/thread/PixelWorldThread.h" #include "thread/JobSystem.h" diff --git a/src/modules/pixelworld_thread/PixelWorldThread.h b/src/modules/pixelworld/thread/PixelWorldThread.h similarity index 100% rename from src/modules/pixelworld_thread/PixelWorldThread.h rename to src/modules/pixelworld/thread/PixelWorldThread.h diff --git a/src/modules/biome_editing/BiomeEditingCommands.cpp b/src/modules/procgen/biome/editing/BiomeEditingCommands.cpp similarity index 98% rename from src/modules/biome_editing/BiomeEditingCommands.cpp rename to src/modules/procgen/biome/editing/BiomeEditingCommands.cpp index 14293e40..9444e748 100644 --- a/src/modules/biome_editing/BiomeEditingCommands.cpp +++ b/src/modules/procgen/biome/editing/BiomeEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "biome_editing/BiomeEditingCommands.h" +#include "procgen/biome/editing/BiomeEditingCommands.h" -#include "biome_editing/BiomeTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" #include "editing/EditingProperty.h" #include diff --git a/src/modules/biome_editing/BiomeEditingCommands.h b/src/modules/procgen/biome/editing/BiomeEditingCommands.h similarity index 100% rename from src/modules/biome_editing/BiomeEditingCommands.h rename to src/modules/procgen/biome/editing/BiomeEditingCommands.h diff --git a/src/modules/biome_editing/BiomeRuntime.cpp b/src/modules/procgen/biome/editing/BiomeRuntime.cpp similarity index 98% rename from src/modules/biome_editing/BiomeRuntime.cpp rename to src/modules/procgen/biome/editing/BiomeRuntime.cpp index 004acbd9..44b4a358 100644 --- a/src/modules/biome_editing/BiomeRuntime.cpp +++ b/src/modules/procgen/biome/editing/BiomeRuntime.cpp @@ -1,4 +1,4 @@ -#include "biome_editing/BiomeTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" #include "procgen/Biome.h" #include "procgen/SpatialData.h" diff --git a/src/modules/biome_editing/BiomeTarget.cpp b/src/modules/procgen/biome/editing/BiomeTarget.cpp similarity index 99% rename from src/modules/biome_editing/BiomeTarget.cpp rename to src/modules/procgen/biome/editing/BiomeTarget.cpp index 14dddf2b..eab4a5b0 100644 --- a/src/modules/biome_editing/BiomeTarget.cpp +++ b/src/modules/procgen/biome/editing/BiomeTarget.cpp @@ -1,4 +1,4 @@ -#include "biome_editing/BiomeTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" #include #include #include diff --git a/src/modules/biome_editing/BiomeTarget.h b/src/modules/procgen/biome/editing/BiomeTarget.h similarity index 100% rename from src/modules/biome_editing/BiomeTarget.h rename to src/modules/procgen/biome/editing/BiomeTarget.h diff --git a/src/modules/biome_editor/BiomeEditorModule.h b/src/modules/procgen/biome/editor/BiomeEditorModule.h similarity index 100% rename from src/modules/biome_editor/BiomeEditorModule.h rename to src/modules/procgen/biome/editor/BiomeEditorModule.h diff --git a/src/modules/biome_editor/BiomeRulesEditor.cpp b/src/modules/procgen/biome/editor/BiomeRulesEditor.cpp similarity index 99% rename from src/modules/biome_editor/BiomeRulesEditor.cpp rename to src/modules/procgen/biome/editor/BiomeRulesEditor.cpp index 2947ec6b..ed13f352 100644 --- a/src/modules/biome_editor/BiomeRulesEditor.cpp +++ b/src/modules/procgen/biome/editor/BiomeRulesEditor.cpp @@ -1,4 +1,4 @@ -#include "biome_editor/BiomeRulesEditor.h" +#include "procgen/biome/editor/BiomeRulesEditor.h" #include "editor/EditorProtocol.h" #include "procgen/PointSet.h" diff --git a/src/modules/biome_editor/BiomeRulesEditor.h b/src/modules/procgen/biome/editor/BiomeRulesEditor.h similarity index 99% rename from src/modules/biome_editor/BiomeRulesEditor.h rename to src/modules/procgen/biome/editor/BiomeRulesEditor.h index 206c0647..edfdc09e 100644 --- a/src/modules/biome_editor/BiomeRulesEditor.h +++ b/src/modules/procgen/biome/editor/BiomeRulesEditor.h @@ -5,7 +5,7 @@ * @brief UI-neutral biome editor: workspace, PointSet preview, undo. */ -#include "biome_editing/BiomeTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" #include "editor/EditorAuthority.h" #include "editor/EditorSelection.h" #include "editor/EditorTransactionService.h" diff --git a/src/modules/biome_editor/BiomeRulesEditorScriptBindings.cpp b/src/modules/procgen/biome/editor/BiomeRulesEditorScriptBindings.cpp similarity index 98% rename from src/modules/biome_editor/BiomeRulesEditorScriptBindings.cpp rename to src/modules/procgen/biome/editor/BiomeRulesEditorScriptBindings.cpp index 3098cae8..77e681fd 100644 --- a/src/modules/biome_editor/BiomeRulesEditorScriptBindings.cpp +++ b/src/modules/procgen/biome/editor/BiomeRulesEditorScriptBindings.cpp @@ -1,7 +1,7 @@ -#include "biome_editor/BiomeRulesEditorScriptBindings.h" +#include "procgen/biome/editor/BiomeRulesEditorScriptBindings.h" -#include "biome_editor/BiomeEditorModule.h" -#include "biome_editor/BiomeRulesEditor.h" +#include "procgen/biome/editor/BiomeEditorModule.h" +#include "procgen/biome/editor/BiomeRulesEditor.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" diff --git a/src/modules/biome_editor/BiomeRulesEditorScriptBindings.h b/src/modules/procgen/biome/editor/BiomeRulesEditorScriptBindings.h similarity index 100% rename from src/modules/biome_editor/BiomeRulesEditorScriptBindings.h rename to src/modules/procgen/biome/editor/BiomeRulesEditorScriptBindings.h diff --git a/src/modules/biome_editor/EditorBiomeTarget.h b/src/modules/procgen/biome/editor/EditorBiomeTarget.h similarity index 89% rename from src/modules/biome_editor/EditorBiomeTarget.h rename to src/modules/procgen/biome/editor/EditorBiomeTarget.h index cbb5e0f6..20e64699 100644 --- a/src/modules/biome_editor/EditorBiomeTarget.h +++ b/src/modules/procgen/biome/editor/EditorBiomeTarget.h @@ -1,7 +1,7 @@ #pragma once // Compatibility facade. Canonical implementation is owned by biome_editing. -#include "biome_editing/BiomeTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/biome_editor/biome_editor.cpp b/src/modules/procgen/biome/editor/biome_editor.cpp similarity index 93% rename from src/modules/biome_editor/biome_editor.cpp rename to src/modules/procgen/biome/editor/biome_editor.cpp index 103f226d..b2695515 100644 --- a/src/modules/biome_editor/biome_editor.cpp +++ b/src/modules/procgen/biome/editor/biome_editor.cpp @@ -1,8 +1,8 @@ -#include "biome_editor/BiomeEditorModule.h" +#include "procgen/biome/editor/BiomeEditorModule.h" -#include "biome_editing/BiomeEditingCommands.h" -#include "biome_editing/BiomeTarget.h" -#include "biome_editor/BiomeRulesEditorScriptBindings.h" +#include "procgen/biome/editing/BiomeEditingCommands.h" +#include "procgen/biome/editing/BiomeTarget.h" +#include "procgen/biome/editor/BiomeRulesEditorScriptBindings.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" diff --git a/src/modules/procgen_editing/HeightmapBrush.h b/src/modules/procgen/editing/HeightmapBrush.h similarity index 100% rename from src/modules/procgen_editing/HeightmapBrush.h rename to src/modules/procgen/editing/HeightmapBrush.h diff --git a/src/modules/procgen_editing/HeightmapTarget.cpp b/src/modules/procgen/editing/HeightmapTarget.cpp similarity index 98% rename from src/modules/procgen_editing/HeightmapTarget.cpp rename to src/modules/procgen/editing/HeightmapTarget.cpp index 4952722d..5a2d84d1 100644 --- a/src/modules/procgen_editing/HeightmapTarget.cpp +++ b/src/modules/procgen/editing/HeightmapTarget.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/HeightmapTarget.h" +#include "procgen/editing/HeightmapTarget.h" #include "procgen/heightmap/Heightmap.h" diff --git a/src/modules/procgen_editing/HeightmapTarget.h b/src/modules/procgen/editing/HeightmapTarget.h similarity index 97% rename from src/modules/procgen_editing/HeightmapTarget.h rename to src/modules/procgen/editing/HeightmapTarget.h index f11d4a03..39e900bd 100644 --- a/src/modules/procgen_editing/HeightmapTarget.h +++ b/src/modules/procgen/editing/HeightmapTarget.h @@ -1,7 +1,7 @@ #pragma once #include "editing/EditableTarget.h" -#include "procgen_editing/HeightmapBrush.h" +#include "procgen/editing/HeightmapBrush.h" #include #include diff --git a/src/modules/procgen_editing/PcgGraph.cpp b/src/modules/procgen/editing/PcgGraph.cpp similarity index 99% rename from src/modules/procgen_editing/PcgGraph.cpp rename to src/modules/procgen/editing/PcgGraph.cpp index 51594722..b9323502 100644 --- a/src/modules/procgen_editing/PcgGraph.cpp +++ b/src/modules/procgen/editing/PcgGraph.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/PcgGraph.h" +#include "procgen/editing/PcgGraph.h" #include "procgen/PointGraph.h" diff --git a/src/modules/procgen_editing/PcgGraph.h b/src/modules/procgen/editing/PcgGraph.h similarity index 98% rename from src/modules/procgen_editing/PcgGraph.h rename to src/modules/procgen/editing/PcgGraph.h index 68dfee7a..874c320d 100644 --- a/src/modules/procgen_editing/PcgGraph.h +++ b/src/modules/procgen/editing/PcgGraph.h @@ -1,6 +1,6 @@ #pragma once -#include "procgen_editing/ProcgenEditingTypes.h" +#include "procgen/editing/ProcgenEditingTypes.h" #include #include diff --git a/src/modules/procgen_editing/ProcgenEditingTypes.h b/src/modules/procgen/editing/ProcgenEditingTypes.h similarity index 100% rename from src/modules/procgen_editing/ProcgenEditingTypes.h rename to src/modules/procgen/editing/ProcgenEditingTypes.h diff --git a/src/modules/procgen_editing/ProcgenScriptTarget.cpp b/src/modules/procgen/editing/ProcgenScriptTarget.cpp similarity index 99% rename from src/modules/procgen_editing/ProcgenScriptTarget.cpp rename to src/modules/procgen/editing/ProcgenScriptTarget.cpp index fd93e355..febadf4c 100644 --- a/src/modules/procgen_editing/ProcgenScriptTarget.cpp +++ b/src/modules/procgen/editing/ProcgenScriptTarget.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/ProcgenScriptTarget.h" +#include "procgen/editing/ProcgenScriptTarget.h" #include "editing/EditingResult.h" #include "editing/EditingProperty.h" diff --git a/src/modules/procgen_editing/ProcgenScriptTarget.h b/src/modules/procgen/editing/ProcgenScriptTarget.h similarity index 100% rename from src/modules/procgen_editing/ProcgenScriptTarget.h rename to src/modules/procgen/editing/ProcgenScriptTarget.h diff --git a/src/modules/procgen_editing/TextureRecipeTarget.cpp b/src/modules/procgen/editing/TextureRecipeTarget.cpp similarity index 99% rename from src/modules/procgen_editing/TextureRecipeTarget.cpp rename to src/modules/procgen/editing/TextureRecipeTarget.cpp index b8f95551..0a8c6e91 100644 --- a/src/modules/procgen_editing/TextureRecipeTarget.cpp +++ b/src/modules/procgen/editing/TextureRecipeTarget.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/TextureRecipeTarget.h" +#include "procgen/editing/TextureRecipeTarget.h" #include #include #include diff --git a/src/modules/procgen_editing/TextureRecipeTarget.h b/src/modules/procgen/editing/TextureRecipeTarget.h similarity index 100% rename from src/modules/procgen_editing/TextureRecipeTarget.h rename to src/modules/procgen/editing/TextureRecipeTarget.h diff --git a/src/modules/procgen_editor/EditorPcgGraph.h b/src/modules/procgen/editor/EditorPcgGraph.h similarity index 91% rename from src/modules/procgen_editor/EditorPcgGraph.h rename to src/modules/procgen/editor/EditorPcgGraph.h index b7f374e4..cb09cde2 100644 --- a/src/modules/procgen_editor/EditorPcgGraph.h +++ b/src/modules/procgen/editor/EditorPcgGraph.h @@ -1,5 +1,5 @@ #pragma once -#include "procgen_editing/PcgGraph.h" +#include "procgen/editing/PcgGraph.h" namespace eve::editor { using PcgGraphCompileResult = procgen_editing::PcgGraphCompileResult; using PcgGraphMigrationResult = procgen_editing::PcgGraphMigrationResult; diff --git a/src/modules/procgen_editor/EditorTextureRecipeTarget.h b/src/modules/procgen/editor/EditorTextureRecipeTarget.h similarity index 86% rename from src/modules/procgen_editor/EditorTextureRecipeTarget.h rename to src/modules/procgen/editor/EditorTextureRecipeTarget.h index 4b140961..be971399 100644 --- a/src/modules/procgen_editor/EditorTextureRecipeTarget.h +++ b/src/modules/procgen/editor/EditorTextureRecipeTarget.h @@ -1,5 +1,5 @@ #pragma once -#include "procgen_editing/TextureRecipeTarget.h" +#include "procgen/editing/TextureRecipeTarget.h" namespace eve::editor { using TextureRecipeTarget = eve::procgen_editing::TextureRecipeTarget; using TextureRecipePreviewArtifact = eve::procgen_editing::TextureRecipePreviewArtifact; diff --git a/src/modules/procgen_editor/ProcgenEditorModule.h b/src/modules/procgen/editor/ProcgenEditorModule.h similarity index 100% rename from src/modules/procgen_editor/ProcgenEditorModule.h rename to src/modules/procgen/editor/ProcgenEditorModule.h diff --git a/src/modules/procgen_editor/ProcgenScriptEditor.cpp b/src/modules/procgen/editor/ProcgenScriptEditor.cpp similarity index 99% rename from src/modules/procgen_editor/ProcgenScriptEditor.cpp rename to src/modules/procgen/editor/ProcgenScriptEditor.cpp index 465550e7..433ace2c 100644 --- a/src/modules/procgen_editor/ProcgenScriptEditor.cpp +++ b/src/modules/procgen/editor/ProcgenScriptEditor.cpp @@ -1,4 +1,4 @@ -#include "procgen_editor/ProcgenScriptEditor.h" +#include "procgen/editor/ProcgenScriptEditor.h" #include "editor/EditorProtocol.h" #include "editor/EditorSelection.h" diff --git a/src/modules/procgen_editor/ProcgenScriptEditor.h b/src/modules/procgen/editor/ProcgenScriptEditor.h similarity index 99% rename from src/modules/procgen_editor/ProcgenScriptEditor.h rename to src/modules/procgen/editor/ProcgenScriptEditor.h index b59fcd54..7b0f4bcc 100644 --- a/src/modules/procgen_editor/ProcgenScriptEditor.h +++ b/src/modules/procgen/editor/ProcgenScriptEditor.h @@ -8,7 +8,7 @@ #include "editor/EditorAuthority.h" #include "editor/EditorTransactionService.h" #include "editor/EditorWorkspace.h" -#include "procgen_editing/ProcgenScriptTarget.h" +#include "procgen/editing/ProcgenScriptTarget.h" #include #include diff --git a/src/modules/procgen_editor/ProcgenScriptEditorScriptBindings.cpp b/src/modules/procgen/editor/ProcgenScriptEditorScriptBindings.cpp similarity index 98% rename from src/modules/procgen_editor/ProcgenScriptEditorScriptBindings.cpp rename to src/modules/procgen/editor/ProcgenScriptEditorScriptBindings.cpp index a52e19af..b1fd7751 100644 --- a/src/modules/procgen_editor/ProcgenScriptEditorScriptBindings.cpp +++ b/src/modules/procgen/editor/ProcgenScriptEditorScriptBindings.cpp @@ -1,12 +1,12 @@ -#include "procgen_editor/ProcgenScriptEditorScriptBindings.h" +#include "procgen/editor/ProcgenScriptEditorScriptBindings.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorProperty.h" #include "editor/EditorWorkspace.h" #include "procgen/PointSet.h" -#include "procgen_editor/ProcgenEditorModule.h" -#include "procgen_editor/ProcgenScriptEditor.h" +#include "procgen/editor/ProcgenEditorModule.h" +#include "procgen/editor/ProcgenScriptEditor.h" #include diff --git a/src/modules/procgen_editor/ProcgenScriptEditorScriptBindings.h b/src/modules/procgen/editor/ProcgenScriptEditorScriptBindings.h similarity index 100% rename from src/modules/procgen_editor/ProcgenScriptEditorScriptBindings.h rename to src/modules/procgen/editor/ProcgenScriptEditorScriptBindings.h diff --git a/src/modules/procgen_editor/procgen_editor.cpp b/src/modules/procgen/editor/procgen_editor.cpp similarity index 90% rename from src/modules/procgen_editor/procgen_editor.cpp rename to src/modules/procgen/editor/procgen_editor.cpp index 2d617a12..a7a44ebf 100644 --- a/src/modules/procgen_editor/procgen_editor.cpp +++ b/src/modules/procgen/editor/procgen_editor.cpp @@ -1,10 +1,10 @@ -#include "procgen_editor/ProcgenEditorModule.h" +#include "procgen/editor/ProcgenEditorModule.h" #include "common/Capability.h" #include "editing/EditingResult.h" #include "editor/EditorAutomationTargetFactory.h" -#include "procgen_editing/ProcgenScriptTarget.h" -#include "procgen_editor/ProcgenScriptEditorScriptBindings.h" +#include "procgen/editing/ProcgenScriptTarget.h" +#include "procgen/editor/ProcgenScriptEditorScriptBindings.h" #include diff --git a/src/modules/procgen_graphics_editing/HeightmapMesh.cpp b/src/modules/procgen/graphics_editing/HeightmapMesh.cpp similarity index 99% rename from src/modules/procgen_graphics_editing/HeightmapMesh.cpp rename to src/modules/procgen/graphics_editing/HeightmapMesh.cpp index 68f99336..b3626ba3 100644 --- a/src/modules/procgen_graphics_editing/HeightmapMesh.cpp +++ b/src/modules/procgen/graphics_editing/HeightmapMesh.cpp @@ -1,4 +1,4 @@ -#include "procgen_graphics_editing/HeightmapMesh.h" +#include "procgen/graphics_editing/HeightmapMesh.h" #include "common/Module.h" #include "graphics/Graphics.h" diff --git a/src/modules/procgen_graphics_editing/HeightmapMesh.h b/src/modules/procgen/graphics_editing/HeightmapMesh.h similarity index 100% rename from src/modules/procgen_graphics_editing/HeightmapMesh.h rename to src/modules/procgen/graphics_editing/HeightmapMesh.h diff --git a/src/modules/heightmap_target/HeightmapTargetModule.cpp b/src/modules/procgen/heightmap_target/HeightmapTargetModule.cpp similarity index 95% rename from src/modules/heightmap_target/HeightmapTargetModule.cpp rename to src/modules/procgen/heightmap_target/HeightmapTargetModule.cpp index f3036224..04e87eb2 100644 --- a/src/modules/heightmap_target/HeightmapTargetModule.cpp +++ b/src/modules/procgen/heightmap_target/HeightmapTargetModule.cpp @@ -1,9 +1,9 @@ -#include "heightmap_target/HeightmapTargetModule.h" +#include "procgen/heightmap_target/HeightmapTargetModule.h" #include "editor/EditorSession.h" -#include "procgen_editing/HeightmapBrush.h" -#include "procgen_editing/HeightmapTarget.h" -#include "procgen_graphics_editing/HeightmapMesh.h" +#include "procgen/editing/HeightmapBrush.h" +#include "procgen/editing/HeightmapTarget.h" +#include "procgen/graphics_editing/HeightmapMesh.h" #include diff --git a/src/modules/heightmap_target/HeightmapTargetModule.h b/src/modules/procgen/heightmap_target/HeightmapTargetModule.h similarity index 100% rename from src/modules/heightmap_target/HeightmapTargetModule.h rename to src/modules/procgen/heightmap_target/HeightmapTargetModule.h diff --git a/src/modules/profiler_editing/ProfilerModel.cpp b/src/modules/profiler/editing/ProfilerModel.cpp similarity index 99% rename from src/modules/profiler_editing/ProfilerModel.cpp rename to src/modules/profiler/editing/ProfilerModel.cpp index 10afccd8..90cb4b11 100644 --- a/src/modules/profiler_editing/ProfilerModel.cpp +++ b/src/modules/profiler/editing/ProfilerModel.cpp @@ -1,4 +1,4 @@ -#include "profiler_editing/ProfilerModel.h" +#include "profiler/editing/ProfilerModel.h" #include #include diff --git a/src/modules/profiler_editing/ProfilerModel.h b/src/modules/profiler/editing/ProfilerModel.h similarity index 100% rename from src/modules/profiler_editing/ProfilerModel.h rename to src/modules/profiler/editing/ProfilerModel.h diff --git a/src/modules/profiler_editing/ProfilerRuntime.cpp b/src/modules/profiler/editing/ProfilerRuntime.cpp similarity index 97% rename from src/modules/profiler_editing/ProfilerRuntime.cpp rename to src/modules/profiler/editing/ProfilerRuntime.cpp index a6e7ca28..2d56e381 100644 --- a/src/modules/profiler_editing/ProfilerRuntime.cpp +++ b/src/modules/profiler/editing/ProfilerRuntime.cpp @@ -1,4 +1,4 @@ -#include "profiler_editing/ProfilerModel.h" +#include "profiler/editing/ProfilerModel.h" #include "profiler/Profiler.h" diff --git a/src/modules/profiler_editor/EditorProfiler.h b/src/modules/profiler/editor/EditorProfiler.h similarity index 94% rename from src/modules/profiler_editor/EditorProfiler.h rename to src/modules/profiler/editor/EditorProfiler.h index 1cede599..3ea4e8ae 100644 --- a/src/modules/profiler_editor/EditorProfiler.h +++ b/src/modules/profiler/editor/EditorProfiler.h @@ -1,5 +1,5 @@ #pragma once -#include "profiler_editing/ProfilerModel.h" +#include "profiler/editing/ProfilerModel.h" namespace eve::editor { using EditorProfilerZone = eve::profiler_editing::EditorProfilerZone; using EditorProfilerFrame = eve::profiler_editing::EditorProfilerFrame; diff --git a/src/modules/profiler_editor/profiler_editor.cpp b/src/modules/profiler/editor/profiler_editor.cpp similarity index 71% rename from src/modules/profiler_editor/profiler_editor.cpp rename to src/modules/profiler/editor/profiler_editor.cpp index 098420f4..89e588de 100644 --- a/src/modules/profiler_editor/profiler_editor.cpp +++ b/src/modules/profiler/editor/profiler_editor.cpp @@ -1,4 +1,4 @@ -#include "profiler_editor/EditorProfiler.h" +#include "profiler/editor/EditorProfiler.h" namespace eve::editor { namespace { diff --git a/src/modules/scene_editing/SceneComponentPayload.cpp b/src/modules/scene/editing/SceneComponentPayload.cpp similarity index 99% rename from src/modules/scene_editing/SceneComponentPayload.cpp rename to src/modules/scene/editing/SceneComponentPayload.cpp index 822e5306..1bdbda2a 100644 --- a/src/modules/scene_editing/SceneComponentPayload.cpp +++ b/src/modules/scene/editing/SceneComponentPayload.cpp @@ -1,4 +1,4 @@ -#include "scene_editing/SceneComponentPayload.h" +#include "scene/editing/SceneComponentPayload.h" #include diff --git a/src/modules/scene_editing/SceneComponentPayload.h b/src/modules/scene/editing/SceneComponentPayload.h similarity index 99% rename from src/modules/scene_editing/SceneComponentPayload.h rename to src/modules/scene/editing/SceneComponentPayload.h index 88e4731d..972d1713 100644 --- a/src/modules/scene_editing/SceneComponentPayload.h +++ b/src/modules/scene/editing/SceneComponentPayload.h @@ -1,6 +1,6 @@ #pragma once -#include "scene_editing/SceneEditingTypes.h" +#include "scene/editing/SceneEditingTypes.h" #include #include diff --git a/src/modules/scene_editing/SceneEditingCommands.cpp b/src/modules/scene/editing/SceneEditingCommands.cpp similarity index 98% rename from src/modules/scene_editing/SceneEditingCommands.cpp rename to src/modules/scene/editing/SceneEditingCommands.cpp index 0a348296..67a59bf7 100644 --- a/src/modules/scene_editing/SceneEditingCommands.cpp +++ b/src/modules/scene/editing/SceneEditingCommands.cpp @@ -1,4 +1,4 @@ -#include "scene_editing/SceneEditingCommands.h" +#include "scene/editing/SceneEditingCommands.h" #include diff --git a/src/modules/scene_editing/SceneEditingCommands.h b/src/modules/scene/editing/SceneEditingCommands.h similarity index 100% rename from src/modules/scene_editing/SceneEditingCommands.h rename to src/modules/scene/editing/SceneEditingCommands.h diff --git a/src/modules/scene_editing/SceneEditingTypes.h b/src/modules/scene/editing/SceneEditingTypes.h similarity index 100% rename from src/modules/scene_editing/SceneEditingTypes.h rename to src/modules/scene/editing/SceneEditingTypes.h diff --git a/src/modules/scene_editing/SceneRuntime.cpp b/src/modules/scene/editing/SceneRuntime.cpp similarity index 99% rename from src/modules/scene_editing/SceneRuntime.cpp rename to src/modules/scene/editing/SceneRuntime.cpp index 4f23c674..a9913357 100644 --- a/src/modules/scene_editing/SceneRuntime.cpp +++ b/src/modules/scene/editing/SceneRuntime.cpp @@ -1,4 +1,4 @@ -#include "scene_editing/SceneTarget.h" +#include "scene/editing/SceneTarget.h" #include "scene/SceneHost.h" diff --git a/src/modules/scene_editing/SceneTarget.cpp b/src/modules/scene/editing/SceneTarget.cpp similarity index 99% rename from src/modules/scene_editing/SceneTarget.cpp rename to src/modules/scene/editing/SceneTarget.cpp index 815855b9..848acc84 100644 --- a/src/modules/scene_editing/SceneTarget.cpp +++ b/src/modules/scene/editing/SceneTarget.cpp @@ -1,6 +1,6 @@ -#include "scene_editing/SceneTarget.h" +#include "scene/editing/SceneTarget.h" -#include "scene_editing/SceneComponentPayload.h" +#include "scene/editing/SceneComponentPayload.h" #include diff --git a/src/modules/scene_editing/SceneTarget.h b/src/modules/scene/editing/SceneTarget.h similarity index 99% rename from src/modules/scene_editing/SceneTarget.h rename to src/modules/scene/editing/SceneTarget.h index db700076..55ec6929 100644 --- a/src/modules/scene_editing/SceneTarget.h +++ b/src/modules/scene/editing/SceneTarget.h @@ -1,7 +1,7 @@ #pragma once -#include "scene_editing/SceneEditingTypes.h" -#include "scene_editing/SceneEditingCommands.h" +#include "scene/editing/SceneEditingTypes.h" +#include "scene/editing/SceneEditingCommands.h" #include #include diff --git a/src/modules/scene_editor/EditorPrefab.cpp b/src/modules/scene/editor/EditorPrefab.cpp similarity index 99% rename from src/modules/scene_editor/EditorPrefab.cpp rename to src/modules/scene/editor/EditorPrefab.cpp index ecf2e1bd..1bacb92e 100644 --- a/src/modules/scene_editor/EditorPrefab.cpp +++ b/src/modules/scene/editor/EditorPrefab.cpp @@ -1,4 +1,4 @@ -#include "scene_editor/EditorPrefab.h" +#include "scene/editor/EditorPrefab.h" #include #include diff --git a/src/modules/scene_editor/EditorPrefab.h b/src/modules/scene/editor/EditorPrefab.h similarity index 98% rename from src/modules/scene_editor/EditorPrefab.h rename to src/modules/scene/editor/EditorPrefab.h index e002826b..3e15b542 100644 --- a/src/modules/scene_editor/EditorPrefab.h +++ b/src/modules/scene/editor/EditorPrefab.h @@ -1,6 +1,6 @@ #pragma once -#include "scene_editor/EditorSceneTarget.h" +#include "scene/editor/EditorSceneTarget.h" #include #include diff --git a/src/modules/scene_editor/EditorSceneComponentPayload.h b/src/modules/scene/editor/EditorSceneComponentPayload.h similarity index 94% rename from src/modules/scene_editor/EditorSceneComponentPayload.h rename to src/modules/scene/editor/EditorSceneComponentPayload.h index 1944f1ef..b61040ac 100644 --- a/src/modules/scene_editor/EditorSceneComponentPayload.h +++ b/src/modules/scene/editor/EditorSceneComponentPayload.h @@ -3,7 +3,7 @@ /** @file @brief Compatibility include for scene component payload authoring. */ #include "editor/EditorAuthority.h" #include "editor/EditorProperty.h" -#include "scene_editing/SceneComponentPayload.h" +#include "scene/editing/SceneComponentPayload.h" namespace eve::editor { using SceneComponentChange = scene_editing::SceneComponentChange; diff --git a/src/modules/scene_editor/EditorSceneTarget.h b/src/modules/scene/editor/EditorSceneTarget.h similarity index 97% rename from src/modules/scene_editor/EditorSceneTarget.h rename to src/modules/scene/editor/EditorSceneTarget.h index 3a3a64f4..30d4e791 100644 --- a/src/modules/scene_editor/EditorSceneTarget.h +++ b/src/modules/scene/editor/EditorSceneTarget.h @@ -3,7 +3,7 @@ /** @file @brief Compatibility include for canonical scene editing targets. */ #include "editor/EditorAuthority.h" #include "editor/EditorProperty.h" -#include "scene_editing/SceneTarget.h" +#include "scene/editing/SceneTarget.h" namespace eve::editor { using SceneTransformValue = scene_editing::SceneTransformValue; diff --git a/src/modules/scene_editor/SceneEditorModule.cpp b/src/modules/scene/editor/SceneEditorModule.cpp similarity index 97% rename from src/modules/scene_editor/SceneEditorModule.cpp rename to src/modules/scene/editor/SceneEditorModule.cpp index 0a815418..9f1b7b35 100644 --- a/src/modules/scene_editor/SceneEditorModule.cpp +++ b/src/modules/scene/editor/SceneEditorModule.cpp @@ -1,10 +1,10 @@ -#include "scene_editor/SceneEditorModule.h" +#include "scene/editor/SceneEditorModule.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" -#include "scene_editing/SceneEditingCommands.h" -#include "scene_editing/SceneTarget.h" +#include "scene/editing/SceneEditingCommands.h" +#include "scene/editing/SceneTarget.h" #include "scene/Scene.h" #include diff --git a/src/modules/scene_editor/SceneEditorModule.h b/src/modules/scene/editor/SceneEditorModule.h similarity index 100% rename from src/modules/scene_editor/SceneEditorModule.h rename to src/modules/scene/editor/SceneEditorModule.h diff --git a/src/modules/sceneloader/SceneLoader.cpp b/src/modules/scene/loader/SceneLoader.cpp similarity index 99% rename from src/modules/sceneloader/SceneLoader.cpp rename to src/modules/scene/loader/SceneLoader.cpp index 07ca25e3..77e196f3 100644 --- a/src/modules/sceneloader/SceneLoader.cpp +++ b/src/modules/scene/loader/SceneLoader.cpp @@ -1,4 +1,4 @@ -#include "sceneloader/SceneLoader.h" +#include "scene/loader/SceneLoader.h" #include "animation/AnimClip.h" #include "animation/AnimImporter.h" diff --git a/src/modules/sceneloader/SceneLoader.h b/src/modules/scene/loader/SceneLoader.h similarity index 100% rename from src/modules/sceneloader/SceneLoader.h rename to src/modules/scene/loader/SceneLoader.h diff --git a/src/modules/sceneloader_editing/SceneImportRuntime.cpp b/src/modules/scene/loader/editing/SceneImportRuntime.cpp similarity index 96% rename from src/modules/sceneloader_editing/SceneImportRuntime.cpp rename to src/modules/scene/loader/editing/SceneImportRuntime.cpp index 4de5d055..041c16d6 100644 --- a/src/modules/sceneloader_editing/SceneImportRuntime.cpp +++ b/src/modules/scene/loader/editing/SceneImportRuntime.cpp @@ -1,6 +1,6 @@ #include -#include "sceneloader/SceneLoader.h" -#include "sceneloader_editing/SceneImportTarget.h" +#include "scene/loader/SceneLoader.h" +#include "scene/loader/editing/SceneImportTarget.h" namespace eve::sceneloader_editing { namespace { template diff --git a/src/modules/sceneloader_editing/SceneImportTarget.cpp b/src/modules/scene/loader/editing/SceneImportTarget.cpp similarity index 99% rename from src/modules/sceneloader_editing/SceneImportTarget.cpp rename to src/modules/scene/loader/editing/SceneImportTarget.cpp index 1a515b42..d7d15fc3 100644 --- a/src/modules/sceneloader_editing/SceneImportTarget.cpp +++ b/src/modules/scene/loader/editing/SceneImportTarget.cpp @@ -1,4 +1,4 @@ -#include "sceneloader_editing/SceneImportTarget.h" +#include "scene/loader/editing/SceneImportTarget.h" #include #include namespace eve::sceneloader_editing { diff --git a/src/modules/sceneloader_editing/SceneImportTarget.h b/src/modules/scene/loader/editing/SceneImportTarget.h similarity index 100% rename from src/modules/sceneloader_editing/SceneImportTarget.h rename to src/modules/scene/loader/editing/SceneImportTarget.h diff --git a/src/modules/sceneloader_editor/EditorSceneImportTarget.h b/src/modules/scene/loader/editor/EditorSceneImportTarget.h similarity index 87% rename from src/modules/sceneloader_editor/EditorSceneImportTarget.h rename to src/modules/scene/loader/editor/EditorSceneImportTarget.h index a3253c23..da2648cd 100644 --- a/src/modules/sceneloader_editor/EditorSceneImportTarget.h +++ b/src/modules/scene/loader/editor/EditorSceneImportTarget.h @@ -1,5 +1,5 @@ #pragma once -#include "sceneloader_editing/SceneImportTarget.h" +#include "scene/loader/editing/SceneImportTarget.h" namespace eve::editor { using SceneImportValue = eve::sceneloader_editing::SceneImportValue; using SceneImportTarget = eve::sceneloader_editing::SceneImportTarget; diff --git a/src/modules/sceneloader_editor/sceneloader_editor.cpp b/src/modules/scene/loader/editor/sceneloader_editor.cpp similarity index 67% rename from src/modules/sceneloader_editor/sceneloader_editor.cpp rename to src/modules/scene/loader/editor/sceneloader_editor.cpp index 934350a1..dbe4f601 100644 --- a/src/modules/sceneloader_editor/sceneloader_editor.cpp +++ b/src/modules/scene/loader/editor/sceneloader_editor.cpp @@ -1,4 +1,4 @@ -#include "sceneloader_editor/EditorSceneImportTarget.h" +#include "scene/loader/editor/EditorSceneImportTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/snow_editing/SnowFieldTarget.cpp b/src/modules/snow/editing/SnowFieldTarget.cpp similarity index 97% rename from src/modules/snow_editing/SnowFieldTarget.cpp rename to src/modules/snow/editing/SnowFieldTarget.cpp index 5f65e26d..067cbed2 100644 --- a/src/modules/snow_editing/SnowFieldTarget.cpp +++ b/src/modules/snow/editing/SnowFieldTarget.cpp @@ -1,4 +1,4 @@ -#include "snow_editing/SnowFieldTarget.h" +#include "snow/editing/SnowFieldTarget.h" #include "snow/SnowField.h" diff --git a/src/modules/snow_editing/SnowFieldTarget.h b/src/modules/snow/editing/SnowFieldTarget.h similarity index 100% rename from src/modules/snow_editing/SnowFieldTarget.h rename to src/modules/snow/editing/SnowFieldTarget.h diff --git a/src/modules/snow_editor/SnowFieldTarget.h b/src/modules/snow/editor/SnowFieldTarget.h similarity index 83% rename from src/modules/snow_editor/SnowFieldTarget.h rename to src/modules/snow/editor/SnowFieldTarget.h index c7f8f956..d04bf7f4 100644 --- a/src/modules/snow_editor/SnowFieldTarget.h +++ b/src/modules/snow/editor/SnowFieldTarget.h @@ -1,6 +1,6 @@ #pragma once -#include "snow_editing/SnowFieldTarget.h" +#include "snow/editing/SnowFieldTarget.h" namespace eve::editor { diff --git a/src/modules/snow_editor/snow_editor.cpp b/src/modules/snow/editor/snow_editor.cpp similarity index 72% rename from src/modules/snow_editor/snow_editor.cpp rename to src/modules/snow/editor/snow_editor.cpp index 0cfff1d4..2b986ef6 100644 --- a/src/modules/snow_editor/snow_editor.cpp +++ b/src/modules/snow/editor/snow_editor.cpp @@ -1,4 +1,4 @@ -#include "snow_editor/SnowFieldTarget.h" +#include "snow/editor/SnowFieldTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/social_editing/SocialDocument.cpp b/src/modules/social/editing/SocialDocument.cpp similarity index 99% rename from src/modules/social_editing/SocialDocument.cpp rename to src/modules/social/editing/SocialDocument.cpp index 826afb2b..fcd2ab35 100644 --- a/src/modules/social_editing/SocialDocument.cpp +++ b/src/modules/social/editing/SocialDocument.cpp @@ -1,4 +1,4 @@ -#include "social_editing/SocialDocument.h" +#include "social/editing/SocialDocument.h" #include #include diff --git a/src/modules/social_editing/SocialDocument.h b/src/modules/social/editing/SocialDocument.h similarity index 100% rename from src/modules/social_editing/SocialDocument.h rename to src/modules/social/editing/SocialDocument.h diff --git a/src/modules/social_editing/SocialRuntime.cpp b/src/modules/social/editing/SocialRuntime.cpp similarity index 97% rename from src/modules/social_editing/SocialRuntime.cpp rename to src/modules/social/editing/SocialRuntime.cpp index b95f52bb..0b5b3923 100644 --- a/src/modules/social_editing/SocialRuntime.cpp +++ b/src/modules/social/editing/SocialRuntime.cpp @@ -1,5 +1,5 @@ #include "social/SocialGraph.h" -#include "social_editing/SocialDocument.h" +#include "social/editing/SocialDocument.h" namespace eve::social_editing { EditorResult SocialRuntimeApplier::apply(const SocialDocumentTarget& document, diff --git a/src/modules/social_editor/EditorSocialDocument.h b/src/modules/social/editor/EditorSocialDocument.h similarity index 87% rename from src/modules/social_editor/EditorSocialDocument.h rename to src/modules/social/editor/EditorSocialDocument.h index fb301d28..602a201c 100644 --- a/src/modules/social_editor/EditorSocialDocument.h +++ b/src/modules/social/editor/EditorSocialDocument.h @@ -1,5 +1,5 @@ #pragma once -#include "social_editing/SocialDocument.h" +#include "social/editing/SocialDocument.h" namespace eve::editor { using SocialEntityRecord=eve::social_editing::SocialEntityRecord; using SocialEdgeRecord=eve::social_editing::SocialEdgeRecord; diff --git a/src/modules/social_editor/social_editor.cpp b/src/modules/social/editor/social_editor.cpp similarity index 69% rename from src/modules/social_editor/social_editor.cpp rename to src/modules/social/editor/social_editor.cpp index b3011e28..9480e431 100644 --- a/src/modules/social_editor/social_editor.cpp +++ b/src/modules/social/editor/social_editor.cpp @@ -1,4 +1,4 @@ -#include "social_editor/EditorSocialDocument.h" +#include "social/editor/EditorSocialDocument.h" namespace eve::editor { namespace { diff --git a/src/modules/spritestack_editing/SpriteStackRuntime.cpp b/src/modules/spritestack/editing/SpriteStackRuntime.cpp similarity index 99% rename from src/modules/spritestack_editing/SpriteStackRuntime.cpp rename to src/modules/spritestack/editing/SpriteStackRuntime.cpp index 37d85e44..6423267d 100644 --- a/src/modules/spritestack_editing/SpriteStackRuntime.cpp +++ b/src/modules/spritestack/editing/SpriteStackRuntime.cpp @@ -1,4 +1,4 @@ -#include "spritestack_editing/SpriteStackTarget.h" +#include "spritestack/editing/SpriteStackTarget.h" #include "graphics/Graphics.h" #include "image/ImageData.h" diff --git a/src/modules/spritestack_editing/SpriteStackTarget.cpp b/src/modules/spritestack/editing/SpriteStackTarget.cpp similarity index 99% rename from src/modules/spritestack_editing/SpriteStackTarget.cpp rename to src/modules/spritestack/editing/SpriteStackTarget.cpp index ded0f705..f864c926 100644 --- a/src/modules/spritestack_editing/SpriteStackTarget.cpp +++ b/src/modules/spritestack/editing/SpriteStackTarget.cpp @@ -1,4 +1,4 @@ -#include "spritestack_editing/SpriteStackTarget.h" +#include "spritestack/editing/SpriteStackTarget.h" #include #include diff --git a/src/modules/spritestack_editing/SpriteStackTarget.h b/src/modules/spritestack/editing/SpriteStackTarget.h similarity index 100% rename from src/modules/spritestack_editing/SpriteStackTarget.h rename to src/modules/spritestack/editing/SpriteStackTarget.h diff --git a/src/modules/spritestack_editor/EditorSpriteStackTarget.h b/src/modules/spritestack/editor/EditorSpriteStackTarget.h similarity index 91% rename from src/modules/spritestack_editor/EditorSpriteStackTarget.h rename to src/modules/spritestack/editor/EditorSpriteStackTarget.h index 3735134b..4ba466ff 100644 --- a/src/modules/spritestack_editor/EditorSpriteStackTarget.h +++ b/src/modules/spritestack/editor/EditorSpriteStackTarget.h @@ -1,7 +1,7 @@ #pragma once #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "spritestack_editing/SpriteStackTarget.h" +#include "spritestack/editing/SpriteStackTarget.h" namespace eve::editor { using SpriteStackAssetValue=spritestack_editing::SpriteStackAssetValue; using SpriteStackDocumentTarget=spritestack_editing::SpriteStackDocumentTarget; diff --git a/src/modules/spritestack_editor/spritestack_editor.cpp b/src/modules/spritestack/editor/spritestack_editor.cpp similarity index 67% rename from src/modules/spritestack_editor/spritestack_editor.cpp rename to src/modules/spritestack/editor/spritestack_editor.cpp index 91468ab9..4c782c57 100644 --- a/src/modules/spritestack_editor/spritestack_editor.cpp +++ b/src/modules/spritestack/editor/spritestack_editor.cpp @@ -1,4 +1,4 @@ -#include "spritestack_editor/EditorSpriteStackTarget.h" +#include "spritestack/editor/EditorSpriteStackTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/stylize_editing/StylizeRuntime.cpp b/src/modules/stylize/editing/StylizeRuntime.cpp similarity index 98% rename from src/modules/stylize_editing/StylizeRuntime.cpp rename to src/modules/stylize/editing/StylizeRuntime.cpp index cacabc9a..d981051f 100644 --- a/src/modules/stylize_editing/StylizeRuntime.cpp +++ b/src/modules/stylize/editing/StylizeRuntime.cpp @@ -1,4 +1,4 @@ -#include "stylize_editing/StylizeTarget.h" +#include "stylize/editing/StylizeTarget.h" #include "common/Exception.h" #include "graphics/Canvas.h" diff --git a/src/modules/stylize_editing/StylizeTarget.cpp b/src/modules/stylize/editing/StylizeTarget.cpp similarity index 99% rename from src/modules/stylize_editing/StylizeTarget.cpp rename to src/modules/stylize/editing/StylizeTarget.cpp index e0b172d9..584d37d9 100644 --- a/src/modules/stylize_editing/StylizeTarget.cpp +++ b/src/modules/stylize/editing/StylizeTarget.cpp @@ -1,4 +1,4 @@ -#include "stylize_editing/StylizeTarget.h" +#include "stylize/editing/StylizeTarget.h" #include "stylize/StyleShaders.h" diff --git a/src/modules/stylize_editing/StylizeTarget.h b/src/modules/stylize/editing/StylizeTarget.h similarity index 100% rename from src/modules/stylize_editing/StylizeTarget.h rename to src/modules/stylize/editing/StylizeTarget.h diff --git a/src/modules/stylize_editor/EditorStylizeOffscreen.cpp b/src/modules/stylize/editor/EditorStylizeOffscreen.cpp similarity index 95% rename from src/modules/stylize_editor/EditorStylizeOffscreen.cpp rename to src/modules/stylize/editor/EditorStylizeOffscreen.cpp index ecd26140..fd844bf5 100644 --- a/src/modules/stylize_editor/EditorStylizeOffscreen.cpp +++ b/src/modules/stylize/editor/EditorStylizeOffscreen.cpp @@ -1,4 +1,4 @@ -#include "stylize_editor/EditorStylizeTarget.h" +#include "stylize/editor/EditorStylizeTarget.h" #include diff --git a/src/modules/stylize_editor/EditorStylizeTarget.h b/src/modules/stylize/editor/EditorStylizeTarget.h similarity index 91% rename from src/modules/stylize_editor/EditorStylizeTarget.h rename to src/modules/stylize/editor/EditorStylizeTarget.h index 2c8def2f..0e4a6f08 100644 --- a/src/modules/stylize_editor/EditorStylizeTarget.h +++ b/src/modules/stylize/editor/EditorStylizeTarget.h @@ -1,8 +1,8 @@ #pragma once #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "graphics_editor/EditorOffscreenPreview.h" -#include "stylize_editing/StylizeTarget.h" +#include "graphics/editor/EditorOffscreenPreview.h" +#include "stylize/editing/StylizeTarget.h" namespace eve::editor { diff --git a/src/modules/ui_editing/UiDocument.cpp b/src/modules/ui/editing/UiDocument.cpp similarity index 99% rename from src/modules/ui_editing/UiDocument.cpp rename to src/modules/ui/editing/UiDocument.cpp index a47cfdea..46f06e8a 100644 --- a/src/modules/ui_editing/UiDocument.cpp +++ b/src/modules/ui/editing/UiDocument.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include #include diff --git a/src/modules/ui_editing/UiDocument.h b/src/modules/ui/editing/UiDocument.h similarity index 100% rename from src/modules/ui_editing/UiDocument.h rename to src/modules/ui/editing/UiDocument.h diff --git a/src/modules/ui_editing/UiDocumentProperty.cpp b/src/modules/ui/editing/UiDocumentProperty.cpp similarity index 99% rename from src/modules/ui_editing/UiDocumentProperty.cpp rename to src/modules/ui/editing/UiDocumentProperty.cpp index 612fae86..5ade582c 100644 --- a/src/modules/ui_editing/UiDocumentProperty.cpp +++ b/src/modules/ui/editing/UiDocumentProperty.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include #include diff --git a/src/modules/ui_editing/UiDocumentSerialization.cpp b/src/modules/ui/editing/UiDocumentSerialization.cpp similarity index 99% rename from src/modules/ui_editing/UiDocumentSerialization.cpp rename to src/modules/ui/editing/UiDocumentSerialization.cpp index 4870ec56..421e5501 100644 --- a/src/modules/ui_editing/UiDocumentSerialization.cpp +++ b/src/modules/ui/editing/UiDocumentSerialization.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include #include diff --git a/src/modules/ui_editing/UiPreview.cpp b/src/modules/ui/editing/UiPreview.cpp similarity index 99% rename from src/modules/ui_editing/UiPreview.cpp rename to src/modules/ui/editing/UiPreview.cpp index 5ee8e446..dcb647fc 100644 --- a/src/modules/ui_editing/UiPreview.cpp +++ b/src/modules/ui/editing/UiPreview.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include #include diff --git a/src/modules/ui_editing/UiRuntime.cpp b/src/modules/ui/editing/UiRuntime.cpp similarity index 99% rename from src/modules/ui_editing/UiRuntime.cpp rename to src/modules/ui/editing/UiRuntime.cpp index 6a89ff28..02e84a25 100644 --- a/src/modules/ui_editing/UiRuntime.cpp +++ b/src/modules/ui/editing/UiRuntime.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include "ui/UIHost.h" #include "ui/Widget.h" diff --git a/src/modules/ui_editing/UiTheme.cpp b/src/modules/ui/editing/UiTheme.cpp similarity index 99% rename from src/modules/ui_editing/UiTheme.cpp rename to src/modules/ui/editing/UiTheme.cpp index 201e2df6..2f7dedcc 100644 --- a/src/modules/ui_editing/UiTheme.cpp +++ b/src/modules/ui/editing/UiTheme.cpp @@ -1,5 +1,5 @@ -#include "ui_editing/UiTheme.h" -#include "ui_editing/UiThemeTokens.h" +#include "ui/editing/UiTheme.h" +#include "ui/editing/UiThemeTokens.h" #include #include diff --git a/src/modules/ui_editing/UiTheme.h b/src/modules/ui/editing/UiTheme.h similarity index 100% rename from src/modules/ui_editing/UiTheme.h rename to src/modules/ui/editing/UiTheme.h diff --git a/src/modules/ui_editing/UiThemePreview.cpp b/src/modules/ui/editing/UiThemePreview.cpp similarity index 96% rename from src/modules/ui_editing/UiThemePreview.cpp rename to src/modules/ui/editing/UiThemePreview.cpp index cd52dce6..f03998d3 100644 --- a/src/modules/ui_editing/UiThemePreview.cpp +++ b/src/modules/ui/editing/UiThemePreview.cpp @@ -1,5 +1,5 @@ -#include "ui_editing/UiTheme.h" -#include "ui_editing/UiThemeTokens.h" +#include "ui/editing/UiTheme.h" +#include "ui/editing/UiThemeTokens.h" #include "ui/Theme.h" diff --git a/src/modules/ui_editing/UiThemeProperty.cpp b/src/modules/ui/editing/UiThemeProperty.cpp similarity index 98% rename from src/modules/ui_editing/UiThemeProperty.cpp rename to src/modules/ui/editing/UiThemeProperty.cpp index f4af1d5f..100c7359 100644 --- a/src/modules/ui_editing/UiThemeProperty.cpp +++ b/src/modules/ui/editing/UiThemeProperty.cpp @@ -1,5 +1,5 @@ -#include "ui_editing/UiTheme.h" -#include "ui_editing/UiThemeTokens.h" +#include "ui/editing/UiTheme.h" +#include "ui/editing/UiThemeTokens.h" #include #include diff --git a/src/modules/ui_editing/UiThemeTokens.cpp b/src/modules/ui/editing/UiThemeTokens.cpp similarity index 99% rename from src/modules/ui_editing/UiThemeTokens.cpp rename to src/modules/ui/editing/UiThemeTokens.cpp index 6b6e43c2..2eaed1db 100644 --- a/src/modules/ui_editing/UiThemeTokens.cpp +++ b/src/modules/ui/editing/UiThemeTokens.cpp @@ -1,4 +1,4 @@ -#include "ui_editing/UiThemeTokens.h" +#include "ui/editing/UiThemeTokens.h" #include #include diff --git a/src/modules/ui_editing/UiThemeTokens.h b/src/modules/ui/editing/UiThemeTokens.h similarity index 96% rename from src/modules/ui_editing/UiThemeTokens.h rename to src/modules/ui/editing/UiThemeTokens.h index e72c00a1..e5325d96 100644 --- a/src/modules/ui_editing/UiThemeTokens.h +++ b/src/modules/ui/editing/UiThemeTokens.h @@ -1,6 +1,6 @@ #pragma once -#include "ui_editing/UiTheme.h" +#include "ui/editing/UiTheme.h" namespace eve::ui_editing { diff --git a/src/modules/ui_editor/EditorUiDocumentTarget.h b/src/modules/ui/editor/EditorUiDocumentTarget.h similarity index 95% rename from src/modules/ui_editor/EditorUiDocumentTarget.h rename to src/modules/ui/editor/EditorUiDocumentTarget.h index 381dd075..db7bc134 100644 --- a/src/modules/ui_editor/EditorUiDocumentTarget.h +++ b/src/modules/ui/editor/EditorUiDocumentTarget.h @@ -1,7 +1,7 @@ #pragma once #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" namespace eve::editor { using UiLayoutValue = ui_editing::UiLayoutValue; using UiStyleValue = ui_editing::UiStyleValue; diff --git a/src/modules/ui_editor/EditorUiOffscreen.cpp b/src/modules/ui/editor/EditorUiOffscreen.cpp similarity index 98% rename from src/modules/ui_editor/EditorUiOffscreen.cpp rename to src/modules/ui/editor/EditorUiOffscreen.cpp index 7d6d9695..aa4c45fa 100644 --- a/src/modules/ui_editor/EditorUiOffscreen.cpp +++ b/src/modules/ui/editor/EditorUiOffscreen.cpp @@ -1,4 +1,4 @@ -#include "ui_editor/EditorUiOffscreen.h" +#include "ui/editor/EditorUiOffscreen.h" #include "graphics/ISolidRectRenderer.h" diff --git a/src/modules/ui_editor/EditorUiOffscreen.h b/src/modules/ui/editor/EditorUiOffscreen.h similarity index 88% rename from src/modules/ui_editor/EditorUiOffscreen.h rename to src/modules/ui/editor/EditorUiOffscreen.h index 3fdf69f0..992403ad 100644 --- a/src/modules/ui_editor/EditorUiOffscreen.h +++ b/src/modules/ui/editor/EditorUiOffscreen.h @@ -1,8 +1,8 @@ #pragma once -#include "graphics_editor/EditorOffscreenPreview.h" -#include "ui_editor/EditorUiDocumentTarget.h" -#include "ui_editor/EditorUiSkinPreview.h" +#include "graphics/editor/EditorOffscreenPreview.h" +#include "ui/editor/EditorUiDocumentTarget.h" +#include "ui/editor/EditorUiSkinPreview.h" namespace eve::graphics { class ISolidRectRenderer; } diff --git a/src/modules/ui_editor/EditorUiSkinPreview.cpp b/src/modules/ui/editor/EditorUiSkinPreview.cpp similarity index 99% rename from src/modules/ui_editor/EditorUiSkinPreview.cpp rename to src/modules/ui/editor/EditorUiSkinPreview.cpp index 287f3cc4..64c6f01d 100644 --- a/src/modules/ui_editor/EditorUiSkinPreview.cpp +++ b/src/modules/ui/editor/EditorUiSkinPreview.cpp @@ -1,4 +1,4 @@ -#include "ui_editor/EditorUiSkinPreview.h" +#include "ui/editor/EditorUiSkinPreview.h" #include #include diff --git a/src/modules/ui_editor/EditorUiSkinPreview.h b/src/modules/ui/editor/EditorUiSkinPreview.h similarity index 97% rename from src/modules/ui_editor/EditorUiSkinPreview.h rename to src/modules/ui/editor/EditorUiSkinPreview.h index a96c1589..173b14a8 100644 --- a/src/modules/ui_editor/EditorUiSkinPreview.h +++ b/src/modules/ui/editor/EditorUiSkinPreview.h @@ -1,6 +1,6 @@ #pragma once -#include "ui_editor/EditorUiDocumentTarget.h" +#include "ui/editor/EditorUiDocumentTarget.h" #include diff --git a/src/modules/ui_editor/EditorUiThemeTarget.h b/src/modules/ui/editor/EditorUiThemeTarget.h similarity index 94% rename from src/modules/ui_editor/EditorUiThemeTarget.h rename to src/modules/ui/editor/EditorUiThemeTarget.h index 1e1d9edf..c040104d 100644 --- a/src/modules/ui_editor/EditorUiThemeTarget.h +++ b/src/modules/ui/editor/EditorUiThemeTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "ui_editing/UiTheme.h" +#include "ui/editing/UiTheme.h" namespace eve::editor { using UiThemeBasePreset = ui_editing::UiThemeBasePreset; diff --git a/src/modules/ui_editor/UiEditorModule.cpp b/src/modules/ui/editor/UiEditorModule.cpp similarity index 82% rename from src/modules/ui_editor/UiEditorModule.cpp rename to src/modules/ui/editor/UiEditorModule.cpp index 3159ce64..fcddcd7b 100644 --- a/src/modules/ui_editor/UiEditorModule.cpp +++ b/src/modules/ui/editor/UiEditorModule.cpp @@ -1,5 +1,5 @@ -#include "ui_editor/UiEditorModule.h" -#include "ui_editor/UiThemeEditorScriptBindings.h" +#include "ui/editor/UiEditorModule.h" +#include "ui/editor/UiThemeEditorScriptBindings.h" #include diff --git a/src/modules/ui_editor/UiEditorModule.h b/src/modules/ui/editor/UiEditorModule.h similarity index 100% rename from src/modules/ui_editor/UiEditorModule.h rename to src/modules/ui/editor/UiEditorModule.h diff --git a/src/modules/ui_editor/UiThemeEditor.cpp b/src/modules/ui/editor/UiThemeEditor.cpp similarity index 99% rename from src/modules/ui_editor/UiThemeEditor.cpp rename to src/modules/ui/editor/UiThemeEditor.cpp index 8b89f50c..d12d2afb 100644 --- a/src/modules/ui_editor/UiThemeEditor.cpp +++ b/src/modules/ui/editor/UiThemeEditor.cpp @@ -1,4 +1,4 @@ -#include "ui_editor/UiThemeEditor.h" +#include "ui/editor/UiThemeEditor.h" #include "ui/UIHost.h" #include "ui/UISystem.h" diff --git a/src/modules/ui_editor/UiThemeEditor.h b/src/modules/ui/editor/UiThemeEditor.h similarity index 99% rename from src/modules/ui_editor/UiThemeEditor.h rename to src/modules/ui/editor/UiThemeEditor.h index 79bbcfae..0782bb4d 100644 --- a/src/modules/ui_editor/UiThemeEditor.h +++ b/src/modules/ui/editor/UiThemeEditor.h @@ -9,7 +9,7 @@ #include "editor/EditorSelection.h" #include "editor/EditorTransactionService.h" #include "editor/EditorWorkspace.h" -#include "ui_editing/UiTheme.h" +#include "ui/editing/UiTheme.h" #include #include diff --git a/src/modules/ui_editor/UiThemeEditorScriptBindings.cpp b/src/modules/ui/editor/UiThemeEditorScriptBindings.cpp similarity index 98% rename from src/modules/ui_editor/UiThemeEditorScriptBindings.cpp rename to src/modules/ui/editor/UiThemeEditorScriptBindings.cpp index 07179431..64e05b24 100644 --- a/src/modules/ui_editor/UiThemeEditorScriptBindings.cpp +++ b/src/modules/ui/editor/UiThemeEditorScriptBindings.cpp @@ -1,7 +1,7 @@ -#include "ui_editor/UiThemeEditorScriptBindings.h" +#include "ui/editor/UiThemeEditorScriptBindings.h" -#include "ui_editor/UiEditorModule.h" -#include "ui_editor/UiThemeEditor.h" +#include "ui/editor/UiEditorModule.h" +#include "ui/editor/UiThemeEditor.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" diff --git a/src/modules/ui_editor/UiThemeEditorScriptBindings.h b/src/modules/ui/editor/UiThemeEditorScriptBindings.h similarity index 100% rename from src/modules/ui_editor/UiThemeEditorScriptBindings.h rename to src/modules/ui/editor/UiThemeEditorScriptBindings.h diff --git a/src/modules/virtualgeometry_editing/VirtualGeometryRuntime.cpp b/src/modules/virtualgeometry/editing/VirtualGeometryRuntime.cpp similarity index 99% rename from src/modules/virtualgeometry_editing/VirtualGeometryRuntime.cpp rename to src/modules/virtualgeometry/editing/VirtualGeometryRuntime.cpp index aa6c4d5b..9cc5a662 100644 --- a/src/modules/virtualgeometry_editing/VirtualGeometryRuntime.cpp +++ b/src/modules/virtualgeometry/editing/VirtualGeometryRuntime.cpp @@ -1,4 +1,4 @@ -#include "virtualgeometry_editing/VirtualGeometryTarget.h" +#include "virtualgeometry/editing/VirtualGeometryTarget.h" #include "virtualgeometry/LodSelection.h" #include "virtualgeometry/VirtualGeometryAsset.h" diff --git a/src/modules/virtualgeometry_editing/VirtualGeometryTarget.cpp b/src/modules/virtualgeometry/editing/VirtualGeometryTarget.cpp similarity index 99% rename from src/modules/virtualgeometry_editing/VirtualGeometryTarget.cpp rename to src/modules/virtualgeometry/editing/VirtualGeometryTarget.cpp index cd2fbfa2..8630742f 100644 --- a/src/modules/virtualgeometry_editing/VirtualGeometryTarget.cpp +++ b/src/modules/virtualgeometry/editing/VirtualGeometryTarget.cpp @@ -1,4 +1,4 @@ -#include "virtualgeometry_editing/VirtualGeometryTarget.h" +#include "virtualgeometry/editing/VirtualGeometryTarget.h" #include #include diff --git a/src/modules/virtualgeometry_editing/VirtualGeometryTarget.h b/src/modules/virtualgeometry/editing/VirtualGeometryTarget.h similarity index 100% rename from src/modules/virtualgeometry_editing/VirtualGeometryTarget.h rename to src/modules/virtualgeometry/editing/VirtualGeometryTarget.h diff --git a/src/modules/virtualgeometry_editor/EditorVirtualGeometryTarget.h b/src/modules/virtualgeometry/editor/EditorVirtualGeometryTarget.h similarity index 90% rename from src/modules/virtualgeometry_editor/EditorVirtualGeometryTarget.h rename to src/modules/virtualgeometry/editor/EditorVirtualGeometryTarget.h index 542f20ae..586b3a6e 100644 --- a/src/modules/virtualgeometry_editor/EditorVirtualGeometryTarget.h +++ b/src/modules/virtualgeometry/editor/EditorVirtualGeometryTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "virtualgeometry_editing/VirtualGeometryTarget.h" +#include "virtualgeometry/editing/VirtualGeometryTarget.h" namespace eve::editor { using virtualgeometry_editing::IVirtualGeometryMeshResolver; diff --git a/src/modules/virtualgeometry_editor/virtualgeometry_editor.cpp b/src/modules/virtualgeometry/editor/virtualgeometry_editor.cpp similarity index 65% rename from src/modules/virtualgeometry_editor/virtualgeometry_editor.cpp rename to src/modules/virtualgeometry/editor/virtualgeometry_editor.cpp index f4023ded..9c305c8f 100644 --- a/src/modules/virtualgeometry_editor/virtualgeometry_editor.cpp +++ b/src/modules/virtualgeometry/editor/virtualgeometry_editor.cpp @@ -1,4 +1,4 @@ -#include "virtualgeometry_editor/EditorVirtualGeometryTarget.h" +#include "virtualgeometry/editor/EditorVirtualGeometryTarget.h" namespace eve::editor { namespace { diff --git a/src/modules/voxel_editing/VoxelCatalog.cpp b/src/modules/voxel/editing/VoxelCatalog.cpp similarity index 99% rename from src/modules/voxel_editing/VoxelCatalog.cpp rename to src/modules/voxel/editing/VoxelCatalog.cpp index 437e3b06..ba582b9d 100644 --- a/src/modules/voxel_editing/VoxelCatalog.cpp +++ b/src/modules/voxel/editing/VoxelCatalog.cpp @@ -1,4 +1,4 @@ -#include "voxel_editing/VoxelCatalog.h" +#include "voxel/editing/VoxelCatalog.h" #include #include diff --git a/src/modules/voxel_editing/VoxelCatalog.h b/src/modules/voxel/editing/VoxelCatalog.h similarity index 100% rename from src/modules/voxel_editing/VoxelCatalog.h rename to src/modules/voxel/editing/VoxelCatalog.h diff --git a/src/modules/voxel_editing/VoxelEditingCommands.cpp b/src/modules/voxel/editing/VoxelEditingCommands.cpp similarity index 98% rename from src/modules/voxel_editing/VoxelEditingCommands.cpp rename to src/modules/voxel/editing/VoxelEditingCommands.cpp index 6fc85ea5..f699b217 100644 --- a/src/modules/voxel_editing/VoxelEditingCommands.cpp +++ b/src/modules/voxel/editing/VoxelEditingCommands.cpp @@ -1,6 +1,6 @@ -#include "voxel_editing/VoxelEditingCommands.h" +#include "voxel/editing/VoxelEditingCommands.h" -#include "voxel_editing/VoxelCatalog.h" +#include "voxel/editing/VoxelCatalog.h" #include #include diff --git a/src/modules/voxel_editing/VoxelEditingCommands.h b/src/modules/voxel/editing/VoxelEditingCommands.h similarity index 100% rename from src/modules/voxel_editing/VoxelEditingCommands.h rename to src/modules/voxel/editing/VoxelEditingCommands.h diff --git a/src/modules/voxel_editing/VoxelPaletteRuntime.cpp b/src/modules/voxel/editing/VoxelPaletteRuntime.cpp similarity index 97% rename from src/modules/voxel_editing/VoxelPaletteRuntime.cpp rename to src/modules/voxel/editing/VoxelPaletteRuntime.cpp index 5051fe34..8eda95bc 100644 --- a/src/modules/voxel_editing/VoxelPaletteRuntime.cpp +++ b/src/modules/voxel/editing/VoxelPaletteRuntime.cpp @@ -1,6 +1,6 @@ #include #include "voxel/CubeTypeRegistry.h" -#include "voxel_editing/VoxelPaletteTarget.h" +#include "voxel/editing/VoxelPaletteTarget.h" namespace eve::voxel_editing { namespace { template diff --git a/src/modules/voxel_editing/VoxelPaletteTarget.cpp b/src/modules/voxel/editing/VoxelPaletteTarget.cpp similarity index 99% rename from src/modules/voxel_editing/VoxelPaletteTarget.cpp rename to src/modules/voxel/editing/VoxelPaletteTarget.cpp index 021d4120..97712172 100644 --- a/src/modules/voxel_editing/VoxelPaletteTarget.cpp +++ b/src/modules/voxel/editing/VoxelPaletteTarget.cpp @@ -1,4 +1,4 @@ -#include "voxel_editing/VoxelPaletteTarget.h" +#include "voxel/editing/VoxelPaletteTarget.h" #include #include diff --git a/src/modules/voxel_editing/VoxelPaletteTarget.h b/src/modules/voxel/editing/VoxelPaletteTarget.h similarity index 100% rename from src/modules/voxel_editing/VoxelPaletteTarget.h rename to src/modules/voxel/editing/VoxelPaletteTarget.h diff --git a/src/modules/voxel_editing/VoxelWorldTarget.cpp b/src/modules/voxel/editing/VoxelWorldTarget.cpp similarity index 97% rename from src/modules/voxel_editing/VoxelWorldTarget.cpp rename to src/modules/voxel/editing/VoxelWorldTarget.cpp index 4555cba3..93c84bda 100644 --- a/src/modules/voxel_editing/VoxelWorldTarget.cpp +++ b/src/modules/voxel/editing/VoxelWorldTarget.cpp @@ -1,4 +1,4 @@ -#include "voxel_editing/VoxelWorldTarget.h" +#include "voxel/editing/VoxelWorldTarget.h" #include "voxel/VoxelWorld.h" #include diff --git a/src/modules/voxel_editing/VoxelWorldTarget.h b/src/modules/voxel/editing/VoxelWorldTarget.h similarity index 100% rename from src/modules/voxel_editing/VoxelWorldTarget.h rename to src/modules/voxel/editing/VoxelWorldTarget.h diff --git a/src/modules/voxel_editor/EditorVoxelCatalogTarget.h b/src/modules/voxel/editor/EditorVoxelCatalogTarget.h similarity index 91% rename from src/modules/voxel_editor/EditorVoxelCatalogTarget.h rename to src/modules/voxel/editor/EditorVoxelCatalogTarget.h index d2c87839..51e52fac 100644 --- a/src/modules/voxel_editor/EditorVoxelCatalogTarget.h +++ b/src/modules/voxel/editor/EditorVoxelCatalogTarget.h @@ -3,7 +3,7 @@ // Compatibility facade. Canonical implementation is owned by voxel_editing. #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "voxel_editing/VoxelCatalog.h" +#include "voxel/editing/VoxelCatalog.h" namespace eve::editor { using voxel_editing::VoxelCatalogTarget; diff --git a/src/modules/voxel_editor/EditorVoxelPaletteTarget.h b/src/modules/voxel/editor/EditorVoxelPaletteTarget.h similarity index 87% rename from src/modules/voxel_editor/EditorVoxelPaletteTarget.h rename to src/modules/voxel/editor/EditorVoxelPaletteTarget.h index 23a2c1f1..606acd25 100644 --- a/src/modules/voxel_editor/EditorVoxelPaletteTarget.h +++ b/src/modules/voxel/editor/EditorVoxelPaletteTarget.h @@ -2,7 +2,7 @@ #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "voxel_editing/VoxelPaletteTarget.h" +#include "voxel/editing/VoxelPaletteTarget.h" namespace eve::editor { using voxel_editing::VoxelPaletteEntryValue; diff --git a/src/modules/voxel_editor/VoxelCatalogEditor.cpp b/src/modules/voxel/editor/VoxelCatalogEditor.cpp similarity index 99% rename from src/modules/voxel_editor/VoxelCatalogEditor.cpp rename to src/modules/voxel/editor/VoxelCatalogEditor.cpp index 5acaae27..d549114e 100644 --- a/src/modules/voxel_editor/VoxelCatalogEditor.cpp +++ b/src/modules/voxel/editor/VoxelCatalogEditor.cpp @@ -1,4 +1,4 @@ -#include "voxel_editor/VoxelCatalogEditor.h" +#include "voxel/editor/VoxelCatalogEditor.h" #include "editor/EditorProtocol.h" diff --git a/src/modules/voxel_editor/VoxelCatalogEditor.h b/src/modules/voxel/editor/VoxelCatalogEditor.h similarity index 99% rename from src/modules/voxel_editor/VoxelCatalogEditor.h rename to src/modules/voxel/editor/VoxelCatalogEditor.h index ac927969..19e4f733 100644 --- a/src/modules/voxel_editor/VoxelCatalogEditor.h +++ b/src/modules/voxel/editor/VoxelCatalogEditor.h @@ -9,7 +9,7 @@ #include "editor/EditorSelection.h" #include "editor/EditorTransactionService.h" #include "editor/EditorWorkspace.h" -#include "voxel_editing/VoxelCatalog.h" +#include "voxel/editing/VoxelCatalog.h" #include #include diff --git a/src/modules/voxel_editor/VoxelCatalogEditorScriptBindings.cpp b/src/modules/voxel/editor/VoxelCatalogEditorScriptBindings.cpp similarity index 98% rename from src/modules/voxel_editor/VoxelCatalogEditorScriptBindings.cpp rename to src/modules/voxel/editor/VoxelCatalogEditorScriptBindings.cpp index 4e02ea9b..5662f1eb 100644 --- a/src/modules/voxel_editor/VoxelCatalogEditorScriptBindings.cpp +++ b/src/modules/voxel/editor/VoxelCatalogEditorScriptBindings.cpp @@ -1,10 +1,10 @@ -#include "voxel_editor/VoxelCatalogEditorScriptBindings.h" +#include "voxel/editor/VoxelCatalogEditorScriptBindings.h" #include "common/SquirrelBinding.h" #include "common/SquirrelOwnership.h" #include "editor/EditorWorkspace.h" -#include "voxel_editor/VoxelCatalogEditor.h" -#include "voxel_editor/VoxelEditorModule.h" +#include "voxel/editor/VoxelCatalogEditor.h" +#include "voxel/editor/VoxelEditorModule.h" #include diff --git a/src/modules/voxel_editor/VoxelCatalogEditorScriptBindings.h b/src/modules/voxel/editor/VoxelCatalogEditorScriptBindings.h similarity index 100% rename from src/modules/voxel_editor/VoxelCatalogEditorScriptBindings.h rename to src/modules/voxel/editor/VoxelCatalogEditorScriptBindings.h diff --git a/src/modules/voxel_editor/VoxelEditorModule.h b/src/modules/voxel/editor/VoxelEditorModule.h similarity index 100% rename from src/modules/voxel_editor/VoxelEditorModule.h rename to src/modules/voxel/editor/VoxelEditorModule.h diff --git a/src/modules/voxel_editor/voxel_editor.cpp b/src/modules/voxel/editor/voxel_editor.cpp similarity index 91% rename from src/modules/voxel_editor/voxel_editor.cpp rename to src/modules/voxel/editor/voxel_editor.cpp index 344e3882..1ea79c52 100644 --- a/src/modules/voxel_editor/voxel_editor.cpp +++ b/src/modules/voxel/editor/voxel_editor.cpp @@ -1,12 +1,12 @@ -#include "voxel_editor/VoxelEditorModule.h" +#include "voxel/editor/VoxelEditorModule.h" #include "common/Capability.h" #include "editing/EditingCommandRegistry.h" #include "editor/EditorAutomationTargetFactory.h" -#include "voxel_editing/VoxelCatalog.h" -#include "voxel_editing/VoxelEditingCommands.h" -#include "voxel_editor/EditorVoxelPaletteTarget.h" -#include "voxel_editor/VoxelCatalogEditorScriptBindings.h" +#include "voxel/editing/VoxelCatalog.h" +#include "voxel/editing/VoxelEditingCommands.h" +#include "voxel/editor/EditorVoxelPaletteTarget.h" +#include "voxel/editor/VoxelCatalogEditorScriptBindings.h" #include diff --git a/src/modules/voxelworld_target/VoxelWorldTargetModule.cpp b/src/modules/voxel/voxelworld_target/VoxelWorldTargetModule.cpp similarity index 96% rename from src/modules/voxelworld_target/VoxelWorldTargetModule.cpp rename to src/modules/voxel/voxelworld_target/VoxelWorldTargetModule.cpp index 4156d431..2a186875 100644 --- a/src/modules/voxelworld_target/VoxelWorldTargetModule.cpp +++ b/src/modules/voxel/voxelworld_target/VoxelWorldTargetModule.cpp @@ -1,7 +1,7 @@ -#include "voxelworld_target/VoxelWorldTargetModule.h" +#include "voxel/voxelworld_target/VoxelWorldTargetModule.h" #include "editor/EditorSession.h" -#include "voxel_editing/VoxelWorldTarget.h" +#include "voxel/editing/VoxelWorldTarget.h" #include diff --git a/src/modules/voxelworld_target/VoxelWorldTargetModule.h b/src/modules/voxel/voxelworld_target/VoxelWorldTargetModule.h similarity index 100% rename from src/modules/voxelworld_target/VoxelWorldTargetModule.h rename to src/modules/voxel/voxelworld_target/VoxelWorldTargetModule.h diff --git a/test/action_editor_adapter.cpp b/test/action_editor_adapter.cpp index 82cf60cd..ab39c0ae 100644 --- a/test/action_editor_adapter.cpp +++ b/test/action_editor_adapter.cpp @@ -1,5 +1,5 @@ -#include "action_editor/ActionEditorModule.h" -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionEditorModule.h" +#include "action/editor/ActionTimelineEditor.h" #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" diff --git a/test/action_preview_controller.cpp b/test/action_preview_controller.cpp index 0c3a3a81..e12cba00 100644 --- a/test/action_preview_controller.cpp +++ b/test/action_preview_controller.cpp @@ -1,4 +1,4 @@ -#include "action_editor/ActionPreviewController.h" +#include "action/editor/ActionPreviewController.h" #include "common/Diagnostic.h" #include "zeroerr/assert.h" diff --git a/test/action_timeline.cpp b/test/action_timeline.cpp index 94ac32de..2c82e66b 100644 --- a/test/action_timeline.cpp +++ b/test/action_timeline.cpp @@ -1,6 +1,6 @@ #include "action/Action.h" #include "action/ActionTimeline.h" -#include "action_editor/ActionTimelineEditor.h" +#include "action/editor/ActionTimelineEditor.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/action_timeline_widget.cpp b/test/action_timeline_widget.cpp index 3e25a7e5..19c72b3b 100644 --- a/test/action_timeline_widget.cpp +++ b/test/action_timeline_widget.cpp @@ -1,4 +1,4 @@ -#include "action_editor/ActionTimelineWidget.h" +#include "action/editor/ActionTimelineWidget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/animation_action_preview.cpp b/test/animation_action_preview.cpp index fa216aaa..72a46e1a 100644 --- a/test/animation_action_preview.cpp +++ b/test/animation_action_preview.cpp @@ -1,4 +1,4 @@ -#include "action_editor/AnimationRootMotionPreviewSource.h" +#include "action/editor/AnimationRootMotionPreviewSource.h" #include "animation/AnimClip.h" #include "animation/AnimClipRegistry.h" diff --git a/test/animation_procedural_bones.cpp b/test/animation_procedural_bones.cpp index 23cab8ab..0cd659a1 100644 --- a/test/animation_procedural_bones.cpp +++ b/test/animation_procedural_bones.cpp @@ -6,7 +6,7 @@ #include "animation/DynamicBoneSolver.h" #include "animation/FootIKSolver.h" #include "animation/ProceduralBoneConfig.h" -#include "animation_editing/ProceduralBoneOverlay.h" +#include "animation/editing/ProceduralBoneOverlay.h" #include "common/Exception.h" #include diff --git a/test/asset_graphics_loader.cpp b/test/asset_graphics_loader.cpp index f2088935..db6ae151 100644 --- a/test/asset_graphics_loader.cpp +++ b/test/asset_graphics_loader.cpp @@ -1,5 +1,5 @@ -#include "asset_graphics/EvpackGraphicsLoader.h" -#include "asset_graphics/EvpackImageLoader.h" +#include "asset/graphics/EvpackGraphicsLoader.h" +#include "asset/graphics/EvpackImageLoader.h" #include "graphics/IMeshResourceFactory.h" #include "zeroerr/assert.h" diff --git a/test/asset_import.cpp b/test/asset_import.cpp index d5006917..e895157c 100644 --- a/test/asset_import.cpp +++ b/test/asset_import.cpp @@ -1,9 +1,9 @@ #include "asset/AssetCooker.h" #include "asset/RuntimeDefinition.h" #include "asset/EvpackResourceReader.h" -#include "asset_graphics/EvpackGraphicsLoader.h" -#include "asset_graphics/EvpackImageLoader.h" -#include "asset_import/AssetImporter.h" +#include "asset/graphics/EvpackGraphicsLoader.h" +#include "asset/graphics/EvpackImageLoader.h" +#include "asset/import/AssetImporter.h" #include "graphics/IMeshResourceFactory.h" #include "zeroerr/assert.h" diff --git a/test/asset_import_animation.cpp b/test/asset_import_animation.cpp index 384c1e4a..6ccac3f5 100644 --- a/test/asset_import_animation.cpp +++ b/test/asset_import_animation.cpp @@ -1,5 +1,5 @@ #include "asset/AssetCooker.h" -#include "asset_import/LegacyAnimationImporter.h" +#include "asset/import/LegacyAnimationImporter.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/asset_import_unity.cpp b/test/asset_import_unity.cpp index 84da84bf..3807411b 100644 --- a/test/asset_import_unity.cpp +++ b/test/asset_import_unity.cpp @@ -1,12 +1,12 @@ #include "asset/AssetCooker.h" #include "asset/EvpackResourceReader.h" #include "asset/RuntimeDefinition.h" -#include "asset_import/UnityImporter.h" -#include "asset_import/TerrainImporter.h" -#include "asset_procgen/EvpackInstanceSetLoader.h" -#include "asset_procgen/EvpackTerrainLoader.h" -#include "asset_procgen/EvpackTerrainMaterialLoader.h" -#include "asset_scene/EvpackSceneTemplateLoader.h" +#include "asset/import/UnityImporter.h" +#include "asset/import/TerrainImporter.h" +#include "asset/procgen/EvpackInstanceSetLoader.h" +#include "asset/procgen/EvpackTerrainLoader.h" +#include "asset/procgen/EvpackTerrainMaterialLoader.h" +#include "asset/scene/EvpackSceneTemplateLoader.h" #include #include diff --git a/test/asset_import_unreal.cpp b/test/asset_import_unreal.cpp index 1d02a508..b9aab51c 100644 --- a/test/asset_import_unreal.cpp +++ b/test/asset_import_unreal.cpp @@ -1,9 +1,9 @@ #include "asset/AssetCooker.h" #include "asset/EvpackResourceReader.h" -#include "asset_procgen/EvpackInstanceSetLoader.h" -#include "asset_procgen/EvpackPointGraphLoader.h" -#include "asset_procgen/EvpackTerrainMaterialLoader.h" -#include "asset_import/UnrealImporter.h" +#include "asset/procgen/EvpackInstanceSetLoader.h" +#include "asset/procgen/EvpackPointGraphLoader.h" +#include "asset/procgen/EvpackTerrainMaterialLoader.h" +#include "asset/import/UnrealImporter.h" #include "procgen/PointGraph.h" #include "procgen/PointSet.h" #include "procgen/SpatialData.h" diff --git a/test/audio_editing_contracts.cpp b/test/audio_editing_contracts.cpp index da13568c..fa1b08ac 100644 --- a/test/audio_editing_contracts.cpp +++ b/test/audio_editing_contracts.cpp @@ -1,4 +1,4 @@ -#include "audio_editing/AudioTarget.h" +#include "audio/editing/AudioTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/buildingfx.cpp b/test/buildingfx.cpp index 8f60b5c3..e4f977a2 100644 --- a/test/buildingfx.cpp +++ b/test/buildingfx.cpp @@ -6,7 +6,7 @@ #include "building/Ghost.h" #include "building/PlacementSystem.h" #include "building/PlacementWorld.h" -#include "buildingfx/BuildingFx.h" +#include "building/fx/BuildingFx.h" #include "common/ECS.h" #include "graphics/RenderSystem3D.h" #include "graphics/Mesh.h" diff --git a/test/editing_contracts.cpp b/test/editing_contracts.cpp index f09401f4..7e18642d 100644 --- a/test/editing_contracts.cpp +++ b/test/editing_contracts.cpp @@ -14,85 +14,85 @@ #include "editing/EditingValue.h" #include "editing/EditingVolume.h" #include "editing/EditableTarget.h" -#include "definitions_editing/DefinitionTarget.h" -#include "definitions_editor/EditorDefinitionTarget.h" +#include "definitions/editing/DefinitionTarget.h" +#include "definitions/editor/EditorDefinitionTarget.h" #include "editor/EditorAuthority.h" -#include "avatar_editor/EditorAvatarTarget.h" -#include "biome_editor/EditorBiomeTarget.h" -#include "camera_editor/EditorCameraTarget.h" -#include "animation_editor/EditorAnimationClip.h" +#include "avatar/editor/EditorAvatarTarget.h" +#include "procgen/biome/editor/EditorBiomeTarget.h" +#include "camera/editor/EditorCameraTarget.h" +#include "animation/editor/EditorAnimationClip.h" #include "editor/EditorCommandTypes.h" -#include "material_editor/EditorGraph.h" -#include "fluids_editor/EditorFluidTarget.h" -#include "hd2d_editor/EditorHd2dTarget.h" -#include "housegen_editor/EditorHouseGenTarget.h" -#include "input_editor/EditorInputMapTarget.h" -#include "lighting_editor/EditorLightingTarget.h" +#include "graphics/material/editor/EditorGraph.h" +#include "fluids/editor/EditorFluidTarget.h" +#include "hd2d/editor/EditorHd2dTarget.h" +#include "housegen/editor/EditorHouseGenTarget.h" +#include "editor/input/editor/EditorInputMapTarget.h" +#include "graphics/lighting/editor/EditorLightingTarget.h" #include "editor/EditorIds.h" -#include "map_editor/EditorMapDocument.h" -#include "material_editor/EditorMaterialTarget.h" -#include "particles_editor/EditorParticleGraph.h" +#include "map/editor/EditorMapDocument.h" +#include "graphics/material/editor/EditorMaterialTarget.h" +#include "particles/editor/EditorParticleGraph.h" #include "editor/EditorProperty.h" #include "editor/EditorProtocol.h" -#include "physics_editor/EditorPhysicsAsset.h" -#include "physics_editor/EditorPhysicsTarget.h" +#include "physics/editor/EditorPhysicsAsset.h" +#include "physics/editor/EditorPhysicsTarget.h" #include "editor/EditorResult.h" #include "editor/EditorSelection.h" -#include "scene_editor/EditorSceneTarget.h" -#include "fluids_editor/EditorSurfaceFluidTarget.h" +#include "scene/editor/EditorSceneTarget.h" +#include "fluids/editor/EditorSurfaceFluidTarget.h" #include "editor/EditorTarget.h" #include "editor/EditorTaskService.h" -#include "ui_editor/EditorUiDocumentTarget.h" -#include "ui_editor/EditorUiThemeTarget.h" +#include "ui/editor/EditorUiDocumentTarget.h" +#include "ui/editor/EditorUiThemeTarget.h" #include "editor/EditorValue.h" -#include "virtualgeometry_editor/EditorVirtualGeometryTarget.h" +#include "virtualgeometry/editor/EditorVirtualGeometryTarget.h" #include "editor/EditorVolumeTarget.h" -#include "voxel_editor/EditorVoxelCatalogTarget.h" -#include "voxel_editor/EditorVoxelPaletteTarget.h" -#include "physics_editing/PhysicsColliderAsset.h" -#include "physics_editing/PhysicsTarget.h" -#include "map_editing/MapDocument.h" -#include "material_editing/MaterialGraph.h" -#include "material_editing/MaterialTarget.h" -#include "particles_editing/ParticleGraph.h" -#include "procgen_editing/TextureRecipeTarget.h" -#include "procgen_editor/EditorTextureRecipeTarget.h" -#include "animation_editing/AnimationClip.h" -#include "avatar_editing/AvatarTarget.h" -#include "biome_editing/BiomeTarget.h" -#include "camera_editing/CameraTarget.h" -#include "building_editing/BuildingTarget.h" -#include "crowd_editing/CrowdDocument.h" -#include "localization_editing/LocalizationDocument.h" -#include "social_editing/SocialDocument.h" -#include "building_editor/EditorBuildingTarget.h" -#include "crowd_editor/EditorCrowdDocument.h" -#include "localization_editor/EditorLocalization.h" -#include "social_editor/EditorSocialDocument.h" -#include "scene_editing/SceneTarget.h" -#include "sceneloader_editing/SceneImportTarget.h" -#include "sceneloader_editor/EditorSceneImportTarget.h" -#include "ui_editing/UiDocument.h" -#include "input_editing/InputMapTarget.h" -#include "hd2d_editing/Hd2dTarget.h" -#include "housegen_editing/HouseGenTarget.h" -#include "fluids_editing/FluidTarget.h" -#include "fluids_editing/SurfaceFluidTarget.h" -#include "lighting_editing/LightingTarget.h" -#include "virtualgeometry_editing/VirtualGeometryTarget.h" -#include "voxel_editing/VoxelPaletteTarget.h" -#include "voxel_editing/VoxelCatalog.h" -#include "voxel_editing/VoxelWorldTarget.h" -#include "network_editing/NetworkTelemetry.h" -#include "profiler_editing/ProfilerModel.h" -#include "queue_editing/QueueInspector.h" -#include "graphics_editing/OffscreenPreview.h" -#include "domain_gizmo_editing/DomainGizmoPreview.h" -#include "network_editor/EditorNetworkTelemetry.h" -#include "profiler_editor/EditorProfiler.h" -#include "queue_editor/EditorQueueInspector.h" -#include "graphics_editor/EditorOffscreenPreview.h" -#include "domain_gizmo_editor/EditorGizmoPreview.h" +#include "voxel/editor/EditorVoxelCatalogTarget.h" +#include "voxel/editor/EditorVoxelPaletteTarget.h" +#include "physics/editing/PhysicsColliderAsset.h" +#include "physics/editing/PhysicsTarget.h" +#include "map/editing/MapDocument.h" +#include "graphics/material/editing/MaterialGraph.h" +#include "graphics/material/editing/MaterialTarget.h" +#include "particles/editing/ParticleGraph.h" +#include "procgen/editing/TextureRecipeTarget.h" +#include "procgen/editor/EditorTextureRecipeTarget.h" +#include "animation/editing/AnimationClip.h" +#include "avatar/editing/AvatarTarget.h" +#include "procgen/biome/editing/BiomeTarget.h" +#include "camera/editing/CameraTarget.h" +#include "building/editing/BuildingTarget.h" +#include "crowd/editing/CrowdDocument.h" +#include "i18n/editing/LocalizationDocument.h" +#include "social/editing/SocialDocument.h" +#include "building/editor/EditorBuildingTarget.h" +#include "crowd/editor/EditorCrowdDocument.h" +#include "i18n/editor/EditorLocalization.h" +#include "social/editor/EditorSocialDocument.h" +#include "scene/editing/SceneTarget.h" +#include "scene/loader/editing/SceneImportTarget.h" +#include "scene/loader/editor/EditorSceneImportTarget.h" +#include "ui/editing/UiDocument.h" +#include "editor/input/editing/InputMapTarget.h" +#include "hd2d/editing/Hd2dTarget.h" +#include "housegen/editing/HouseGenTarget.h" +#include "fluids/editing/FluidTarget.h" +#include "fluids/editing/SurfaceFluidTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" +#include "virtualgeometry/editing/VirtualGeometryTarget.h" +#include "voxel/editing/VoxelPaletteTarget.h" +#include "voxel/editing/VoxelCatalog.h" +#include "voxel/editing/VoxelWorldTarget.h" +#include "network/editing/NetworkTelemetry.h" +#include "profiler/editing/ProfilerModel.h" +#include "editor/queue/editing/QueueInspector.h" +#include "graphics/editing/OffscreenPreview.h" +#include "editor/gizmo/editing/DomainGizmoPreview.h" +#include "network/editor/EditorNetworkTelemetry.h" +#include "profiler/editor/EditorProfiler.h" +#include "editor/queue/editor/EditorQueueInspector.h" +#include "graphics/editor/EditorOffscreenPreview.h" +#include "editor/gizmo/editor/EditorGizmoPreview.h" #include #include diff --git a/test/editing_satellite_contract_suite.cpp b/test/editing_satellite_contract_suite.cpp index 3271c648..995af091 100644 --- a/test/editing_satellite_contract_suite.cpp +++ b/test/editing_satellite_contract_suite.cpp @@ -1,8 +1,8 @@ -#include "audio_editing/AudioTarget.h" -#include "audio_editing/AudioEditingProvider.h" +#include "audio/editing/AudioTarget.h" +#include "audio/editing/AudioEditingProvider.h" #include "editor/Editor.h" -#include "physics_editing/PhysicsEditingProvider.h" -#include "physics_editing/PhysicsTarget.h" +#include "physics/editing/PhysicsEditingProvider.h" +#include "physics/editing/PhysicsTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor.cpp b/test/editor.cpp index 81b020a8..246db5ea 100644 --- a/test/editor.cpp +++ b/test/editor.cpp @@ -1,11 +1,11 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "level_editing/Brush.h" +#include "map/level/editing/Brush.h" #include "editor/BrushKernel.h" #include "editor/Editor.h" #include "editor/EditorDock.h" -#include "level_editing/EditorHistory.h" +#include "map/level/editing/EditorHistory.h" #include "editor/EditorInspector.h" #include "editor/EditorSession.h" #include "editor/EditorPresentation.h" @@ -13,17 +13,17 @@ #include "editor/EditConstraint.h" #include "editor/EditorToolbar.h" #include "editor/EditorWorkspace.h" -#include "level_editing/FieldTargets.h" +#include "map/level/editing/FieldTargets.h" #include "editor/FieldBrushTool.h" #include "editor/GizmoManager.h" -#include "level_editing/TileBuffer.h" -#include "level_editor/LevelEditorModule.h" +#include "map/level/editing/TileBuffer.h" +#include "map/level/editor/LevelEditorModule.h" #include "editor/TransformGizmo.h" -#include "heightmap_target/HeightmapTargetModule.h" +#include "procgen/heightmap_target/HeightmapTargetModule.h" #include "common/Exception.h" #include "procgen/heightmap/Heightmap.h" -#include "procgen_editing/HeightmapTarget.h" +#include "procgen/editing/HeightmapTarget.h" #include diff --git a/test/editor_animation_clip.cpp b/test/editor_animation_clip.cpp index 31580a3b..9f3fc333 100644 --- a/test/editor_animation_clip.cpp +++ b/test/editor_animation_clip.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationClip.h" +#include "animation/editing/AnimationClip.h" #include "animation/AnimClip.h" #include "animation/AnimSkeleton.h" diff --git a/test/editor_animation_clip_editor.cpp b/test/editor_animation_clip_editor.cpp index 6b0ddae9..b8a20869 100644 --- a/test/editor_animation_clip_editor.cpp +++ b/test/editor_animation_clip_editor.cpp @@ -1,4 +1,4 @@ -#include "animation_editor/AnimationClipEditor.h" +#include "animation/editor/AnimationClipEditor.h" #include "editor/EditorWorkspace.h" #include "zeroerr/assert.h" diff --git a/test/editor_animation_editor.cpp b/test/editor_animation_editor.cpp index 81a12cfe..a39fec7d 100644 --- a/test/editor_animation_editor.cpp +++ b/test/editor_animation_editor.cpp @@ -1,8 +1,8 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "animation_editor/AnimationEditorModule.h" -#include "animation_editor/EditorAnimationClip.h" +#include "animation/editor/AnimationEditorModule.h" +#include "animation/editor/EditorAnimationClip.h" #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" diff --git a/test/editor_animation_graph.cpp b/test/editor_animation_graph.cpp index dc052afe..52c30c91 100644 --- a/test/editor_animation_graph.cpp +++ b/test/editor_animation_graph.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/AnimationGraph.h" +#include "animation/editing/AnimationGraph.h" #include "animation/AnimClip.h" #include "animation/AnimSkeleton.h" diff --git a/test/editor_api_contracts.cpp b/test/editor_api_contracts.cpp index 1ac3a663..6d6a5514 100644 --- a/test/editor_api_contracts.cpp +++ b/test/editor_api_contracts.cpp @@ -8,10 +8,10 @@ #include "editor/EditorTargetCoordinator.h" #include "editor/EditorTransactions.h" #include "editor/EditorWorkspace.h" -#include "level_editing/EditorHistory.h" -#include "level_editing/FieldTargets.h" -#include "level_editing/TileBuffer.h" -#include "scene_editor/EditorSceneTarget.h" +#include "map/level/editing/EditorHistory.h" +#include "map/level/editing/FieldTargets.h" +#include "map/level/editing/TileBuffer.h" +#include "scene/editor/EditorSceneTarget.h" using namespace eve::editor; using namespace eve::level_editing; diff --git a/test/editor_audio_editor.cpp b/test/editor_audio_editor.cpp index 6e8f6981..1881ecaf 100644 --- a/test/editor_audio_editor.cpp +++ b/test/editor_audio_editor.cpp @@ -1,8 +1,8 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "audio_editor/AudioEditorModule.h" -#include "audio_editor/EditorAudioTarget.h" +#include "audio/editor/AudioEditorModule.h" +#include "audio/editor/EditorAudioTarget.h" #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" diff --git a/test/editor_audio_effects.cpp b/test/editor_audio_effects.cpp index ead8d52b..4defaf6e 100644 --- a/test/editor_audio_effects.cpp +++ b/test/editor_audio_effects.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/EditorAudioEffects.h" +#include "audio/editor/EditorAudioEffects.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_audio_import_diagnostics.cpp b/test/editor_audio_import_diagnostics.cpp index 5e4394cf..b9943d4d 100644 --- a/test/editor_audio_import_diagnostics.cpp +++ b/test/editor_audio_import_diagnostics.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/EditorAudioImportDiagnostics.h" +#include "audio/editor/EditorAudioImportDiagnostics.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_audio_source_editor.cpp b/test/editor_audio_source_editor.cpp index 68ea791c..c77072e2 100644 --- a/test/editor_audio_source_editor.cpp +++ b/test/editor_audio_source_editor.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/AudioSourceEditor.h" +#include "audio/editor/AudioSourceEditor.h" #include "editor/EditorWorkspace.h" #include "zeroerr/assert.h" diff --git a/test/editor_audio_target.cpp b/test/editor_audio_target.cpp index dc999b93..964198be 100644 --- a/test/editor_audio_target.cpp +++ b/test/editor_audio_target.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/EditorAudioTarget.h" +#include "audio/editor/EditorAudioTarget.h" #include "editor/EditorAuthority.h" #include "editor/EditorTransactionService.h" diff --git a/test/editor_audio_transport.cpp b/test/editor_audio_transport.cpp index e7323f3a..bef700b2 100644 --- a/test/editor_audio_transport.cpp +++ b/test/editor_audio_transport.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/EditorAudioTransport.h" +#include "audio/editor/EditorAudioTransport.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_audio_waveform.cpp b/test/editor_audio_waveform.cpp index 615a0aa6..61258b79 100644 --- a/test/editor_audio_waveform.cpp +++ b/test/editor_audio_waveform.cpp @@ -1,4 +1,4 @@ -#include "audio_editor/EditorAudioWaveform.h" +#include "audio/editor/EditorAudioWaveform.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_automation_v2.cpp b/test/editor_automation_v2.cpp index ab5593f1..5b5d6476 100644 --- a/test/editor_automation_v2.cpp +++ b/test/editor_automation_v2.cpp @@ -6,10 +6,10 @@ #include "common/RenderCapture.h" #include "editor/Editor.h" #include "editor/EditorSession.h" -#include "material_editor/MaterialEditorModule.h" -#include "material_editor/EditorMaterialTarget.h" -#include "scene_editor/SceneEditorModule.h" -#include "scene_editor/EditorSceneTarget.h" +#include "graphics/material/editor/MaterialEditorModule.h" +#include "graphics/material/editor/EditorMaterialTarget.h" +#include "scene/editor/SceneEditorModule.h" +#include "scene/editor/EditorSceneTarget.h" #include "graphics/RenderSystem3D.h" #include "graphics/GraphicsCapabilities.h" #include "scene/NodeDesc.h" diff --git a/test/editor_avatar_document_editor.cpp b/test/editor_avatar_document_editor.cpp index 3856a4a7..2d7365dd 100644 --- a/test/editor_avatar_document_editor.cpp +++ b/test/editor_avatar_document_editor.cpp @@ -1,4 +1,4 @@ -#include "avatar_editor/AvatarDocumentEditor.h" +#include "avatar/editor/AvatarDocumentEditor.h" #include "editor/EditorWorkspace.h" #include "zeroerr/assert.h" diff --git a/test/editor_avatar_editor.cpp b/test/editor_avatar_editor.cpp index 4930dea4..ee20c1ac 100644 --- a/test/editor_avatar_editor.cpp +++ b/test/editor_avatar_editor.cpp @@ -1,8 +1,8 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "avatar_editor/AvatarEditorModule.h" -#include "avatar_editor/EditorAvatarTarget.h" +#include "avatar/editor/AvatarEditorModule.h" +#include "avatar/editor/EditorAvatarTarget.h" #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" diff --git a/test/editor_avatar_target.cpp b/test/editor_avatar_target.cpp index f548fbb1..2c36a505 100644 --- a/test/editor_avatar_target.cpp +++ b/test/editor_avatar_target.cpp @@ -1,4 +1,4 @@ -#include "avatar_editing/AvatarTarget.h" +#include "avatar/editing/AvatarTarget.h" #include "avatar/AvatarInstance.h" #include "zeroerr/assert.h" diff --git a/test/editor_behavior_graph.cpp b/test/editor_behavior_graph.cpp index 1ceb04a0..f68d7df5 100644 --- a/test/editor_behavior_graph.cpp +++ b/test/editor_behavior_graph.cpp @@ -1,4 +1,4 @@ -#include "npc_ai_editing/BehaviorGraph.h" +#include "npc_ai/editing/BehaviorGraph.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_biome_rules_editor.cpp b/test/editor_biome_rules_editor.cpp index 52c7d9cc..cc599c06 100644 --- a/test/editor_biome_rules_editor.cpp +++ b/test/editor_biome_rules_editor.cpp @@ -1,4 +1,4 @@ -#include "biome_editor/BiomeRulesEditor.h" +#include "procgen/biome/editor/BiomeRulesEditor.h" #include "editor/EditorWorkspace.h" #include "zeroerr/assert.h" diff --git a/test/editor_biome_target.cpp b/test/editor_biome_target.cpp index ac7a6931..7cccdefe 100644 --- a/test/editor_biome_target.cpp +++ b/test/editor_biome_target.cpp @@ -1,5 +1,5 @@ -#include "biome_editing/BiomeTarget.h" -#include "biome_editor/BiomeEditorModule.h" +#include "procgen/biome/editing/BiomeTarget.h" +#include "procgen/biome/editor/BiomeEditorModule.h" #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" diff --git a/test/editor_building_target.cpp b/test/editor_building_target.cpp index 9865f4d7..dccb7810 100644 --- a/test/editor_building_target.cpp +++ b/test/editor_building_target.cpp @@ -1,4 +1,4 @@ -#include "building_editing/BuildingTarget.h" +#include "building/editing/BuildingTarget.h" #include "building/BuildingDef.h" #include "building/PlacementSystem.h" diff --git a/test/editor_building_tool.cpp b/test/editor_building_tool.cpp index 202baa32..88948383 100644 --- a/test/editor_building_tool.cpp +++ b/test/editor_building_tool.cpp @@ -1,4 +1,4 @@ -#include "building_editor/EditorBuildingTarget.h" +#include "building/editor/EditorBuildingTarget.h" #include "building/BuildingDef.h" #include "building/PlacementWorld.h" diff --git a/test/editor_camera_target.cpp b/test/editor_camera_target.cpp index 26f45731..39b5d073 100644 --- a/test/editor_camera_target.cpp +++ b/test/editor_camera_target.cpp @@ -1,4 +1,4 @@ -#include "camera_editing/CameraTarget.h" +#include "camera/editing/CameraTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_core_v2.cpp b/test/editor_core_v2.cpp index b7f6e868..ec327ccc 100644 --- a/test/editor_core_v2.cpp +++ b/test/editor_core_v2.cpp @@ -7,8 +7,8 @@ #include "editor/EditorIds.h" #include "editor/EditorSession.h" #include "editor/EditorValue.h" -#include "level_editing/FieldTargets.h" -#include "level_editing/TileBuffer.h" +#include "map/level/editing/FieldTargets.h" +#include "map/level/editing/TileBuffer.h" #include #include diff --git a/test/editor_crowd_document.cpp b/test/editor_crowd_document.cpp index 059ba758..118f3856 100644 --- a/test/editor_crowd_document.cpp +++ b/test/editor_crowd_document.cpp @@ -1,4 +1,4 @@ -#include "crowd_editing/CrowdDocument.h" +#include "crowd/editing/CrowdDocument.h" #include "crowd/Crowd.h" #include "zeroerr/assert.h" diff --git a/test/editor_decal_target.cpp b/test/editor_decal_target.cpp index 1e68ce8d..975676cb 100644 --- a/test/editor_decal_target.cpp +++ b/test/editor_decal_target.cpp @@ -1,4 +1,4 @@ -#include "decal_editing/DecalTarget.h" +#include "decal/editing/DecalTarget.h" #include "decal/DecalManager.h" #include "zeroerr/assert.h" diff --git a/test/editor_definition_target.cpp b/test/editor_definition_target.cpp index f77cce4d..3d7cc251 100644 --- a/test/editor_definition_target.cpp +++ b/test/editor_definition_target.cpp @@ -1,5 +1,5 @@ -#include "definitions_editor/EditorDefinitionTarget.h" -#include "definitions_editor/EditorDefinitionForm.h" +#include "definitions/editor/EditorDefinitionTarget.h" +#include "definitions/editor/EditorDefinitionForm.h" #include "schema/SchemaTypes.h" #include "definitions/Definitions.h" diff --git a/test/editor_dialogue_graph.cpp b/test/editor_dialogue_graph.cpp index 3277a5e2..f24f4f87 100644 --- a/test/editor_dialogue_graph.cpp +++ b/test/editor_dialogue_graph.cpp @@ -1,4 +1,4 @@ -#include "dialogue_editing/DialogueGraph.h" +#include "dialogue/editing/DialogueGraph.h" #include "dialogue/ConversationAuthoring.h" diff --git a/test/editor_dialogue_preview.cpp b/test/editor_dialogue_preview.cpp index a1cd6569..4bbef004 100644 --- a/test/editor_dialogue_preview.cpp +++ b/test/editor_dialogue_preview.cpp @@ -1,4 +1,4 @@ -#include "dialogue_editor/EditorDialoguePreview.h" +#include "dialogue/editor/EditorDialoguePreview.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_document_asset_v2.cpp b/test/editor_document_asset_v2.cpp index 453138ee..b27b5887 100644 --- a/test/editor_document_asset_v2.cpp +++ b/test/editor_document_asset_v2.cpp @@ -4,7 +4,7 @@ #include "editor/EditorAssetDatabase.h" #include "editor/EditorAuthority.h" #include "editor/EditorDocumentService.h" -#include "scene_editor/EditorSceneTarget.h" +#include "scene/editor/EditorSceneTarget.h" #include "editor/EditorTransactionService.h" #include diff --git a/test/editor_domain_offscreen.cpp b/test/editor_domain_offscreen.cpp index 6a90cd40..5df409a0 100644 --- a/test/editor_domain_offscreen.cpp +++ b/test/editor_domain_offscreen.cpp @@ -1,7 +1,7 @@ -#include "material_editor/EditorMaterialOffscreen.h" -#include "particles_editor/EditorParticleOffscreen.h" -#include "ui_editor/EditorUiOffscreen.h" -#include "fluids_editor/EditorSurfaceFluidPreview.h" +#include "graphics/material/editor/EditorMaterialOffscreen.h" +#include "particles/editor/EditorParticleOffscreen.h" +#include "ui/editor/EditorUiOffscreen.h" +#include "fluids/editor/EditorSurfaceFluidPreview.h" #include "graphics/Canvas.h" #include "graphics/ICanvasFactory.h" diff --git a/test/editor_fluid_target.cpp b/test/editor_fluid_target.cpp index 417ce5ab..02112e64 100644 --- a/test/editor_fluid_target.cpp +++ b/test/editor_fluid_target.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/FluidTarget.h" +#include "fluids/editing/FluidTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_gizmo_preview.cpp b/test/editor_gizmo_preview.cpp index 569a4506..3b3105c1 100644 --- a/test/editor_gizmo_preview.cpp +++ b/test/editor_gizmo_preview.cpp @@ -1,8 +1,8 @@ -#include "domain_gizmo_editing/DomainGizmoPreview.h" +#include "editor/gizmo/editing/DomainGizmoPreview.h" -#include "audio_editing/AudioTarget.h" -#include "lighting_editing/LightingTarget.h" -#include "physics_editing/PhysicsTarget.h" +#include "audio/editing/AudioTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" +#include "physics/editing/PhysicsTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_graph_material_v2.cpp b/test/editor_graph_material_v2.cpp index ec47c1a5..68f99156 100644 --- a/test/editor_graph_material_v2.cpp +++ b/test/editor_graph_material_v2.cpp @@ -1,7 +1,7 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "material_editing/MaterialGraph.h" +#include "graphics/material/editing/MaterialGraph.h" #include diff --git a/test/editor_hd2d_target.cpp b/test/editor_hd2d_target.cpp index 995258b1..dc6cbb21 100644 --- a/test/editor_hd2d_target.cpp +++ b/test/editor_hd2d_target.cpp @@ -1,4 +1,4 @@ -#include "hd2d_editing/Hd2dTarget.h" +#include "hd2d/editing/Hd2dTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" using namespace eve::hd2d_editing; diff --git a/test/editor_housegen_target.cpp b/test/editor_housegen_target.cpp index e59b8766..e5f4c744 100644 --- a/test/editor_housegen_target.cpp +++ b/test/editor_housegen_target.cpp @@ -1,4 +1,4 @@ -#include "housegen_editing/HouseGenTarget.h" +#include "housegen/editing/HouseGenTarget.h" #include "housegen/HouseLayout.h" #include "zeroerr/assert.h" diff --git a/test/editor_input_map_target.cpp b/test/editor_input_map_target.cpp index 14305c15..32f6652a 100644 --- a/test/editor_input_map_target.cpp +++ b/test/editor_input_map_target.cpp @@ -1,4 +1,4 @@ -#include "input_editing/InputMapTarget.h" +#include "editor/input/editing/InputMapTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" using namespace eve::input_editing; diff --git a/test/editor_level.cpp b/test/editor_level.cpp index 31384c74..42aeaf96 100644 --- a/test/editor_level.cpp +++ b/test/editor_level.cpp @@ -1,8 +1,8 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "level_editing/LevelDocument.h" -#include "level_editing/LevelFormat.h" +#include "map/level/editing/LevelDocument.h" +#include "map/level/editing/LevelFormat.h" using namespace eve::level_editing; diff --git a/test/editor_lighting_target.cpp b/test/editor_lighting_target.cpp index 4527e4b8..0c24fa8d 100644 --- a/test/editor_lighting_target.cpp +++ b/test/editor_lighting_target.cpp @@ -1,4 +1,4 @@ -#include "lighting_editing/LightingTarget.h" +#include "graphics/lighting/editing/LightingTarget.h" #include "daynight/DayNight.h" #include "graphics/Light.h" diff --git a/test/editor_localization.cpp b/test/editor_localization.cpp index 4f3efeda..1bb24138 100644 --- a/test/editor_localization.cpp +++ b/test/editor_localization.cpp @@ -1,4 +1,4 @@ -#include "localization_editing/LocalizationDocument.h" +#include "i18n/editing/LocalizationDocument.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_map.cpp b/test/editor_map.cpp index d277cccb..46a0cda0 100644 --- a/test/editor_map.cpp +++ b/test/editor_map.cpp @@ -5,7 +5,7 @@ #include "editor/Editor.h" #include "map/Map.h" #include "map/TileLayer.h" -#include "map_editing/TileLayerTarget.h" +#include "map/editing/TileLayerTarget.h" #include diff --git a/test/editor_map_document.cpp b/test/editor_map_document.cpp index 02ee4881..bcc60b41 100644 --- a/test/editor_map_document.cpp +++ b/test/editor_map_document.cpp @@ -1,4 +1,4 @@ -#include "map_editing/MapDocument.h" +#include "map/editing/MapDocument.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_material_preview.cpp b/test/editor_material_preview.cpp index a3734aa2..e97b3cbe 100644 --- a/test/editor_material_preview.cpp +++ b/test/editor_material_preview.cpp @@ -1,4 +1,4 @@ -#include "material_editor/EditorMaterialPreview.h" +#include "graphics/material/editor/EditorMaterialPreview.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_material_studio.cpp b/test/editor_material_studio.cpp index f50bc7fb..e558bacc 100644 --- a/test/editor_material_studio.cpp +++ b/test/editor_material_studio.cpp @@ -1,5 +1,5 @@ #include "editor/EditorAuthority.h" -#include "material_editor/EditorMaterialStudio.h" +#include "graphics/material/editor/EditorMaterialStudio.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_material_target.cpp b/test/editor_material_target.cpp index b8f42fab..8633f615 100644 --- a/test/editor_material_target.cpp +++ b/test/editor_material_target.cpp @@ -2,7 +2,7 @@ #include "zeroerr/unittest.h" #include "editor/EditorAuthority.h" -#include "material_editing/MaterialTarget.h" +#include "graphics/material/editing/MaterialTarget.h" #include "editor/EditorTransactionService.h" #include diff --git a/test/editor_network_telemetry.cpp b/test/editor_network_telemetry.cpp index a5317772..a310d2b8 100644 --- a/test/editor_network_telemetry.cpp +++ b/test/editor_network_telemetry.cpp @@ -1,4 +1,4 @@ -#include "network_editing/NetworkTelemetry.h" +#include "network/editing/NetworkTelemetry.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" using namespace eve::network_editing; diff --git a/test/editor_offscreen_preview.cpp b/test/editor_offscreen_preview.cpp index 962b1684..b2745f3f 100644 --- a/test/editor_offscreen_preview.cpp +++ b/test/editor_offscreen_preview.cpp @@ -1,4 +1,4 @@ -#include "graphics_editing/OffscreenPreview.h" +#include "graphics/editing/OffscreenPreview.h" #include "graphics/Canvas.h" #include "graphics/ICanvasFactory.h" diff --git a/test/editor_particle_graph.cpp b/test/editor_particle_graph.cpp index 844930b5..37cfe560 100644 --- a/test/editor_particle_graph.cpp +++ b/test/editor_particle_graph.cpp @@ -1,4 +1,4 @@ -#include "particles_editing/ParticleGraph.h" +#include "particles/editing/ParticleGraph.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_pcg_graph.cpp b/test/editor_pcg_graph.cpp index e6ec0793..83fbd87a 100644 --- a/test/editor_pcg_graph.cpp +++ b/test/editor_pcg_graph.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/PcgGraph.h" +#include "procgen/editing/PcgGraph.h" #include "procgen/PointGraph.h" #include "zeroerr/unittest.h" diff --git a/test/editor_physics_asset.cpp b/test/editor_physics_asset.cpp index f7ed9f10..8ded8cac 100644 --- a/test/editor_physics_asset.cpp +++ b/test/editor_physics_asset.cpp @@ -1,4 +1,4 @@ -#include "physics_editor/EditorPhysicsAsset.h" +#include "physics/editor/EditorPhysicsAsset.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_physics_publication.cpp b/test/editor_physics_publication.cpp index b660d1c9..73e8b9d6 100644 --- a/test/editor_physics_publication.cpp +++ b/test/editor_physics_publication.cpp @@ -1,6 +1,6 @@ #include "editor/EditorAuthority.h" -#include "physics_editor/EditorPhysicsTarget.h" -#include "physics_editor/EditorPhysicsAsset.h" +#include "physics/editor/EditorPhysicsTarget.h" +#include "physics/editor/EditorPhysicsAsset.h" #include "editor/EditorTransactionService.h" #include "physics/Body3D.h" diff --git a/test/editor_physics_target.cpp b/test/editor_physics_target.cpp index 40e42dd4..d0ed5c6f 100644 --- a/test/editor_physics_target.cpp +++ b/test/editor_physics_target.cpp @@ -1,5 +1,5 @@ #include "editor/EditorAuthority.h" -#include "physics_editor/EditorPhysicsTarget.h" +#include "physics/editor/EditorPhysicsTarget.h" #include "editor/EditorTransactionService.h" #include "zeroerr/assert.h" diff --git a/test/editor_prefab.cpp b/test/editor_prefab.cpp index d27239c9..342335a3 100644 --- a/test/editor_prefab.cpp +++ b/test/editor_prefab.cpp @@ -1,4 +1,4 @@ -#include "scene_editor/EditorPrefab.h" +#include "scene/editor/EditorPrefab.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_procgen_script_editor.cpp b/test/editor_procgen_script_editor.cpp index d6dc11b6..536d6733 100644 --- a/test/editor_procgen_script_editor.cpp +++ b/test/editor_procgen_script_editor.cpp @@ -1,4 +1,4 @@ -#include "procgen_editor/ProcgenScriptEditor.h" +#include "procgen/editor/ProcgenScriptEditor.h" #include "editor/EditorWorkspace.h" #include "procgen/PointSet.h" diff --git a/test/editor_profiler.cpp b/test/editor_profiler.cpp index 5d9b294e..92ca71c5 100644 --- a/test/editor_profiler.cpp +++ b/test/editor_profiler.cpp @@ -1,4 +1,4 @@ -#include "profiler_editing/ProfilerModel.h" +#include "profiler/editing/ProfilerModel.h" #include #include diff --git a/test/editor_queue_inspector.cpp b/test/editor_queue_inspector.cpp index 040f3d6d..c1e17348 100644 --- a/test/editor_queue_inspector.cpp +++ b/test/editor_queue_inspector.cpp @@ -1,4 +1,4 @@ -#include "queue_editing/QueueInspector.h" +#include "editor/queue/editing/QueueInspector.h" #include "orders/CommandQueue.h" #include "production/Production.h" diff --git a/test/editor_scene_component_payload.cpp b/test/editor_scene_component_payload.cpp index 604432dc..76748996 100644 --- a/test/editor_scene_component_payload.cpp +++ b/test/editor_scene_component_payload.cpp @@ -1,9 +1,9 @@ -#include "scene_editor/EditorSceneComponentPayload.h" -#include "scene_editor/EditorSceneTarget.h" +#include "scene/editor/EditorSceneComponentPayload.h" +#include "scene/editor/EditorSceneTarget.h" #include "editor/EditorTransactionService.h" -#include "audio_editor/EditorAudioTarget.h" -#include "material_editor/EditorMaterialTarget.h" -#include "physics_editor/EditorPhysicsTarget.h" +#include "audio/editor/EditorAudioTarget.h" +#include "graphics/material/editor/EditorMaterialTarget.h" +#include "physics/editor/EditorPhysicsTarget.h" #include "zeroerr/unittest.h" diff --git a/test/editor_scene_import_target.cpp b/test/editor_scene_import_target.cpp index 439b3ce4..415e80df 100644 --- a/test/editor_scene_import_target.cpp +++ b/test/editor_scene_import_target.cpp @@ -1,4 +1,4 @@ -#include "sceneloader_editing/SceneImportTarget.h" +#include "scene/loader/editing/SceneImportTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" using namespace eve::sceneloader_editing; diff --git a/test/editor_scene_runtime.cpp b/test/editor_scene_runtime.cpp index 1ae6605c..4e4b2bbc 100644 --- a/test/editor_scene_runtime.cpp +++ b/test/editor_scene_runtime.cpp @@ -1,4 +1,4 @@ -#include "scene_editing/SceneTarget.h" +#include "scene/editing/SceneTarget.h" #include "scene/NodeDesc.h" #include "scene/SceneHost.h" diff --git a/test/editor_scene_target_v2.cpp b/test/editor_scene_target_v2.cpp index 53222925..4014d1bf 100644 --- a/test/editor_scene_target_v2.cpp +++ b/test/editor_scene_target_v2.cpp @@ -2,7 +2,7 @@ #include "zeroerr/unittest.h" #include "editor/EditorAuthority.h" -#include "scene_editor/EditorSceneTarget.h" +#include "scene/editor/EditorSceneTarget.h" #include "editor/EditorTransactionService.h" #include diff --git a/test/editor_skeleton_overlay.cpp b/test/editor_skeleton_overlay.cpp index 69c10ba3..3356e735 100644 --- a/test/editor_skeleton_overlay.cpp +++ b/test/editor_skeleton_overlay.cpp @@ -1,4 +1,4 @@ -#include "animation_editing/SkeletonOverlay.h" +#include "animation/editing/SkeletonOverlay.h" #include "animation/AnimPose.h" #include "animation/AnimSkeleton.h" diff --git a/test/editor_snow_target.cpp b/test/editor_snow_target.cpp index 03dbcbba..a8db4822 100644 --- a/test/editor_snow_target.cpp +++ b/test/editor_snow_target.cpp @@ -1,6 +1,6 @@ #include "editor/EditCommand.h" -#include "level_editing/FieldTargets.h" -#include "snow_editor/SnowFieldTarget.h" +#include "map/level/editing/FieldTargets.h" +#include "snow/editor/SnowFieldTarget.h" #include "snow/SnowField.h" #include "zeroerr/assert.h" diff --git a/test/editor_social_document.cpp b/test/editor_social_document.cpp index 0c19dd0a..92e01f8c 100644 --- a/test/editor_social_document.cpp +++ b/test/editor_social_document.cpp @@ -1,5 +1,5 @@ #include "social/SocialGraph.h" -#include "social_editing/SocialDocument.h" +#include "social/editing/SocialDocument.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_spritestack_target.cpp b/test/editor_spritestack_target.cpp index 8537e09c..21acef3f 100644 --- a/test/editor_spritestack_target.cpp +++ b/test/editor_spritestack_target.cpp @@ -1,4 +1,4 @@ -#include "spritestack_editing/SpriteStackTarget.h" +#include "spritestack/editing/SpriteStackTarget.h" #include "image/ImageData.h" #include "zeroerr/assert.h" diff --git a/test/editor_stylize_target.cpp b/test/editor_stylize_target.cpp index 1652b1fb..dc509a74 100644 --- a/test/editor_stylize_target.cpp +++ b/test/editor_stylize_target.cpp @@ -1,4 +1,4 @@ -#include "stylize_editing/StylizeTarget.h" +#include "stylize/editing/StylizeTarget.h" #include "stylize/StyleInstance.h" #include "zeroerr/assert.h" diff --git a/test/editor_surface_fluid_preview.cpp b/test/editor_surface_fluid_preview.cpp index b477a86c..9bf60b90 100644 --- a/test/editor_surface_fluid_preview.cpp +++ b/test/editor_surface_fluid_preview.cpp @@ -1,4 +1,4 @@ -#include "fluids_editor/EditorSurfaceFluidPreview.h" +#include "fluids/editor/EditorSurfaceFluidPreview.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_surface_fluid_target.cpp b/test/editor_surface_fluid_target.cpp index fc57c52a..10eb6fe9 100644 --- a/test/editor_surface_fluid_target.cpp +++ b/test/editor_surface_fluid_target.cpp @@ -1,4 +1,4 @@ -#include "fluids_editing/SurfaceFluidTarget.h" +#include "fluids/editing/SurfaceFluidTarget.h" #include "fluids/SurfaceDropletSimulation.h" #include "fluids/SurfaceFluidRenderData.h" diff --git a/test/editor_task_diagnostic_v2.cpp b/test/editor_task_diagnostic_v2.cpp index 4ce551bc..2d66c7a9 100644 --- a/test/editor_task_diagnostic_v2.cpp +++ b/test/editor_task_diagnostic_v2.cpp @@ -2,7 +2,7 @@ #include "zeroerr/unittest.h" #include "editor/EditorDiagnostics.h" -#include "material_editor/EditorGraph.h" +#include "graphics/material/editor/EditorGraph.h" #include "editor/EditorTaskService.h" #include diff --git a/test/editor_texture_recipe_target.cpp b/test/editor_texture_recipe_target.cpp index a8e4046c..0e16876e 100644 --- a/test/editor_texture_recipe_target.cpp +++ b/test/editor_texture_recipe_target.cpp @@ -1,4 +1,4 @@ -#include "procgen_editing/TextureRecipeTarget.h" +#include "procgen/editing/TextureRecipeTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" using namespace eve::procgen_editing; diff --git a/test/editor_transaction_consumer.cpp b/test/editor_transaction_consumer.cpp index 62bdf923..74b3bc0f 100644 --- a/test/editor_transaction_consumer.cpp +++ b/test/editor_transaction_consumer.cpp @@ -3,8 +3,8 @@ #include "editor/EditorAuthority.h" #include "editor/EditorTransactionConsumer.h" -#include "level_editing/FieldTargets.h" -#include "level_editing/TileBuffer.h" +#include "map/level/editing/FieldTargets.h" +#include "map/level/editing/TileBuffer.h" #include #include diff --git a/test/editor_ui_document.cpp b/test/editor_ui_document.cpp index ca7a1514..20d5b724 100644 --- a/test/editor_ui_document.cpp +++ b/test/editor_ui_document.cpp @@ -1,6 +1,6 @@ #include "editor/EditorAuthority.h" #include "editor/EditorTransactionService.h" -#include "ui_editing/UiDocument.h" +#include "ui/editing/UiDocument.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_ui_skin_preview.cpp b/test/editor_ui_skin_preview.cpp index 28b78251..bb57a930 100644 --- a/test/editor_ui_skin_preview.cpp +++ b/test/editor_ui_skin_preview.cpp @@ -1,4 +1,4 @@ -#include "ui_editor/EditorUiSkinPreview.h" +#include "ui/editor/EditorUiSkinPreview.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_ui_theme.cpp b/test/editor_ui_theme.cpp index 95451a82..ac090e08 100644 --- a/test/editor_ui_theme.cpp +++ b/test/editor_ui_theme.cpp @@ -5,7 +5,7 @@ #include "editor/EditorIds.h" #include "editor/EditorTransactionService.h" #include "ui/Theme.h" -#include "ui_editing/UiTheme.h" +#include "ui/editing/UiTheme.h" #include diff --git a/test/editor_virtualgeometry_target.cpp b/test/editor_virtualgeometry_target.cpp index 9b5b0595..6b3d0aaf 100644 --- a/test/editor_virtualgeometry_target.cpp +++ b/test/editor_virtualgeometry_target.cpp @@ -1,4 +1,4 @@ -#include "virtualgeometry_editing/VirtualGeometryTarget.h" +#include "virtualgeometry/editing/VirtualGeometryTarget.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/editor_voxel_catalog.cpp b/test/editor_voxel_catalog.cpp index e309f2b2..376c10d7 100644 --- a/test/editor_voxel_catalog.cpp +++ b/test/editor_voxel_catalog.cpp @@ -1,7 +1,7 @@ #include "zeroerr/assert.h" #include "zeroerr/unittest.h" -#include "voxel_editing/VoxelCatalog.h" +#include "voxel/editing/VoxelCatalog.h" using eve::voxel_editing::DomainOperation; using eve::voxel_editing::EditorResult; diff --git a/test/editor_voxel_editor.cpp b/test/editor_voxel_editor.cpp index 7b3a935e..c11e8ca0 100644 --- a/test/editor_voxel_editor.cpp +++ b/test/editor_voxel_editor.cpp @@ -4,8 +4,8 @@ #include "common/Capability.h" #include "common/EditorAutomation.h" #include "editor/Editor.h" -#include "voxel_editor/VoxelCatalogEditor.h" -#include "voxel_editor/VoxelEditorModule.h" +#include "voxel/editor/VoxelCatalogEditor.h" +#include "voxel/editor/VoxelEditorModule.h" using eve::editor::Editor; diff --git a/test/editor_voxel_palette.cpp b/test/editor_voxel_palette.cpp index 194ce175..d456dd6a 100644 --- a/test/editor_voxel_palette.cpp +++ b/test/editor_voxel_palette.cpp @@ -1,4 +1,4 @@ -#include "voxel_editing/VoxelPaletteTarget.h" +#include "voxel/editing/VoxelPaletteTarget.h" #include "voxel/CubeTypeRegistry.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/graphics_backend_parity.cpp b/test/graphics_backend_parity.cpp index 65ba67b2..0c6f8af8 100644 --- a/test/graphics_backend_parity.cpp +++ b/test/graphics_backend_parity.cpp @@ -15,7 +15,7 @@ #include "image/Image.h" #include "image/ImageData.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_graphics/PixelWorldGraphics.h" +#include "pixelworld/graphics/PixelWorldGraphics.h" #include #include diff --git a/test/kaykit_combat_assets.cpp b/test/kaykit_combat_assets.cpp index c2909b21..54c35a44 100644 --- a/test/kaykit_combat_assets.cpp +++ b/test/kaykit_combat_assets.cpp @@ -5,9 +5,9 @@ #include "animation/AnimClipRegistry.h" #include "animation/AnimImporter.h" #include "animation/AnimSkeleton.h" -#include "action_editor/ActionPreviewController.h" -#include "action_editor/ActionTimelineEditor.h" -#include "action_editor/AnimationRootMotionPreviewSource.h" +#include "action/editor/ActionPreviewController.h" +#include "action/editor/ActionTimelineEditor.h" +#include "action/editor/AnimationRootMotionPreviewSource.h" #include "editor/EditorWorkspace.h" #include "filesystem/Filesystem.h" #include "model3d/Model3D.h" diff --git a/test/pixelworld_editor.cpp b/test/pixelworld_editor.cpp index 67df3bf3..9ec8492c 100644 --- a/test/pixelworld_editor.cpp +++ b/test/pixelworld_editor.cpp @@ -3,7 +3,7 @@ #include "pixelworld/PixelMaterialCatalogCodec.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_editor/PixelWorldCatalogPanel.h" +#include "pixelworld/editor/PixelWorldCatalogPanel.h" #include "ui/UIHost.h" #include diff --git a/test/pixelworld_parallel.cpp b/test/pixelworld_parallel.cpp index 3d6d4c52..799920ba 100644 --- a/test/pixelworld_parallel.cpp +++ b/test/pixelworld_parallel.cpp @@ -2,7 +2,7 @@ #include "zeroerr/unittest.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_thread/PixelWorldThread.h" +#include "pixelworld/thread/PixelWorldThread.h" #include "thread/JobSystem.h" #include diff --git a/test/pixelworld_physics.cpp b/test/pixelworld_physics.cpp index 88c4f20f..47736b2d 100644 --- a/test/pixelworld_physics.cpp +++ b/test/pixelworld_physics.cpp @@ -1,7 +1,7 @@ #include "physics/Body.h" #include "physics/World.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_physics/PixelWorldPhysics.h" +#include "pixelworld/physics/PixelWorldPhysics.h" #include "zeroerr/assert.h" #include "zeroerr/unittest.h" diff --git a/test/pixelworld_replay.cpp b/test/pixelworld_replay.cpp index 0035cb94..530a9609 100644 --- a/test/pixelworld_replay.cpp +++ b/test/pixelworld_replay.cpp @@ -2,7 +2,7 @@ #include "zeroerr/unittest.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_replay/PixelWorldReplay.h" +#include "pixelworld/replay/PixelWorldReplay.h" #include #include diff --git a/test/pixelworld_streaming.cpp b/test/pixelworld_streaming.cpp index e2b8cbd6..e545cc65 100644 --- a/test/pixelworld_streaming.cpp +++ b/test/pixelworld_streaming.cpp @@ -2,8 +2,8 @@ #include "zeroerr/unittest.h" #include "pixelworld/PixelWorld.h" -#include "pixelworld_streaming/PixelWorldStreaming.h" -#include "pixelworld_streaming/PixelWorldTransport.h" +#include "pixelworld/streaming/PixelWorldStreaming.h" +#include "pixelworld/streaming/PixelWorldTransport.h" #include #include diff --git a/test/sceneloader.cpp b/test/sceneloader.cpp index 8712c468..4192269d 100644 --- a/test/sceneloader.cpp +++ b/test/sceneloader.cpp @@ -31,7 +31,7 @@ #include "scene/NodeDesc.h" #include "scene/SceneHost.h" #include "scene/TransformSystem.h" -#include "sceneloader/SceneLoader.h" +#include "scene/loader/SceneLoader.h" #include "window/Window.h" #include