diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 24f3573baab..e0ce640ce65 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -44,18 +44,21 @@ # Editor -/editor/**/*2d* @godotengine/2d-editor -/editor/**/*3d* @godotengine/3d-editor -/editor/**/*audio* @godotengine/audio -/editor/**/*code* @godotengine/script-editor -/editor/**/*debugger* @godotengine/debugger -/editor/**/*dock* @godotengine/docks -/editor/**/*script* @godotengine/script-editor -/editor/**/*shader* @godotengine/shaders +/editor/script/ @godotengine/script-editor +/editor/shader/ @godotengine/shaders +/editor/animation/ @godotengine/animation +/editor/audio/ @godotengine/audio /editor/debugger/ @godotengine/debugger +/editor/doc/ @godotengine/documentation +/editor/docks/ @godotengine/docks /editor/gui/ @godotengine/usability @godotengine/gui-nodes /editor/icons/ @godotengine/usability /editor/import/ @godotengine/import +/editor/inspector/ @godotengine/docks +/editor/scene/ @godotengine/core +/editor/scene/2d/ @godotengine/2d-editor +/editor/scene/3d/ @godotengine/3d-editor +/editor/scene/gui/ @godotengine/usability @godotengine/gui-nodes /editor/themes/ @godotengine/usability @godotengine/gui-nodes # Main diff --git a/core/extension/extension_api_dump.cpp b/core/extension/extension_api_dump.cpp index 93b1b27207c..685a3bb15b1 100644 --- a/core/extension/extension_api_dump.cpp +++ b/core/extension/extension_api_dump.cpp @@ -39,7 +39,7 @@ #include "core/version.h" #ifdef TOOLS_ENABLED -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" static String get_builtin_or_variant_type_name(const Variant::Type p_type) { if (p_type == Variant::NIL) { diff --git a/editor/SCsub b/editor/SCsub index d17be6f5382..6e2f1f2a966 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -12,12 +12,14 @@ env.editor_sources = [] if env.editor_build: # Generate doc data paths env.CommandNoCache( - "doc_data_class_path.gen.h", env.Value(env.doc_class_path), env.Run(editor_builders.doc_data_class_path_builder) + "doc/doc_data_class_path.gen.h", + env.Value(env.doc_class_path), + env.Run(editor_builders.doc_data_class_path_builder), ) # Register exporters gen_exporters = env.CommandNoCache( - "register_exporters.gen.cpp", + "export/register_exporters.gen.cpp", env.Value(env.platform_exporters), env.Run(editor_builders.register_exporters_builder), ) @@ -43,7 +45,7 @@ if env.editor_build: docs = sorted(docs) env.CommandNoCache( - "#editor/doc_data_compressed.gen.h", + "#editor/doc/doc_data_compressed.gen.h", docs, env.Run(editor_builders.make_doc_header), ) @@ -56,28 +58,28 @@ if env.editor_build: # Editor translations env.CommandNoCache( - "#editor/editor_translations.gen.h", + "#editor/translations/editor_translations.gen.h", Glob("#editor/translations/editor/*"), env.Run(editor_builders.make_translations_header), ) # Property translations env.CommandNoCache( - "#editor/property_translations.gen.h", + "#editor/translations/property_translations.gen.h", Glob("#editor/translations/properties/*"), env.Run(editor_builders.make_translations_header), ) # Documentation translations env.CommandNoCache( - "#editor/doc_translations.gen.h", + "#editor/translations/doc_translations.gen.h", Glob("#doc/translations/*"), env.Run(editor_builders.make_translations_header), ) # Extractable translations env.CommandNoCache( - "#editor/extractable_translations.gen.h", + "#editor/translations/extractable_translations.gen.h", Glob("#editor/translations/extractable/*"), env.Run(editor_builders.make_translations_header), ) @@ -85,14 +87,29 @@ if env.editor_build: env.add_source_files(env.editor_sources, "*.cpp") env.add_source_files(env.editor_sources, gen_exporters) + SConscript("animation/SCsub") + SConscript("asset_library/SCsub") + SConscript("audio/SCsub") SConscript("debugger/SCsub") + SConscript("doc/SCsub") + SConscript("docks/SCsub") SConscript("export/SCsub") + SConscript("file_system/SCsub") SConscript("gui/SCsub") SConscript("icons/SCsub") + SConscript("inspector/SCsub") SConscript("import/SCsub") SConscript("plugins/SCsub") SConscript("project_manager/SCsub") + SConscript("project_upgrade/SCsub") + SConscript("run/SCsub") + SConscript("settings/SCsub") + SConscript("scene/SCsub") + SConscript("script/SCsub") + SConscript("shader/SCsub") SConscript("themes/SCsub") + SConscript("translations/SCsub") + SConscript("version_control/SCsub") lib = env.add_library("editor", env.editor_sources) env.Prepend(LIBS=[lib]) diff --git a/editor/plugins/gizmos/SCsub b/editor/animation/SCsub similarity index 100% rename from editor/plugins/gizmos/SCsub rename to editor/animation/SCsub diff --git a/editor/animation_bezier_editor.cpp b/editor/animation/animation_bezier_editor.cpp similarity index 99% rename from editor/animation_bezier_editor.cpp rename to editor/animation/animation_bezier_editor.cpp index b3d933dd691..18f8c8cbecb 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation/animation_bezier_editor.cpp @@ -30,12 +30,12 @@ #include "animation_bezier_editor.h" +#include "editor/animation/animation_player_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" -#include "editor/plugins/animation_player_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/option_button.h" #include "scene/gui/view_panner.h" diff --git a/editor/animation_bezier_editor.h b/editor/animation/animation_bezier_editor.h similarity index 100% rename from editor/animation_bezier_editor.h rename to editor/animation/animation_bezier_editor.h diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/animation/animation_blend_space_1d_editor.cpp similarity index 99% rename from editor/plugins/animation_blend_space_1d_editor.cpp rename to editor/animation/animation_blend_space_1d_editor.cpp index 291d6a467fe..91cf5cd2b08 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/animation/animation_blend_space_1d_editor.cpp @@ -32,10 +32,10 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/animation/animation_blend_space_1d_editor.h similarity index 98% rename from editor/plugins/animation_blend_space_1d_editor.h rename to editor/animation/animation_blend_space_1d_editor.h index 1e82122ca74..8a4968d43de 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/animation/animation_blend_space_1d_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/animation_tree_editor_plugin.h" +#include "editor/animation/animation_tree_editor_plugin.h" #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_blend_space_1d.h" #include "scene/gui/graph_edit.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/animation/animation_blend_space_2d_editor.cpp similarity index 99% rename from editor/plugins/animation_blend_space_2d_editor.cpp rename to editor/animation/animation_blend_space_2d_editor.cpp index 08144a05eb9..44fd58234d3 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/animation/animation_blend_space_2d_editor.cpp @@ -34,10 +34,10 @@ #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/animation/animation_blend_space_2d_editor.h similarity index 98% rename from editor/plugins/animation_blend_space_2d_editor.h rename to editor/animation/animation_blend_space_2d_editor.h index 27370ee92de..008356cfa31 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/animation/animation_blend_space_2d_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/animation_tree_editor_plugin.h" +#include "editor/animation/animation_tree_editor_plugin.h" #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_blend_space_2d.h" #include "scene/gui/graph_edit.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/animation/animation_blend_tree_editor_plugin.cpp similarity index 99% rename from editor/plugins/animation_blend_tree_editor_plugin.cpp rename to editor/animation/animation_blend_tree_editor_plugin.cpp index bd87c967642..4df10d26ac9 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/animation/animation_blend_tree_editor_plugin.cpp @@ -32,13 +32,13 @@ #include "core/config/project_settings.h" #include "core/io/resource_loader.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_properties.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/skeleton_3d.h" #include "scene/gui/check_box.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/animation/animation_blend_tree_editor_plugin.h similarity index 98% rename from editor/plugins/animation_blend_tree_editor_plugin.h rename to editor/animation/animation_blend_tree_editor_plugin.h index f41cbd0a320..e11f91280b5 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/animation/animation_blend_tree_editor_plugin.h @@ -31,8 +31,8 @@ #pragma once #include "core/object/script_language.h" -#include "editor/editor_inspector.h" -#include "editor/plugins/animation_tree_editor_plugin.h" +#include "editor/animation/animation_tree_editor_plugin.h" +#include "editor/inspector/editor_inspector.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/animation_library_editor.cpp b/editor/animation/animation_library_editor.cpp similarity index 99% rename from editor/plugins/animation_library_editor.cpp rename to editor/animation/animation_library_editor.cpp index 7c9599c5367..b36723b77da 100644 --- a/editor/plugins/animation_library_editor.cpp +++ b/editor/animation/animation_library_editor.cpp @@ -35,11 +35,11 @@ #include "core/templates/vector.h" #include "core/variant/variant.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_mixer.h" #include "scene/gui/line_edit.h" diff --git a/editor/plugins/animation_library_editor.h b/editor/animation/animation_library_editor.h similarity index 100% rename from editor/plugins/animation_library_editor.h rename to editor/animation/animation_library_editor.h diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/animation/animation_player_editor_plugin.cpp similarity index 99% rename from editor/plugins/animation_player_editor_plugin.cpp rename to editor/animation/animation_player_editor_plugin.cpp index f6db886e3bf..38ee401931e 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/animation/animation_player_editor_plugin.cpp @@ -33,18 +33,18 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/os/keyboard.h" -#include "editor/editor_command_palette.h" +#include "editor/animation/animation_tree_editor_plugin.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning. -#include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning. -#include "editor/scene_tree_dock.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" // For onion skinning. +#include "editor/scene/canvas_item_editor_plugin.h" // For onion skinning. +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/animation/animation_tree.h" diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/animation/animation_player_editor_plugin.h similarity index 99% rename from editor/plugins/animation_player_editor_plugin.h rename to editor/animation/animation_player_editor_plugin.h index 944a9261c01..cbf8ee9deb8 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/animation/animation_player_editor_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/animation_track_editor.h" -#include "editor/plugins/animation_library_editor.h" +#include "editor/animation/animation_library_editor.h" +#include "editor/animation/animation_track_editor.h" #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_player.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/animation/animation_state_machine_editor.cpp similarity index 99% rename from editor/plugins/animation_state_machine_editor.cpp rename to editor/animation/animation_state_machine_editor.cpp index 37f26998c7c..c111d0298ab 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/animation/animation_state_machine_editor.cpp @@ -34,9 +34,9 @@ #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/line_edit.h" diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/animation/animation_state_machine_editor.h similarity index 99% rename from editor/plugins/animation_state_machine_editor.h rename to editor/animation/animation_state_machine_editor.h index eefb0e1ecce..b5ee0fe9cb3 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/animation/animation_state_machine_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/animation_tree_editor_plugin.h" +#include "editor/animation/animation_tree_editor_plugin.h" #include "scene/animation/animation_node_state_machine.h" #include "scene/gui/graph_edit.h" #include "scene/gui/popup.h" diff --git a/editor/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp similarity index 99% rename from editor/animation_track_editor.cpp rename to editor/animation/animation_track_editor.cpp index def89aee6ee..49249eefd40 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation/animation_track_editor.cpp @@ -33,18 +33,18 @@ #include "animation_track_editor_plugins.h" #include "core/error/error_macros.h" #include "core/input/input.h" -#include "editor/animation_bezier_editor.h" +#include "editor/animation/animation_bezier_editor.h" +#include "editor/animation/animation_player_editor_plugin.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/inspector_dock.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/animation/animation_player.h" diff --git a/editor/animation_track_editor.h b/editor/animation/animation_track_editor.h similarity index 99% rename from editor/animation_track_editor.h rename to editor/animation/animation_track_editor.h index 0866f18ef55..50c0f38bf28 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation/animation_track_editor.h @@ -31,8 +31,8 @@ #pragma once #include "editor/editor_data.h" -#include "editor/editor_properties.h" -#include "editor/property_selector.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/property_selector.h" #include "scene/3d/node_3d.h" #include "scene/gui/control.h" #include "scene/gui/menu_button.h" diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation/animation_track_editor_plugins.cpp similarity index 99% rename from editor/animation_track_editor_plugins.cpp rename to editor/animation/animation_track_editor_plugins.cpp index 1d3b3e2833f..6231c16ec38 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation/animation_track_editor_plugins.cpp @@ -30,10 +30,10 @@ #include "animation_track_editor_plugins.h" -#include "editor/audio_stream_preview.h" -#include "editor/editor_resource_preview.h" +#include "editor/audio/audio_stream_preview.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_resource_preview.h" #include "editor/themes/editor_scale.h" #include "scene/2d/animated_sprite_2d.h" #include "scene/2d/sprite_2d.h" diff --git a/editor/animation_track_editor_plugins.h b/editor/animation/animation_track_editor_plugins.h similarity index 99% rename from editor/animation_track_editor_plugins.h rename to editor/animation/animation_track_editor_plugins.h index 3b598b5d023..b13eb1939a7 100644 --- a/editor/animation_track_editor_plugins.h +++ b/editor/animation/animation_track_editor_plugins.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/animation_track_editor.h" +#include "editor/animation/animation_track_editor.h" class AnimationTrackEditBool : public AnimationTrackEdit { GDCLASS(AnimationTrackEditBool, AnimationTrackEdit); diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/animation/animation_tree_editor_plugin.cpp similarity index 99% rename from editor/plugins/animation_tree_editor_plugin.cpp rename to editor/animation/animation_tree_editor_plugin.cpp index 13e091d5e9f..f4e9d7d46ad 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/animation/animation_tree_editor_plugin.cpp @@ -34,9 +34,9 @@ #include "animation_blend_space_2d_editor.h" #include "animation_blend_tree_editor_plugin.h" #include "animation_state_machine_editor.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/settings/editor_command_palette.h" #include "editor/themes/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/animation/animation_tree_editor_plugin.h similarity index 100% rename from editor/plugins/animation_tree_editor_plugin.h rename to editor/animation/animation_tree_editor_plugin.h diff --git a/editor/plugins/tiles/SCsub b/editor/asset_library/SCsub similarity index 100% rename from editor/plugins/tiles/SCsub rename to editor/asset_library/SCsub diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/asset_library/asset_library_editor_plugin.cpp similarity index 99% rename from editor/plugins/asset_library_editor_plugin.cpp rename to editor/asset_library/asset_library_editor_plugin.cpp index 03b0942ad8b..7ce7641f77c 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/asset_library/asset_library_editor_plugin.cpp @@ -36,11 +36,11 @@ #include "core/version.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/project_settings_editor.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/menu_button.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/asset_library/asset_library_editor_plugin.h similarity index 99% rename from editor/plugins/asset_library_editor_plugin.h rename to editor/asset_library/asset_library_editor_plugin.h index a035b24430d..c24d9989048 100644 --- a/editor/plugins/asset_library_editor_plugin.h +++ b/editor/asset_library/asset_library_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_asset_installer.h" +#include "editor/asset_library/editor_asset_installer.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/box_container.h" #include "scene/gui/grid_container.h" diff --git a/editor/editor_asset_installer.cpp b/editor/asset_library/editor_asset_installer.cpp similarity index 99% rename from editor/editor_asset_installer.cpp rename to editor/asset_library/editor_asset_installer.cpp index 04084b8eb72..39c211966e7 100644 --- a/editor/editor_asset_installer.cpp +++ b/editor/asset_library/editor_asset_installer.cpp @@ -33,12 +33,12 @@ #include "core/io/dir_access.h" #include "core/io/file_access.h" #include "core/io/zip_io.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_toaster.h" -#include "editor/progress_dialog.h" +#include "editor/gui/progress_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/label.h" diff --git a/editor/editor_asset_installer.h b/editor/asset_library/editor_asset_installer.h similarity index 100% rename from editor/editor_asset_installer.h rename to editor/asset_library/editor_asset_installer.h diff --git a/editor/audio/SCsub b/editor/audio/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/audio/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/audio/audio_stream_editor_plugin.cpp similarity index 99% rename from editor/plugins/audio_stream_editor_plugin.cpp rename to editor/audio/audio_stream_editor_plugin.cpp index c8338a246a9..fe24922dac3 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/audio/audio_stream_editor_plugin.cpp @@ -30,9 +30,9 @@ #include "audio_stream_editor_plugin.h" -#include "editor/audio_stream_preview.h" -#include "editor/editor_settings.h" +#include "editor/audio/audio_stream_preview.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/resources/audio_stream_wav.h" diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/audio/audio_stream_editor_plugin.h similarity index 98% rename from editor/plugins/audio_stream_editor_plugin.h rename to editor/audio/audio_stream_editor_plugin.h index fcf2b14c816..78868be5d86 100644 --- a/editor/plugins/audio_stream_editor_plugin.h +++ b/editor/audio/audio_stream_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/audio/audio_stream_player.h" #include "scene/gui/button.h" diff --git a/editor/audio_stream_preview.cpp b/editor/audio/audio_stream_preview.cpp similarity index 100% rename from editor/audio_stream_preview.cpp rename to editor/audio/audio_stream_preview.cpp diff --git a/editor/audio_stream_preview.h b/editor/audio/audio_stream_preview.h similarity index 100% rename from editor/audio_stream_preview.h rename to editor/audio/audio_stream_preview.h diff --git a/editor/plugins/audio_stream_randomizer_editor_plugin.cpp b/editor/audio/audio_stream_randomizer_editor_plugin.cpp similarity index 100% rename from editor/plugins/audio_stream_randomizer_editor_plugin.cpp rename to editor/audio/audio_stream_randomizer_editor_plugin.cpp diff --git a/editor/plugins/audio_stream_randomizer_editor_plugin.h b/editor/audio/audio_stream_randomizer_editor_plugin.h similarity index 100% rename from editor/plugins/audio_stream_randomizer_editor_plugin.h rename to editor/audio/audio_stream_randomizer_editor_plugin.h diff --git a/editor/editor_audio_buses.cpp b/editor/audio/editor_audio_buses.cpp similarity index 99% rename from editor/editor_audio_buses.cpp rename to editor/audio/editor_audio_buses.cpp index f675535f3ad..fe8fb3b33bc 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/audio/editor_audio_buses.cpp @@ -34,14 +34,14 @@ #include "core/input/input.h" #include "core/io/resource_saver.h" #include "core/os/keyboard.h" -#include "editor/editor_command_palette.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/separator.h" diff --git a/editor/editor_audio_buses.h b/editor/audio/editor_audio_buses.h similarity index 100% rename from editor/editor_audio_buses.h rename to editor/audio/editor_audio_buses.h diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/editor/debugger/debug_adapter/debug_adapter_parser.cpp index b6e9dd0b451..a98f3911230 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_parser.cpp @@ -34,8 +34,8 @@ #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" #include "editor/export/editor_export_platform.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/run/editor_run_bar.h" +#include "editor/script/script_editor_plugin.h" void DebugAdapterParser::_bind_methods() { // Requests diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 015ac34451c..437a5fd94cf 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -37,8 +37,8 @@ #include "editor/debugger/script_editor_debugger.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" -#include "editor/gui/editor_run_bar.h" +#include "editor/run/editor_run_bar.h" +#include "editor/settings/editor_settings.h" DebugAdapterProtocol *DebugAdapterProtocol::singleton = nullptr; diff --git a/editor/debugger/debug_adapter/debug_adapter_server.cpp b/editor/debugger/debug_adapter/debug_adapter_server.cpp index a3bd4ae2c72..da483651f30 100644 --- a/editor/debugger/debug_adapter/debug_adapter_server.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_server.cpp @@ -32,7 +32,7 @@ #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" int DebugAdapterServer::port_override = -1; diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/debugger/debugger_editor_plugin.cpp similarity index 98% rename from editor/plugins/debugger_editor_plugin.cpp rename to editor/debugger/debugger_editor_plugin.cpp index 35e3b715a80..ba036d2ad45 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/debugger/debugger_editor_plugin.cpp @@ -34,12 +34,12 @@ #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/editor_debugger_server.h" #include "editor/debugger/editor_file_server.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/run_instances_dialog.h" +#include "editor/run/run_instances_dialog.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/popup_menu.h" DebuggerEditorPlugin::DebuggerEditorPlugin(PopupMenu *p_debug_menu) { diff --git a/editor/plugins/debugger_editor_plugin.h b/editor/debugger/debugger_editor_plugin.h similarity index 100% rename from editor/plugins/debugger_editor_plugin.h rename to editor/debugger/debugger_editor_plugin.h diff --git a/editor/debugger/editor_debugger_inspector.cpp b/editor/debugger/editor_debugger_inspector.cpp index ba28f4ae1e5..ddc3a8379d1 100644 --- a/editor/debugger/editor_debugger_inspector.cpp +++ b/editor/debugger/editor_debugger_inspector.cpp @@ -32,9 +32,9 @@ #include "core/debugger/debugger_marshalls.h" #include "core/io/marshalls.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/inspector_dock.h" #include "scene/debugger/scene_debugger.h" bool EditorDebuggerRemoteObjects::_set(const StringName &p_name, const Variant &p_value) { diff --git a/editor/debugger/editor_debugger_inspector.h b/editor/debugger/editor_debugger_inspector.h index a886b3cc1bb..a92177cb50f 100644 --- a/editor/debugger/editor_debugger_inspector.h +++ b/editor/debugger/editor_debugger_inspector.h @@ -31,7 +31,7 @@ #pragma once #include "core/variant/typed_dictionary.h" -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" class SceneDebuggerObject; diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp index 58cc49009c6..4ac22d4f30d 100644 --- a/editor/debugger/editor_debugger_node.cpp +++ b/editor/debugger/editor_debugger_node.cpp @@ -31,19 +31,19 @@ #include "editor_debugger_node.h" #include "core/object/undo_redo.h" +#include "editor/debugger/editor_debugger_plugin.h" #include "editor/debugger/editor_debugger_tree.h" #include "editor/debugger/script_editor_debugger.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/editor_debugger_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/scene_tree_dock.h" +#include "editor/run/editor_run_bar.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/menu_button.h" #include "scene/gui/tab_container.h" diff --git a/editor/plugins/editor_debugger_plugin.cpp b/editor/debugger/editor_debugger_plugin.cpp similarity index 100% rename from editor/plugins/editor_debugger_plugin.cpp rename to editor/debugger/editor_debugger_plugin.cpp diff --git a/editor/plugins/editor_debugger_plugin.h b/editor/debugger/editor_debugger_plugin.h similarity index 100% rename from editor/plugins/editor_debugger_plugin.h rename to editor/debugger/editor_debugger_plugin.h diff --git a/editor/debugger/editor_debugger_server.cpp b/editor/debugger/editor_debugger_server.cpp index f87fcc1eb00..4e4da3ac25e 100644 --- a/editor/debugger/editor_debugger_server.cpp +++ b/editor/debugger/editor_debugger_server.cpp @@ -34,7 +34,7 @@ #include "core/os/thread.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" class EditorDebuggerServerTCP : public EditorDebuggerServer { private: diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index bda6d992023..8ca12dacde9 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -31,12 +31,12 @@ #include "editor_debugger_tree.h" #include "editor/debugger/editor_debugger_node.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_toaster.h" -#include "editor/scene_tree_dock.h" +#include "editor/settings/editor_settings.h" #include "scene/debugger/scene_debugger.h" #include "scene/gui/texture_rect.h" #include "scene/resources/packed_scene.h" diff --git a/editor/debugger/editor_file_server.cpp b/editor/debugger/editor_file_server.cpp index b4673961a9a..a742bef3df3 100644 --- a/editor/debugger/editor_file_server.cpp +++ b/editor/debugger/editor_file_server.cpp @@ -30,9 +30,9 @@ #include "editor_file_server.h" -#include "../editor_settings.h" #include "editor/editor_node.h" #include "editor/export/editor_export_platform.h" +#include "editor/settings/editor_settings.h" #define FILESYSTEM_PROTOCOL_VERSION 1 #define PASSWORD_LENGTH 32 diff --git a/editor/debugger/editor_file_server.h b/editor/debugger/editor_file_server.h index c1e22f129c1..956a2d77e56 100644 --- a/editor/debugger/editor_file_server.h +++ b/editor/debugger/editor_file_server.h @@ -32,7 +32,7 @@ #include "core/io/tcp_server.h" #include "core/os/thread.h" -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" class EditorFileServer : public Object { GDCLASS(EditorFileServer, Object); diff --git a/editor/debugger/editor_performance_profiler.cpp b/editor/debugger/editor_performance_profiler.cpp index dc1fab4c2cf..6cfa91391ba 100644 --- a/editor/debugger/editor_performance_profiler.cpp +++ b/editor/debugger/editor_performance_profiler.cpp @@ -30,9 +30,9 @@ #include "editor_performance_profiler.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "main/performance.h" diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 775ac9166ae..c50e0794510 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -31,9 +31,9 @@ #include "editor_profiler.h" #include "core/io/image.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/gui/editor_run_bar.h" +#include "editor/run/editor_run_bar.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 398fa6d872f..58f7651d71a 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -31,9 +31,9 @@ #include "editor_visual_profiler.h" #include "core/io/image.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/gui/editor_run_bar.h" +#include "editor/run/editor_run_bar.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/flow_container.h" #include "scene/resources/image_texture.h" diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 894f54f735c..1839a67c38b 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -34,23 +34,23 @@ #include "core/debugger/remote_debugger.h" #include "core/string/ustring.h" #include "core/version.h" +#include "editor/debugger/editor_debugger_plugin.h" #include "editor/debugger/editor_expression_evaluator.h" #include "editor/debugger/editor_performance_profiler.h" #include "editor/debugger/editor_profiler.h" #include "editor/debugger/editor_visual_profiler.h" -#include "editor/editor_file_system.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_toaster.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/editor_debugger_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "main/performance.h" #include "scene/3d/camera_3d.h" diff --git a/editor/doc/SCsub b/editor/doc/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/doc/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/doc_tools.cpp b/editor/doc/doc_tools.cpp similarity index 99% rename from editor/doc_tools.cpp rename to editor/doc/doc_tools.cpp index e15519c07a3..d49e0500a1d 100644 --- a/editor/doc_tools.cpp +++ b/editor/doc/doc_tools.cpp @@ -39,8 +39,8 @@ #include "core/io/resource_importer.h" #include "core/object/script_language.h" #include "core/string/translation_server.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export_platform.h" +#include "editor/settings/editor_settings.h" #include "scene/resources/theme.h" #include "scene/theme/theme_db.h" diff --git a/editor/doc_tools.h b/editor/doc/doc_tools.h similarity index 100% rename from editor/doc_tools.h rename to editor/doc/doc_tools.h diff --git a/editor/editor_help.cpp b/editor/doc/editor_help.cpp similarity index 99% rename from editor/editor_help.cpp rename to editor/doc/editor_help.cpp index fc58600dbc7..63208a60740 100644 --- a/editor/editor_help.cpp +++ b/editor/doc/editor_help.cpp @@ -39,17 +39,17 @@ #include "core/os/keyboard.h" #include "core/string/string_builder.h" #include "core/version.h" -#include "editor/doc_data_compressed.gen.h" -#include "editor/editor_file_system.h" +#include "editor/doc/doc_data_compressed.gen.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_toaster.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" @@ -63,7 +63,6 @@ // For syntax highlighting. #ifdef MODULE_MONO_ENABLED -#include "editor/plugins/script_editor_plugin.h" #include "modules/mono/csharp_script.h" #endif diff --git a/editor/editor_help.h b/editor/doc/editor_help.h similarity index 99% rename from editor/editor_help.h rename to editor/doc/editor_help.h index 8d4d091fbbe..9e1a5c7cb37 100644 --- a/editor/editor_help.h +++ b/editor/doc/editor_help.h @@ -31,7 +31,7 @@ #pragma once #include "core/os/thread.h" -#include "editor/doc_tools.h" +#include "editor/doc/doc_tools.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/dialogs.h" #include "scene/gui/popup.h" diff --git a/editor/editor_help_search.cpp b/editor/doc/editor_help_search.cpp similarity index 99% rename from editor/editor_help_search.cpp rename to editor/doc/editor_help_search.cpp index 527e0cc6a3e..ba792a80ebe 100644 --- a/editor/editor_help_search.cpp +++ b/editor/doc/editor_help_search.cpp @@ -30,11 +30,11 @@ #include "editor_help_search.h" -#include "editor/editor_feature_profile.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/line_edit.h" diff --git a/editor/editor_help_search.h b/editor/doc/editor_help_search.h similarity index 100% rename from editor/editor_help_search.h rename to editor/doc/editor_help_search.h diff --git a/editor/docks/SCsub b/editor/docks/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/docks/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_dock_manager.cpp b/editor/docks/editor_dock_manager.cpp similarity index 99% rename from editor/editor_dock_manager.cpp rename to editor/docks/editor_dock_manager.cpp index 6b75ccbe613..ea22f80868c 100644 --- a/editor/editor_dock_manager.cpp +++ b/editor/docks/editor_dock_manager.cpp @@ -38,11 +38,11 @@ #include "scene/main/window.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/gui/window_wrapper.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "editor/window_wrapper.h" #include "scene/resources/style_box_flat.h" enum class TabStyle { diff --git a/editor/editor_dock_manager.h b/editor/docks/editor_dock_manager.h similarity index 100% rename from editor/editor_dock_manager.h rename to editor/docks/editor_dock_manager.h diff --git a/editor/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp similarity index 99% rename from editor/filesystem_dock.cpp rename to editor/docks/filesystem_dock.cpp index 494832875d5..1a663d069aa 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/docks/filesystem_dock.cpp @@ -37,25 +37,25 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/templates/list.h" -#include "editor/create_dialog.h" -#include "editor/directory_create_dialog.h" -#include "editor/editor_dock_manager.h" -#include "editor/editor_feature_profile.h" +#include "editor/docks/editor_dock_manager.h" +#include "editor/docks/import_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/create_dialog.h" +#include "editor/gui/directory_create_dialog.h" #include "editor/gui/editor_dir_dialog.h" -#include "editor/gui/editor_scene_tabs.h" #include "editor/import/3d/scene_import_settings.h" -#include "editor/import_dock.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/inspector/editor_resource_tooltip_plugins.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "editor/plugins/editor_resource_tooltip_plugins.h" -#include "editor/scene_create_dialog.h" -#include "editor/scene_tree_dock.h" -#include "editor/shader_create_dialog.h" +#include "editor/scene/editor_scene_tabs.h" +#include "editor/scene/scene_create_dialog.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" +#include "editor/shader/shader_create_dialog.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/item_list.h" diff --git a/editor/filesystem_dock.h b/editor/docks/filesystem_dock.h similarity index 98% rename from editor/filesystem_dock.h rename to editor/docks/filesystem_dock.h index 5d16f4695a1..1537eb99008 100644 --- a/editor/filesystem_dock.h +++ b/editor/docks/filesystem_dock.h @@ -30,11 +30,11 @@ #pragma once -#include "editor/dependency_editor.h" -#include "editor/editor_file_system.h" -#include "editor/file_info.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/script_create_dialog.h" +#include "editor/file_system/dependency_editor.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/file_info.h" +#include "editor/script/script_create_dialog.h" +#include "editor/script/script_editor_plugin.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" diff --git a/editor/groups_editor.cpp b/editor/docks/groups_editor.cpp similarity index 99% rename from editor/groups_editor.cpp rename to editor/docks/groups_editor.cpp index 3421d991fbf..72a3c7546b0 100644 --- a/editor/groups_editor.cpp +++ b/editor/docks/groups_editor.cpp @@ -30,13 +30,13 @@ #include "groups_editor.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/project_settings_editor.h" -#include "editor/scene_tree_dock.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/check_button.h" diff --git a/editor/groups_editor.h b/editor/docks/groups_editor.h similarity index 100% rename from editor/groups_editor.h rename to editor/docks/groups_editor.h diff --git a/editor/history_dock.cpp b/editor/docks/history_dock.cpp similarity index 99% rename from editor/history_dock.cpp rename to editor/docks/history_dock.cpp index e29ff2fa6fc..8e0fed8a3d6 100644 --- a/editor/history_dock.cpp +++ b/editor/docks/history_dock.cpp @@ -32,9 +32,9 @@ #include "core/io/config_file.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/check_box.h" #include "scene/gui/item_list.h" diff --git a/editor/history_dock.h b/editor/docks/history_dock.h similarity index 100% rename from editor/history_dock.h rename to editor/docks/history_dock.h diff --git a/editor/import_dock.cpp b/editor/docks/import_dock.cpp similarity index 99% rename from editor/import_dock.cpp rename to editor/docks/import_dock.cpp index e6c1934add7..279e846089c 100644 --- a/editor/import_dock.cpp +++ b/editor/docks/import_dock.cpp @@ -32,10 +32,10 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" diff --git a/editor/import_dock.h b/editor/docks/import_dock.h similarity index 97% rename from editor/import_dock.h rename to editor/docks/import_dock.h index 33a1d33e772..94a36841f7d 100644 --- a/editor/import_dock.h +++ b/editor/docks/import_dock.h @@ -32,8 +32,8 @@ #include "core/io/config_file.h" #include "core/io/resource_importer.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" diff --git a/editor/inspector_dock.cpp b/editor/docks/inspector_dock.cpp similarity index 99% rename from editor/inspector_dock.cpp rename to editor/docks/inspector_dock.cpp index dcf5a51c530..fd994121e59 100644 --- a/editor/inspector_dock.cpp +++ b/editor/docks/inspector_dock.cpp @@ -32,15 +32,15 @@ #include "editor/debugger/editor_debugger_inspector.h" #include "editor/debugger/editor_debugger_node.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_object_selector.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" InspectorDock *InspectorDock::singleton = nullptr; diff --git a/editor/inspector_dock.h b/editor/docks/inspector_dock.h similarity index 98% rename from editor/inspector_dock.h rename to editor/docks/inspector_dock.h index 5db47cde8b5..3627d23963b 100644 --- a/editor/inspector_dock.h +++ b/editor/docks/inspector_dock.h @@ -30,9 +30,9 @@ #pragma once -#include "editor/create_dialog.h" #include "editor/editor_data.h" -#include "editor/editor_inspector.h" +#include "editor/gui/create_dialog.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/editor/node_dock.cpp b/editor/docks/node_dock.cpp similarity index 99% rename from editor/node_dock.cpp rename to editor/docks/node_dock.cpp index 3012d44aa35..12bcbcda3f0 100644 --- a/editor/node_dock.cpp +++ b/editor/docks/node_dock.cpp @@ -31,7 +31,7 @@ #include "node_dock.h" #include "core/io/config_file.h" -#include "editor/connections_dialog.h" +#include "editor/scene/connections_dialog.h" #include "editor/themes/editor_scale.h" void NodeDock::show_groups() { diff --git a/editor/node_dock.h b/editor/docks/node_dock.h similarity index 100% rename from editor/node_dock.h rename to editor/docks/node_dock.h diff --git a/editor/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp similarity index 99% rename from editor/scene_tree_dock.cpp rename to editor/docks/scene_tree_dock.cpp index f1091711088..49a2352b4d2 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/docks/scene_tree_dock.cpp @@ -35,29 +35,29 @@ #include "core/io/resource_saver.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" +#include "editor/animation/animation_player_editor_plugin.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_feature_profile.h" -#include "editor/editor_file_system.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/node_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_quick_open_dialog.h" -#include "editor/inspector_dock.h" -#include "editor/multi_node_edit.h" -#include "editor/node_dock.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/editor_context_menu_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/rename_dialog.h" -#include "editor/reparent_dialog.h" -#include "editor/shader_create_dialog.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/scene/rename_dialog.h" +#include "editor/scene/reparent_dialog.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" +#include "editor/shader/shader_create_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/2d/node_2d.h" #include "scene/animation/animation_tree.h" diff --git a/editor/scene_tree_dock.h b/editor/docks/scene_tree_dock.h similarity index 99% rename from editor/scene_tree_dock.h rename to editor/docks/scene_tree_dock.h index c901dd9837d..2f3e884131e 100644 --- a/editor/scene_tree_dock.h +++ b/editor/docks/scene_tree_dock.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/gui/scene_tree_editor.h" -#include "editor/script_create_dialog.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/script/script_create_dialog.h" #include "scene/gui/box_container.h" #include "scene/resources/animation.h" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 86dfe2ed7f6..496f3644ca1 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -36,8 +36,8 @@ #include "core/io/resource_loader.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/inspector/multi_node_edit.h" #include "editor/plugins/editor_plugin.h" #include "scene/property_utils.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp index 082b0ed3c96..51645cee54a 100644 --- a/editor/editor_interface.cpp +++ b/editor/editor_interface.cpp @@ -32,27 +32,27 @@ #include "editor_interface.compat.inc" #include "core/config/project_settings.h" -#include "editor/create_dialog.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_feature_profile.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/create_dialog.h" #include "editor/gui/editor_quick_open_dialog.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/gui/editor_scene_tabs.h" #include "editor/gui/editor_toaster.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/property_selector.h" +#include "editor/inspector/editor_preview_plugins.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/inspector/property_selector.h" +#include "editor/run/editor_run_bar.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/editor_scene_tabs.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "main/main.h" -#include "plugins/editor_preview_plugins.h" #include "scene/3d/light_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/box_container.h" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 0ecfbf02d72..2e1fc428e56 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -34,9 +34,9 @@ #include "core/os/keyboard.h" #include "core/version.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/separator.h" #include "scene/resources/font.h" diff --git a/editor/editor_main_screen.cpp b/editor/editor_main_screen.cpp index d6c486c2114..93fad762dd5 100644 --- a/editor/editor_main_screen.cpp +++ b/editor/editor_main_screen.cpp @@ -32,9 +32,9 @@ #include "core/io/config_file.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/plugins/editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 769cfe7f8e8..11a60473077 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -46,7 +46,7 @@ #include "core/string/translation_server.h" #include "core/version.h" #include "editor/editor_string_names.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" #include "main/main.h" #include "scene/2d/node_2d.h" #include "scene/3d/bone_attachment_3d.h" @@ -72,56 +72,51 @@ #include "servers/navigation_server_3d.h" #include "servers/rendering_server.h" -#include "editor/audio_stream_preview.h" +#include "editor/animation/animation_player_editor_plugin.h" +#include "editor/asset_library/asset_library_editor_plugin.h" +#include "editor/audio/audio_stream_preview.h" +#include "editor/audio/editor_audio_buses.h" +#include "editor/debugger/debugger_editor_plugin.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" -#include "editor/dependency_editor.h" -#include "editor/editor_about.h" -#include "editor/editor_audio_buses.h" -#include "editor/editor_build_profile.h" -#include "editor/editor_command_palette.h" +#include "editor/doc/editor_help.h" +#include "editor/docks/editor_dock_manager.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/history_dock.h" +#include "editor/docks/import_dock.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/node_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_data.h" -#include "editor/editor_dock_manager.h" -#include "editor/editor_feature_profile.h" -#include "editor/editor_folding.h" -#include "editor/editor_help.h" -#include "editor/editor_inspector.h" #include "editor/editor_interface.h" -#include "editor/editor_layouts_dialog.h" #include "editor/editor_log.h" #include "editor/editor_main_screen.h" -#include "editor/editor_native_shader_source_visualizer.h" -#include "editor/editor_paths.h" -#include "editor/editor_properties.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_resource_picker.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_run.h" -#include "editor/editor_script.h" -#include "editor/editor_settings.h" -#include "editor/editor_settings_dialog.h" -#include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/export/dedicated_server_export_plugin.h" #include "editor/export/editor_export.h" #include "editor/export/export_template_manager.h" +#include "editor/export/gdextension_export_plugin.h" #include "editor/export/project_export.h" #include "editor/export/project_zip_packer.h" -#include "editor/fbx_importer_manager.h" -#include "editor/filesystem_dock.h" +#include "editor/export/register_exporters.h" +#include "editor/export/shader_baker_export_plugin.h" +#include "editor/file_system/dependency_editor.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/editor_about.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_quick_open_dialog.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/gui/editor_scene_tabs.h" #include "editor/gui/editor_title_bar.h" #include "editor/gui/editor_toaster.h" -#include "editor/history_dock.h" +#include "editor/gui/progress_dialog.h" +#include "editor/gui/window_wrapper.h" #include "editor/import/3d/editor_import_collada.h" #include "editor/import/3d/resource_importer_obj.h" #include "editor/import/3d/resource_importer_scene.h" #include "editor/import/3d/scene_import_settings.h" #include "editor/import/audio_stream_import_settings.h" #include "editor/import/dynamic_font_import_settings.h" +#include "editor/import/fbx_importer_manager.h" #include "editor/import/resource_importer_bitmask.h" #include "editor/import/resource_importer_bmfont.h" #include "editor/import/resource_importer_csv_translation.h" @@ -134,51 +129,55 @@ #include "editor/import/resource_importer_texture.h" #include "editor/import/resource_importer_texture_atlas.h" #include "editor/import/resource_importer_wav.h" -#include "editor/import_dock.h" -#include "editor/inspector_dock.h" -#include "editor/multi_node_edit.h" -#include "editor/node_dock.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/asset_library_editor_plugin.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/debugger_editor_plugin.h" -#include "editor/plugins/dedicated_server_export_plugin.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_preview_plugins.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/inspector/editor_resource_picker.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/inspector/multi_node_edit.h" #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/editor_preview_plugins.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "editor/plugins/game_view_plugin.h" -#include "editor/plugins/gdextension_export_plugin.h" -#include "editor/plugins/material_editor_plugin.h" -#include "editor/plugins/mesh_library_editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/plugins/packed_scene_translation_parser_plugin.h" -#include "editor/plugins/particle_process_material_editor_plugin.h" #include "editor/plugins/plugin_config_dialog.h" -#include "editor/plugins/root_motion_editor_plugin.h" -#include "editor/plugins/script_text_editor.h" -#include "editor/plugins/shader_baker_export_plugin.h" -#include "editor/plugins/text_editor.h" -#include "editor/plugins/version_control_editor_plugin.h" -#include "editor/plugins/visual_shader_editor_plugin.h" -#include "editor/progress_dialog.h" -#include "editor/project_settings_editor.h" -#include "editor/project_upgrade_tool.h" -#include "editor/register_exporters.h" -#include "editor/scene_tree_dock.h" +#include "editor/project_upgrade/project_upgrade_tool.h" +#include "editor/run/editor_run.h" +#include "editor/run/editor_run_bar.h" +#include "editor/run/game_view_plugin.h" +#include "editor/scene/3d/mesh_library_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/3d/root_motion_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/scene/editor_scene_tabs.h" +#include "editor/scene/material_editor_plugin.h" +#include "editor/scene/particle_process_material_editor_plugin.h" +#include "editor/script/editor_script.h" +#include "editor/script/script_text_editor.h" +#include "editor/script/text_editor.h" +#include "editor/settings/editor_build_profile.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_layouts_dialog.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/editor_settings_dialog.h" +#include "editor/settings/project_settings_editor.h" +#include "editor/shader/editor_native_shader_source_visualizer.h" +#include "editor/shader/visual_shader_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" -#include "editor/window_wrapper.h" +#include "editor/translations/editor_translation_parser.h" +#include "editor/translations/packed_scene_translation_parser_plugin.h" +#include "editor/version_control/version_control_editor_plugin.h" #ifdef VULKAN_ENABLED -#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.h" +#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h" #endif #ifdef D3D12_ENABLED -#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.h" +#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.h" #endif #ifdef METAL_ENABLED -#include "editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.h" +#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h" #endif #include "modules/modules_enabled.gen.h" // For gdscript, mono. diff --git a/editor/editor_node.h b/editor/editor_node.h index a130334ff7a..f0a6dc270db 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -33,8 +33,8 @@ #include "core/object/script_language.h" #include "core/templates/safe_refcount.h" #include "editor/editor_data.h" -#include "editor/editor_folding.h" #include "editor/plugins/editor_plugin.h" +#include "editor/settings/editor_folding.h" typedef void (*EditorNodeInitCallback)(); typedef void (*EditorPluginInitializeCallback)(); diff --git a/editor/export/codesign.cpp b/editor/export/codesign.cpp index 62d10653852..20a5507a156 100644 --- a/editor/export/codesign.cpp +++ b/editor/export/codesign.cpp @@ -33,7 +33,7 @@ #include "core/crypto/crypto_core.h" #include "core/io/dir_access.h" #include "core/io/plist.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_paths.h" #include "lipo.h" #include "macho.h" diff --git a/editor/plugins/dedicated_server_export_plugin.cpp b/editor/export/dedicated_server_export_plugin.cpp similarity index 100% rename from editor/plugins/dedicated_server_export_plugin.cpp rename to editor/export/dedicated_server_export_plugin.cpp diff --git a/editor/plugins/dedicated_server_export_plugin.h b/editor/export/dedicated_server_export_plugin.h similarity index 100% rename from editor/plugins/dedicated_server_export_plugin.h rename to editor/export/dedicated_server_export_plugin.h diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp index 9ea76b32a3b..5e76c5950a3 100644 --- a/editor/export/editor_export.cpp +++ b/editor/export/editor_export.cpp @@ -32,7 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/config_file.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" EditorExport *EditorExport::singleton = nullptr; diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index 4fce70877bb..0e888cd8ac5 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -42,13 +42,13 @@ #include "core/io/zip_io.h" #include "core/math/random_pcg.h" #include "core/version.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor_export_plugin.h" #include "scene/resources/image_texture.h" diff --git a/editor/export/editor_export_platform_apple_embedded.cpp b/editor/export/editor_export_platform_apple_embedded.cpp index ef8a924a2f6..b870544b450 100644 --- a/editor/export/editor_export_platform_apple_embedded.cpp +++ b/editor/export/editor_export_platform_apple_embedded.cpp @@ -34,13 +34,13 @@ #include "core/io/plist.h" #include "core/string/translation.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" #include "editor/export/lipo.h" #include "editor/export/macho.h" +#include "editor/file_system/editor_paths.h" #include "editor/import/resource_importer_texture_settings.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "main/main.h" diff --git a/editor/export/editor_export_platform_apple_embedded.h b/editor/export/editor_export_platform_apple_embedded.h index c79c10ac4a4..8673e323ab1 100644 --- a/editor/export/editor_export_platform_apple_embedded.h +++ b/editor/export/editor_export_platform_apple_embedded.h @@ -40,8 +40,8 @@ #include "core/io/zip_io.h" #include "core/os/os.h" #include "core/templates/safe_refcount.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export_platform.h" +#include "editor/settings/editor_settings.h" #include "main/splash.gen.h" #include "scene/resources/image_texture.h" diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index eb23a8487bf..12af47c4111 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -34,13 +34,13 @@ #include "core/io/json.h" #include "core/io/zip_io.h" #include "core/version.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export_preset.h" -#include "editor/progress_dialog.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/progress_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/file_dialog.h" #include "scene/gui/line_edit.h" diff --git a/editor/plugins/gdextension_export_plugin.h b/editor/export/gdextension_export_plugin.h similarity index 100% rename from editor/plugins/gdextension_export_plugin.h rename to editor/export/gdextension_export_plugin.h diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 9b25f7e2457..2af3a6350a7 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -32,15 +32,15 @@ #include "core/config/project_settings.h" #include "core/version.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" #include "editor/import/resource_importer_texture_settings.h" -#include "editor/project_settings_editor.h" +#include "editor/inspector/editor_properties.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" #include "scene/gui/item_list.h" diff --git a/editor/register_exporters.h b/editor/export/register_exporters.h similarity index 100% rename from editor/register_exporters.h rename to editor/export/register_exporters.h diff --git a/editor/plugins/shader_baker_export_plugin.cpp b/editor/export/shader_baker_export_plugin.cpp similarity index 100% rename from editor/plugins/shader_baker_export_plugin.cpp rename to editor/export/shader_baker_export_plugin.cpp diff --git a/editor/plugins/shader_baker_export_plugin.h b/editor/export/shader_baker_export_plugin.h similarity index 100% rename from editor/plugins/shader_baker_export_plugin.h rename to editor/export/shader_baker_export_plugin.h diff --git a/editor/file_system/SCsub b/editor/file_system/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/file_system/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/dependency_editor.cpp b/editor/file_system/dependency_editor.cpp similarity index 99% rename from editor/dependency_editor.cpp rename to editor/file_system/dependency_editor.cpp index c8782b7719f..15becf365d1 100644 --- a/editor/dependency_editor.cpp +++ b/editor/file_system/dependency_editor.cpp @@ -33,10 +33,10 @@ #include "core/config/project_settings.h" #include "core/io/file_access.h" #include "core/io/resource_loader.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/margin_container.h" #include "scene/gui/popup_menu.h" diff --git a/editor/dependency_editor.h b/editor/file_system/dependency_editor.h similarity index 100% rename from editor/dependency_editor.h rename to editor/file_system/dependency_editor.h diff --git a/editor/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp similarity index 99% rename from editor/editor_file_system.cpp rename to editor/file_system/editor_file_system.cpp index 5781cdb9d78..73d11351b6d 100644 --- a/editor/editor_file_system.cpp +++ b/editor/file_system/editor_file_system.cpp @@ -38,13 +38,13 @@ #include "core/object/worker_thread_pool.h" #include "core/os/os.h" #include "core/variant/variant_parser.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/project_settings_editor.h" +#include "editor/file_system/editor_paths.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "scene/resources/packed_scene.h" EditorFileSystem *EditorFileSystem::singleton = nullptr; diff --git a/editor/editor_file_system.h b/editor/file_system/editor_file_system.h similarity index 100% rename from editor/editor_file_system.h rename to editor/file_system/editor_file_system.h diff --git a/editor/editor_paths.cpp b/editor/file_system/editor_paths.cpp similarity index 100% rename from editor/editor_paths.cpp rename to editor/file_system/editor_paths.cpp diff --git a/editor/editor_paths.h b/editor/file_system/editor_paths.h similarity index 100% rename from editor/editor_paths.h rename to editor/file_system/editor_paths.h diff --git a/editor/file_info.cpp b/editor/file_system/file_info.cpp similarity index 99% rename from editor/file_info.cpp rename to editor/file_system/file_info.cpp index 04d82547ab1..e72dc428412 100644 --- a/editor/file_info.cpp +++ b/editor/file_system/file_info.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/file_info.h" +#include "file_info.h" void sort_file_info_list(List &r_file_list, FileSortOption p_file_sort_option) { // Sort the file list if needed. diff --git a/editor/file_info.h b/editor/file_system/file_info.h similarity index 100% rename from editor/file_info.h rename to editor/file_system/file_info.h diff --git a/editor/code_editor.cpp b/editor/gui/code_editor.cpp similarity index 99% rename from editor/code_editor.cpp rename to editor/gui/code_editor.cpp index 3173d43e888..1c72497787c 100644 --- a/editor/code_editor.cpp +++ b/editor/gui/code_editor.cpp @@ -34,9 +34,9 @@ #include "core/os/keyboard.h" #include "core/string/string_builder.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/check_box.h" diff --git a/editor/code_editor.h b/editor/gui/code_editor.h similarity index 100% rename from editor/code_editor.h rename to editor/gui/code_editor.h diff --git a/editor/create_dialog.cpp b/editor/gui/create_dialog.cpp similarity index 99% rename from editor/create_dialog.cpp rename to editor/gui/create_dialog.cpp index d5017db2d82..31748864b46 100644 --- a/editor/create_dialog.cpp +++ b/editor/gui/create_dialog.cpp @@ -31,11 +31,11 @@ #include "create_dialog.h" #include "core/object/class_db.h" -#include "editor/editor_feature_profile.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_current_type, const String &p_current_name) { diff --git a/editor/create_dialog.h b/editor/gui/create_dialog.h similarity index 99% rename from editor/create_dialog.h rename to editor/gui/create_dialog.h index 9e20228b7ca..0e3280e1f6e 100644 --- a/editor/create_dialog.h +++ b/editor/gui/create_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" diff --git a/editor/credits_roll.cpp b/editor/gui/credits_roll.cpp similarity index 100% rename from editor/credits_roll.cpp rename to editor/gui/credits_roll.cpp diff --git a/editor/credits_roll.h b/editor/gui/credits_roll.h similarity index 100% rename from editor/credits_roll.h rename to editor/gui/credits_roll.h diff --git a/editor/directory_create_dialog.cpp b/editor/gui/directory_create_dialog.cpp similarity index 100% rename from editor/directory_create_dialog.cpp rename to editor/gui/directory_create_dialog.cpp diff --git a/editor/directory_create_dialog.h b/editor/gui/directory_create_dialog.h similarity index 100% rename from editor/directory_create_dialog.h rename to editor/gui/directory_create_dialog.h diff --git a/editor/editor_about.cpp b/editor/gui/editor_about.cpp similarity index 99% rename from editor/editor_about.cpp rename to editor/gui/editor_about.cpp index f62f9118ab2..1f9a2a727df 100644 --- a/editor/editor_about.cpp +++ b/editor/gui/editor_about.cpp @@ -33,9 +33,9 @@ #include "core/authors.gen.h" #include "core/donors.gen.h" #include "core/license.gen.h" -#include "editor/credits_roll.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/gui/credits_roll.h" #include "editor/gui/editor_version_button.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" diff --git a/editor/editor_about.h b/editor/gui/editor_about.h similarity index 100% rename from editor/editor_about.h rename to editor/gui/editor_about.h diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp index ec8db6008ce..f27d5c29919 100644 --- a/editor/gui/editor_bottom_panel.cpp +++ b/editor/gui/editor_bottom_panel.cpp @@ -31,11 +31,11 @@ #include "editor_bottom_panel.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_toaster.h" #include "editor/gui/editor_version_button.h" +#include "editor/settings/editor_command_palette.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp index 481c8ed016b..b17d64fbef8 100644 --- a/editor/gui/editor_dir_dialog.cpp +++ b/editor/gui/editor_dir_dialog.cpp @@ -30,9 +30,9 @@ #include "editor_dir_dialog.h" -#include "editor/directory_create_dialog.h" -#include "editor/editor_file_system.h" -#include "editor/filesystem_dock.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/gui/directory_create_dialog.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/box_container.h" #include "scene/gui/tree.h" diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index 4bc4260dfe4..ce322c3d00a 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -33,12 +33,12 @@ #include "core/config/project_settings.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "editor/dependency_editor.h" -#include "editor/editor_file_system.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/dependency_editor.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/center_container.h" #include "scene/gui/check_box.h" diff --git a/editor/gui/editor_file_dialog.h b/editor/gui/editor_file_dialog.h index b9674821b11..68738a86ba3 100644 --- a/editor/gui/editor_file_dialog.h +++ b/editor/gui/editor_file_dialog.h @@ -31,7 +31,7 @@ #pragma once #include "core/io/dir_access.h" -#include "editor/file_info.h" +#include "editor/file_system/file_info.h" #include "scene/gui/dialogs.h" #include "scene/property_list_helper.h" diff --git a/editor/gui/editor_quick_open_dialog.cpp b/editor/gui/editor_quick_open_dialog.cpp index 2bc178f8c27..41218992b1c 100644 --- a/editor/gui/editor_quick_open_dialog.cpp +++ b/editor/gui/editor_quick_open_dialog.cpp @@ -32,13 +32,13 @@ #include "core/config/project_settings.h" #include "core/string/fuzzy_search.h" -#include "editor/editor_file_system.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/center_container.h" #include "scene/gui/check_button.h" diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp index 81d7250b115..cbec2af2c7d 100644 --- a/editor/gui/editor_spin_slider.cpp +++ b/editor/gui/editor_spin_slider.cpp @@ -33,7 +33,7 @@ #include "core/input/input.h" #include "core/math/expression.h" #include "core/os/keyboard.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/theme/theme_db.h" diff --git a/editor/gui/editor_toaster.cpp b/editor/gui/editor_toaster.cpp index 0b0a59e7e83..0eb7d0fb629 100644 --- a/editor/gui/editor_toaster.cpp +++ b/editor/gui/editor_toaster.cpp @@ -30,8 +30,8 @@ #include "editor_toaster.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/label.h" diff --git a/editor/gui/editor_zoom_widget.cpp b/editor/gui/editor_zoom_widget.cpp index 31857c367da..be25d19fa6a 100644 --- a/editor/gui/editor_zoom_widget.cpp +++ b/editor/gui/editor_zoom_widget.cpp @@ -31,7 +31,7 @@ #include "editor_zoom_widget.h" #include "core/os/keyboard.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" void EditorZoomWidget::_update_zoom_label() { diff --git a/editor/progress_dialog.cpp b/editor/gui/progress_dialog.cpp similarity index 100% rename from editor/progress_dialog.cpp rename to editor/gui/progress_dialog.cpp diff --git a/editor/progress_dialog.h b/editor/gui/progress_dialog.h similarity index 100% rename from editor/progress_dialog.h rename to editor/gui/progress_dialog.h diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp index 91ebc638999..854a9f6ab92 100644 --- a/editor/gui/touch_actions_panel.cpp +++ b/editor/gui/touch_actions_panel.cpp @@ -31,8 +31,8 @@ #include "touch_actions_panel.h" #include "core/input/input.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/color_rect.h" diff --git a/editor/window_wrapper.cpp b/editor/gui/window_wrapper.cpp similarity index 99% rename from editor/window_wrapper.cpp rename to editor/gui/window_wrapper.cpp index 8aed401036f..3d82dc3d323 100644 --- a/editor/window_wrapper.cpp +++ b/editor/gui/window_wrapper.cpp @@ -31,9 +31,9 @@ #include "window_wrapper.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/progress_dialog.h" +#include "editor/gui/progress_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" diff --git a/editor/window_wrapper.h b/editor/gui/window_wrapper.h similarity index 100% rename from editor/window_wrapper.h rename to editor/gui/window_wrapper.h diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index eebb8a19550..5b8c7d57233 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -36,8 +36,8 @@ #include "core/object/script_language.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/import/3d/scene_import_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/navigation/navigation_region_3d.h" diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 176ee6633b6..c58bea1b275 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -31,13 +31,13 @@ #include "scene_import_settings.h" #include "core/config/project_settings.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/plugins/skeleton_3d_editor_plugin.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/scene/3d/skeleton_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/animation/animation_player.h" diff --git a/editor/import/audio_stream_import_settings.cpp b/editor/import/audio_stream_import_settings.cpp index 724b2f61a01..b5cca46e6e3 100644 --- a/editor/import/audio_stream_import_settings.cpp +++ b/editor/import/audio_stream_import_settings.cpp @@ -29,9 +29,10 @@ /**************************************************************************/ #include "audio_stream_import_settings.h" -#include "editor/audio_stream_preview.h" -#include "editor/editor_file_system.h" + +#include "editor/audio/audio_stream_preview.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 21ac2f37c68..94b24fc2290 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -34,13 +34,13 @@ #include "core/config/project_settings.h" #include "core/string/translation.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" -#include "editor/editor_locale_dialog.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/inspector/editor_inspector.h" #include "editor/themes/editor_scale.h" +#include "editor/translations/editor_locale_dialog.h" #include "scene/gui/split_container.h" /*************************************************************************/ diff --git a/editor/editor_atlas_packer.cpp b/editor/import/editor_atlas_packer.cpp similarity index 100% rename from editor/editor_atlas_packer.cpp rename to editor/import/editor_atlas_packer.cpp diff --git a/editor/editor_atlas_packer.h b/editor/import/editor_atlas_packer.h similarity index 100% rename from editor/editor_atlas_packer.h rename to editor/import/editor_atlas_packer.h diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp index 56fcb4902be..4e1ad362a48 100644 --- a/editor/import/editor_import_plugin.cpp +++ b/editor/import/editor_import_plugin.cpp @@ -31,7 +31,7 @@ #include "editor_import_plugin.h" #include "core/object/script_language.h" -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" String EditorImportPlugin::get_importer_name() const { String ret; diff --git a/editor/fbx_importer_manager.cpp b/editor/import/fbx_importer_manager.cpp similarity index 99% rename from editor/fbx_importer_manager.cpp rename to editor/import/fbx_importer_manager.cpp index 2ea434a74e4..94af76cda9f 100644 --- a/editor/fbx_importer_manager.cpp +++ b/editor/import/fbx_importer_manager.cpp @@ -32,8 +32,8 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/link_button.h" diff --git a/editor/fbx_importer_manager.h b/editor/import/fbx_importer_manager.h similarity index 100% rename from editor/fbx_importer_manager.h rename to editor/import/fbx_importer_manager.h diff --git a/editor/import_defaults_editor.cpp b/editor/import/import_defaults_editor.cpp similarity index 98% rename from editor/import_defaults_editor.cpp rename to editor/import/import_defaults_editor.cpp index 7273ab062fc..d9422744c8a 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import/import_defaults_editor.cpp @@ -32,9 +32,9 @@ #include "core/config/project_settings.h" #include "core/io/resource_importer.h" -#include "editor/action_map_editor.h" -#include "editor/editor_inspector.h" -#include "editor/editor_sectioned_inspector.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_sectioned_inspector.h" +#include "editor/settings/action_map_editor.h" #include "scene/gui/center_container.h" #include "scene/gui/label.h" diff --git a/editor/import_defaults_editor.h b/editor/import/import_defaults_editor.h similarity index 100% rename from editor/import_defaults_editor.h rename to editor/import/import_defaults_editor.h diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp index 8109eab2561..c6b1d0d40a8 100644 --- a/editor/import/resource_importer_layered_texture.cpp +++ b/editor/import/resource_importer_layered_texture.cpp @@ -34,7 +34,7 @@ #include "core/error/error_macros.h" #include "core/io/image_loader.h" #include "core/object/ref_counted.h" -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" #include "editor/import/resource_importer_texture.h" #include "editor/import/resource_importer_texture_settings.h" #include "scene/resources/compressed_texture.h" diff --git a/editor/import/resource_importer_shader_file.cpp b/editor/import/resource_importer_shader_file.cpp index 2faa74fc62b..25bd106154c 100644 --- a/editor/import/resource_importer_shader_file.cpp +++ b/editor/import/resource_importer_shader_file.cpp @@ -33,7 +33,7 @@ #include "core/io/file_access.h" #include "core/io/resource_saver.h" #include "editor/editor_node.h" -#include "editor/plugins/shader_file_editor_plugin.h" +#include "editor/shader/shader_file_editor_plugin.h" #include "servers/rendering/rendering_device_binds.h" String ResourceImporterShaderFile::get_importer_name() const { diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 59e8c79586b..db2d760e170 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -34,10 +34,10 @@ #include "core/io/config_file.h" #include "core/io/image_loader.h" #include "core/version.h" -#include "editor/editor_file_system.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_toaster.h" #include "editor/import/resource_importer_texture_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/resources/compressed_texture.h" diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp index a327f7000f0..a439b1c6cbb 100644 --- a/editor/import/resource_importer_texture_atlas.cpp +++ b/editor/import/resource_importer_texture_atlas.cpp @@ -35,7 +35,7 @@ #include "core/io/image_loader.h" #include "core/io/resource_saver.h" #include "core/math/geometry_2d.h" -#include "editor/editor_atlas_packer.h" +#include "editor/import/editor_atlas_packer.h" #include "scene/resources/atlas_texture.h" #include "scene/resources/bit_map.h" #include "scene/resources/image_texture.h" diff --git a/editor/inspector/SCsub b/editor/inspector/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/inspector/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/add_metadata_dialog.cpp b/editor/inspector/add_metadata_dialog.cpp similarity index 100% rename from editor/add_metadata_dialog.cpp rename to editor/inspector/add_metadata_dialog.cpp diff --git a/editor/add_metadata_dialog.h b/editor/inspector/add_metadata_dialog.h similarity index 100% rename from editor/add_metadata_dialog.h rename to editor/inspector/add_metadata_dialog.h diff --git a/editor/plugins/editor_context_menu_plugin.cpp b/editor/inspector/editor_context_menu_plugin.cpp similarity index 100% rename from editor/plugins/editor_context_menu_plugin.cpp rename to editor/inspector/editor_context_menu_plugin.cpp diff --git a/editor/plugins/editor_context_menu_plugin.h b/editor/inspector/editor_context_menu_plugin.h similarity index 100% rename from editor/plugins/editor_context_menu_plugin.h rename to editor/inspector/editor_context_menu_plugin.h diff --git a/editor/editor_inspector.compat.inc b/editor/inspector/editor_inspector.compat.inc similarity index 100% rename from editor/editor_inspector.compat.inc rename to editor/inspector/editor_inspector.compat.inc diff --git a/editor/editor_inspector.cpp b/editor/inspector/editor_inspector.cpp similarity index 99% rename from editor/editor_inspector.cpp rename to editor/inspector/editor_inspector.cpp index f7977347da0..86f2db05156 100644 --- a/editor/editor_inspector.cpp +++ b/editor/inspector/editor_inspector.cpp @@ -32,21 +32,21 @@ #include "editor_inspector.compat.inc" #include "core/os/keyboard.h" -#include "editor/add_metadata_dialog.h" #include "editor/debugger/editor_debugger_inspector.h" -#include "editor/doc_tools.h" -#include "editor/editor_feature_profile.h" +#include "editor/doc/doc_tools.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/inspector_dock.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/inspector/add_metadata_dialog.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/margin_container.h" #include "scene/gui/separator.h" diff --git a/editor/editor_inspector.h b/editor/inspector/editor_inspector.h similarity index 99% rename from editor/editor_inspector.h rename to editor/inspector/editor_inspector.h index 31396e8d753..e8b18009fb0 100644 --- a/editor/editor_inspector.h +++ b/editor/inspector/editor_inspector.h @@ -30,7 +30,7 @@ #pragma once -#include "editor_property_name_processor.h" +#include "editor/inspector/editor_property_name_processor.h" #include "scene/gui/box_container.h" #include "scene/gui/panel_container.h" #include "scene/gui/scroll_container.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/inspector/editor_preview_plugins.cpp similarity index 99% rename from editor/plugins/editor_preview_plugins.cpp rename to editor/inspector/editor_preview_plugins.cpp index 5927f9d7363..52958f8b7e4 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/inspector/editor_preview_plugins.cpp @@ -34,8 +34,8 @@ #include "core/io/image.h" #include "core/io/resource_loader.h" #include "core/object/script_language.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/resources/atlas_texture.h" #include "scene/resources/bit_map.h" diff --git a/editor/plugins/editor_preview_plugins.h b/editor/inspector/editor_preview_plugins.h similarity index 99% rename from editor/plugins/editor_preview_plugins.h rename to editor/inspector/editor_preview_plugins.h index c0730fa31b4..42d8ed85665 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/inspector/editor_preview_plugins.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_resource_preview.h" +#include "editor/inspector/editor_resource_preview.h" class ScriptLanguage; diff --git a/editor/editor_properties.cpp b/editor/inspector/editor_properties.cpp similarity index 99% rename from editor/editor_properties.cpp rename to editor/inspector/editor_properties.cpp index e6e47f82cc0..1b29c3631ca 100644 --- a/editor/editor_properties.cpp +++ b/editor/inspector/editor_properties.cpp @@ -32,22 +32,22 @@ #include "core/config/project_settings.h" #include "core/input/input_map.h" -#include "editor/create_dialog.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_properties_array_dict.h" -#include "editor/editor_properties_vector.h" -#include "editor/editor_resource_picker.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/gui/create_dialog.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_spin_slider.h" #include "editor/gui/editor_variant_type_selectors.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/project_settings_editor.h" -#include "editor/property_selector.h" -#include "editor/scene_tree_dock.h" +#include "editor/inspector/editor_properties_array_dict.h" +#include "editor/inspector/editor_properties_vector.h" +#include "editor/inspector/editor_resource_picker.h" +#include "editor/inspector/property_selector.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/2d/gpu_particles_2d.h" #include "scene/3d/fog_volume.h" diff --git a/editor/editor_properties.h b/editor/inspector/editor_properties.h similarity index 99% rename from editor/editor_properties.h rename to editor/inspector/editor_properties.h index cc5b762f8d8..ed639b36b55 100644 --- a/editor/editor_properties.h +++ b/editor/inspector/editor_properties.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" class CheckBox; class ColorPickerButton; diff --git a/editor/editor_properties_array_dict.cpp b/editor/inspector/editor_properties_array_dict.cpp similarity index 99% rename from editor/editor_properties_array_dict.cpp rename to editor/inspector/editor_properties_array_dict.cpp index e8862ff9ded..09134d2d493 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/inspector/editor_properties_array_dict.cpp @@ -32,15 +32,15 @@ #include "core/input/input.h" #include "core/io/marshalls.h" -#include "editor/editor_file_system.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_properties_vector.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_spin_slider.h" #include "editor/gui/editor_variant_type_selectors.h" -#include "editor/inspector_dock.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_properties_vector.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/margin_container.h" diff --git a/editor/editor_properties_array_dict.h b/editor/inspector/editor_properties_array_dict.h similarity index 99% rename from editor/editor_properties_array_dict.h rename to editor/inspector/editor_properties_array_dict.h index 3e716eee6de..718f0610816 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/inspector/editor_properties_array_dict.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/editor_inspector.h" -#include "editor/editor_locale_dialog.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/translations/editor_locale_dialog.h" class Button; class EditorSpinSlider; diff --git a/editor/editor_properties_vector.cpp b/editor/inspector/editor_properties_vector.cpp similarity index 99% rename from editor/editor_properties_vector.cpp rename to editor/inspector/editor_properties_vector.cpp index 1bc66c0dd94..a6bfd85f3f1 100644 --- a/editor/editor_properties_vector.cpp +++ b/editor/inspector/editor_properties_vector.cpp @@ -30,9 +30,9 @@ #include "editor_properties_vector.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_spin_slider.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/texture_button.h" diff --git a/editor/editor_properties_vector.h b/editor/inspector/editor_properties_vector.h similarity index 98% rename from editor/editor_properties_vector.h rename to editor/inspector/editor_properties_vector.h index 7513662ebe1..2dceb4e6c6c 100644 --- a/editor/editor_properties_vector.h +++ b/editor/inspector/editor_properties_vector.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" class EditorSpinSlider; class TextureButton; diff --git a/editor/editor_property_name_processor.cpp b/editor/inspector/editor_property_name_processor.cpp similarity index 99% rename from editor/editor_property_name_processor.cpp rename to editor/inspector/editor_property_name_processor.cpp index 669c3115d8a..e94aff2deab 100644 --- a/editor/editor_property_name_processor.cpp +++ b/editor/inspector/editor_property_name_processor.cpp @@ -31,7 +31,7 @@ #include "editor_property_name_processor.h" #include "core/string/translation_server.h" -#include "editor_settings.h" +#include "editor/settings/editor_settings.h" EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr; diff --git a/editor/editor_property_name_processor.h b/editor/inspector/editor_property_name_processor.h similarity index 100% rename from editor/editor_property_name_processor.h rename to editor/inspector/editor_property_name_processor.h diff --git a/editor/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp similarity index 99% rename from editor/editor_resource_picker.cpp rename to editor/inspector/editor_resource_picker.cpp index 4a8df19b424..28be5655564 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/inspector/editor_resource_picker.cpp @@ -30,19 +30,19 @@ #include "editor_resource_picker.h" -#include "editor/audio_stream_preview.h" -#include "editor/editor_help.h" -#include "editor/editor_inspector.h" +#include "editor/audio/audio_stream_preview.h" +#include "editor/doc/editor_help.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_quick_open_dialog.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_resource_preview.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/scene_tree_dock.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/texture_rect.h" diff --git a/editor/editor_resource_picker.h b/editor/inspector/editor_resource_picker.h similarity index 100% rename from editor/editor_resource_picker.h rename to editor/inspector/editor_resource_picker.h diff --git a/editor/editor_resource_preview.cpp b/editor/inspector/editor_resource_preview.cpp similarity index 99% rename from editor/editor_resource_preview.cpp rename to editor/inspector/editor_resource_preview.cpp index ab6842aa5c6..68ec8b3b872 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/inspector/editor_resource_preview.cpp @@ -36,9 +36,9 @@ #include "core/io/resource_saver.h" #include "core/variant/variant_utility.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/main/window.h" #include "scene/resources/image_texture.h" diff --git a/editor/editor_resource_preview.h b/editor/inspector/editor_resource_preview.h similarity index 100% rename from editor/editor_resource_preview.h rename to editor/inspector/editor_resource_preview.h diff --git a/editor/plugins/editor_resource_tooltip_plugins.cpp b/editor/inspector/editor_resource_tooltip_plugins.cpp similarity index 98% rename from editor/plugins/editor_resource_tooltip_plugins.cpp rename to editor/inspector/editor_resource_tooltip_plugins.cpp index f8fc7aea8c2..87c62f2e965 100644 --- a/editor/plugins/editor_resource_tooltip_plugins.cpp +++ b/editor/inspector/editor_resource_tooltip_plugins.cpp @@ -30,8 +30,8 @@ #include "editor_resource_tooltip_plugins.h" -#include "editor/editor_file_system.h" -#include "editor/editor_resource_preview.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/inspector/editor_resource_preview.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" diff --git a/editor/plugins/editor_resource_tooltip_plugins.h b/editor/inspector/editor_resource_tooltip_plugins.h similarity index 100% rename from editor/plugins/editor_resource_tooltip_plugins.h rename to editor/inspector/editor_resource_tooltip_plugins.h diff --git a/editor/editor_sectioned_inspector.cpp b/editor/inspector/editor_sectioned_inspector.cpp similarity index 99% rename from editor/editor_sectioned_inspector.cpp rename to editor/inspector/editor_sectioned_inspector.cpp index 5c60ba9990e..94970896867 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/inspector/editor_sectioned_inspector.cpp @@ -30,9 +30,9 @@ #include "editor_sectioned_inspector.h" -#include "editor/editor_inspector.h" -#include "editor/editor_property_name_processor.h" #include "editor/editor_string_names.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_property_name_processor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" #include "scene/gui/line_edit.h" diff --git a/editor/editor_sectioned_inspector.h b/editor/inspector/editor_sectioned_inspector.h similarity index 100% rename from editor/editor_sectioned_inspector.h rename to editor/inspector/editor_sectioned_inspector.h diff --git a/editor/plugins/input_event_editor_plugin.cpp b/editor/inspector/input_event_editor_plugin.cpp similarity index 97% rename from editor/plugins/input_event_editor_plugin.cpp rename to editor/inspector/input_event_editor_plugin.cpp index e6fc279e690..d56adaf2edc 100644 --- a/editor/plugins/input_event_editor_plugin.cpp +++ b/editor/inspector/input_event_editor_plugin.cpp @@ -30,8 +30,8 @@ #include "input_event_editor_plugin.h" -#include "editor/event_listener_line_edit.h" -#include "editor/input_event_configuration_dialog.h" +#include "editor/settings/event_listener_line_edit.h" +#include "editor/settings/input_event_configuration_dialog.h" void InputEventConfigContainer::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/input_event_editor_plugin.h b/editor/inspector/input_event_editor_plugin.h similarity index 97% rename from editor/plugins/input_event_editor_plugin.h rename to editor/inspector/input_event_editor_plugin.h index 23fd7183c2c..ac62127bbfc 100644 --- a/editor/plugins/input_event_editor_plugin.h +++ b/editor/inspector/input_event_editor_plugin.h @@ -30,9 +30,9 @@ #pragma once -#include "editor/action_map_editor.h" -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" +#include "editor/settings/action_map_editor.h" class InputEventConfigContainer : public VBoxContainer { GDCLASS(InputEventConfigContainer, VBoxContainer); diff --git a/editor/multi_node_edit.cpp b/editor/inspector/multi_node_edit.cpp similarity index 100% rename from editor/multi_node_edit.cpp rename to editor/inspector/multi_node_edit.cpp diff --git a/editor/multi_node_edit.h b/editor/inspector/multi_node_edit.h similarity index 100% rename from editor/multi_node_edit.h rename to editor/inspector/multi_node_edit.h diff --git a/editor/property_selector.cpp b/editor/inspector/property_selector.cpp similarity index 99% rename from editor/property_selector.cpp rename to editor/inspector/property_selector.cpp index 2cbdb4ad7b1..4df46024f4f 100644 --- a/editor/property_selector.cpp +++ b/editor/inspector/property_selector.cpp @@ -30,7 +30,7 @@ #include "property_selector.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" diff --git a/editor/property_selector.h b/editor/inspector/property_selector.h similarity index 100% rename from editor/property_selector.h rename to editor/inspector/property_selector.h diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.cpp b/editor/inspector/sub_viewport_preview_editor_plugin.cpp similarity index 100% rename from editor/plugins/sub_viewport_preview_editor_plugin.cpp rename to editor/inspector/sub_viewport_preview_editor_plugin.cpp diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.h b/editor/inspector/sub_viewport_preview_editor_plugin.h similarity index 98% rename from editor/plugins/sub_viewport_preview_editor_plugin.h rename to editor/inspector/sub_viewport_preview_editor_plugin.h index c1a55cb0e55..9f7136c561a 100644 --- a/editor/plugins/sub_viewport_preview_editor_plugin.h +++ b/editor/inspector/sub_viewport_preview_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/texture_editor_plugin.h" +#include "editor/scene/texture/texture_editor_plugin.h" class EditorInspectorPluginSubViewportPreview : public EditorInspectorPluginTexture { GDCLASS(EditorInspectorPluginSubViewportPreview, EditorInspectorPluginTexture); diff --git a/editor/plugins/tool_button_editor_plugin.cpp b/editor/inspector/tool_button_editor_plugin.cpp similarity index 100% rename from editor/plugins/tool_button_editor_plugin.cpp rename to editor/inspector/tool_button_editor_plugin.cpp diff --git a/editor/plugins/tool_button_editor_plugin.h b/editor/inspector/tool_button_editor_plugin.h similarity index 98% rename from editor/plugins/tool_button_editor_plugin.h rename to editor/inspector/tool_button_editor_plugin.h index fe2c0cae921..0db3cd8ad29 100644 --- a/editor/plugins/tool_button_editor_plugin.h +++ b/editor/inspector/tool_button_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" class EditorInspectorToolButtonPlugin : public EditorInspectorPlugin { diff --git a/editor/plugins/SCsub b/editor/plugins/SCsub index 8974f5ba737..b3cff5b9dc6 100644 --- a/editor/plugins/SCsub +++ b/editor/plugins/SCsub @@ -4,7 +4,3 @@ from misc.utility.scons_hints import * Import("env") env.add_source_files(env.editor_sources, "*.cpp") - -SConscript("gizmos/SCsub") -SConscript("shader_baker/SCsub") -SConscript("tiles/SCsub") diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp index 677196368cd..e2567221363 100644 --- a/editor/plugins/editor_plugin.cpp +++ b/editor/plugins/editor_plugin.cpp @@ -32,27 +32,27 @@ #include "editor_plugin.compat.inc" #include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_dock_manager.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" +#include "editor/debugger/editor_debugger_plugin.h" +#include "editor/docks/editor_dock_manager.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" #include "editor/export/editor_export.h" #include "editor/export/editor_export_platform.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_title_bar.h" #include "editor/import/3d/resource_importer_scene.h" #include "editor/import/editor_import_plugin.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/editor_debugger_plugin.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/project_settings_editor.h" -#include "editor/scene_tree_dock.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/project_settings_editor.h" +#include "editor/translations/editor_translation_parser.h" #include "scene/3d/camera_3d.h" #include "scene/gui/popup_menu.h" diff --git a/editor/plugins/editor_plugin.h b/editor/plugins/editor_plugin.h index b2cf92c5250..70e247f0bdb 100644 --- a/editor/plugins/editor_plugin.h +++ b/editor/plugins/editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "core/io/config_file.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/gui/control.h" diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index bf9a077930c..4289307042a 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/editor/plugins/plugin_config_dialog.cpp @@ -33,11 +33,11 @@ #include "core/io/config_file.h" #include "core/io/dir_access.h" #include "core/object/script_language.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_validation_panel.h" #include "editor/plugins/editor_plugin.h" -#include "editor/project_settings_editor.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/grid_container.h" diff --git a/editor/engine_update_label.cpp b/editor/project_manager/engine_update_label.cpp similarity index 99% rename from editor/engine_update_label.cpp rename to editor/project_manager/engine_update_label.cpp index 5fa64a77038..148e80e96c3 100644 --- a/editor/engine_update_label.cpp +++ b/editor/project_manager/engine_update_label.cpp @@ -31,8 +31,8 @@ #include "engine_update_label.h" #include "core/io/json.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/main/http_request.h" bool EngineUpdateLabel::_can_check_updates() const { diff --git a/editor/engine_update_label.h b/editor/project_manager/engine_update_label.h similarity index 100% rename from editor/engine_update_label.h rename to editor/project_manager/engine_update_label.h diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index 79f05fcf4c2..36cbba622ce 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -34,12 +34,12 @@ #include "core/io/dir_access.h" #include "core/io/zip_io.h" #include "core/version.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/editor_vcs_interface.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_icons.h" #include "editor/themes/editor_scale.h" +#include "editor/version_control/editor_vcs_interface.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/line_edit.h" diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp index 996089880bb..0e72a907b6e 100644 --- a/editor/project_manager/project_list.cpp +++ b/editor/project_manager/project_list.cpp @@ -34,11 +34,11 @@ #include "core/io/dir_access.h" #include "core/os/time.h" #include "core/version.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/project_manager.h" +#include "editor/file_system/editor_paths.h" +#include "editor/project_manager/project_manager.h" #include "editor/project_manager/project_tag.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/editor/project_manager.cpp b/editor/project_manager/project_manager.cpp similarity index 99% rename from editor/project_manager.cpp rename to editor/project_manager/project_manager.cpp index d715e730955..315c3214da2 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager/project_manager.cpp @@ -37,18 +37,18 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/version.h" -#include "editor/editor_about.h" -#include "editor/editor_settings.h" +#include "editor/asset_library/asset_library_editor_plugin.h" #include "editor/editor_string_names.h" -#include "editor/engine_update_label.h" +#include "editor/gui/editor_about.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_title_bar.h" #include "editor/gui/editor_version_button.h" -#include "editor/plugins/asset_library_editor_plugin.h" +#include "editor/project_manager/engine_update_label.h" #include "editor/project_manager/project_dialog.h" #include "editor/project_manager/project_list.h" #include "editor/project_manager/project_tag.h" #include "editor/project_manager/quick_settings_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "main/main.h" diff --git a/editor/project_manager.h b/editor/project_manager/project_manager.h similarity index 100% rename from editor/project_manager.h rename to editor/project_manager/project_manager.h diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp index 82c95d6d723..103073be93a 100644 --- a/editor/project_manager/quick_settings_dialog.cpp +++ b/editor/project_manager/quick_settings_dialog.cpp @@ -31,8 +31,8 @@ #include "quick_settings_dialog.h" #include "core/string/translation_server.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/project_upgrade/SCsub b/editor/project_upgrade/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/project_upgrade/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_upgrade/project_converter_3_to_4.cpp similarity index 99% rename from editor/project_converter_3_to_4.cpp rename to editor/project_upgrade/project_converter_3_to_4.cpp index ad9276474fb..48a6f821727 100644 --- a/editor/project_converter_3_to_4.cpp +++ b/editor/project_upgrade/project_converter_3_to_4.cpp @@ -38,7 +38,7 @@ #include "core/object/ref_counted.h" #include "core/os/time.h" #include "core/templates/list.h" -#include "editor/renames_map_3_to_4.h" +#include "editor/project_upgrade/renames_map_3_to_4.h" #include "modules/regex/regex.h" diff --git a/editor/project_converter_3_to_4.h b/editor/project_upgrade/project_converter_3_to_4.h similarity index 100% rename from editor/project_converter_3_to_4.h rename to editor/project_upgrade/project_converter_3_to_4.h diff --git a/editor/project_upgrade_tool.cpp b/editor/project_upgrade/project_upgrade_tool.cpp similarity index 98% rename from editor/project_upgrade_tool.cpp rename to editor/project_upgrade/project_upgrade_tool.cpp index 22d640a016b..f2abc594206 100644 --- a/editor/project_upgrade_tool.cpp +++ b/editor/project_upgrade/project_upgrade_tool.cpp @@ -31,10 +31,10 @@ #include "project_upgrade_tool.h" #include "core/io/dir_access.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" -#include "editor/gui/editor_scene_tabs.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/scene/editor_scene_tabs.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/dialogs.h" diff --git a/editor/project_upgrade_tool.h b/editor/project_upgrade/project_upgrade_tool.h similarity index 100% rename from editor/project_upgrade_tool.h rename to editor/project_upgrade/project_upgrade_tool.h diff --git a/editor/renames_map_3_to_4.cpp b/editor/project_upgrade/renames_map_3_to_4.cpp similarity index 100% rename from editor/renames_map_3_to_4.cpp rename to editor/project_upgrade/renames_map_3_to_4.cpp diff --git a/editor/renames_map_3_to_4.h b/editor/project_upgrade/renames_map_3_to_4.h similarity index 100% rename from editor/renames_map_3_to_4.h rename to editor/project_upgrade/renames_map_3_to_4.h diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp index 0eaf0287f7d..b46299bcd09 100644 --- a/editor/register_editor_types.cpp +++ b/editor/register_editor_types.cpp @@ -31,27 +31,24 @@ #include "register_editor_types.h" #include "core/object/script_language.h" +#include "editor/animation/animation_tree_editor_plugin.h" +#include "editor/audio/audio_stream_editor_plugin.h" +#include "editor/audio/audio_stream_randomizer_editor_plugin.h" #include "editor/debugger/debug_adapter/debug_adapter_server.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_feature_profile.h" -#include "editor/editor_file_system.h" +#include "editor/debugger/editor_debugger_plugin.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_resource_picker.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_script.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/editor_vcs_interface.h" #include "editor/export/editor_export_platform.h" #include "editor/export/editor_export_platform_apple_embedded.h" #include "editor/export/editor_export_platform_extension.h" #include "editor/export/editor_export_platform_pc.h" #include "editor/export/editor_export_plugin.h" -#include "editor/filesystem_dock.h" +#include "editor/export/register_exporters.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_spin_slider.h" #include "editor/gui/editor_toaster.h" @@ -70,66 +67,69 @@ #include "editor/import/resource_importer_texture.h" #include "editor/import/resource_importer_texture_atlas.h" #include "editor/import/resource_importer_wav.h" -#include "editor/plugins/animation_tree_editor_plugin.h" -#include "editor/plugins/audio_stream_editor_plugin.h" -#include "editor/plugins/audio_stream_randomizer_editor_plugin.h" -#include "editor/plugins/bit_map_editor_plugin.h" -#include "editor/plugins/bone_map_editor_plugin.h" -#include "editor/plugins/camera_2d_editor_plugin.h" -#include "editor/plugins/camera_3d_editor_plugin.h" -#include "editor/plugins/cast_2d_editor_plugin.h" -#include "editor/plugins/collision_polygon_2d_editor_plugin.h" -#include "editor/plugins/collision_shape_2d_editor_plugin.h" -#include "editor/plugins/control_editor_plugin.h" -#include "editor/plugins/curve_editor_plugin.h" -#include "editor/plugins/editor_context_menu_plugin.h" -#include "editor/plugins/editor_debugger_plugin.h" -#include "editor/plugins/editor_resource_tooltip_plugins.h" -#include "editor/plugins/editor_script_plugin.h" -#include "editor/plugins/font_config_plugin.h" -#include "editor/plugins/gpu_particles_collision_sdf_editor_plugin.h" -#include "editor/plugins/gradient_editor_plugin.h" -#include "editor/plugins/gradient_texture_2d_editor_plugin.h" -#include "editor/plugins/input_event_editor_plugin.h" -#include "editor/plugins/light_occluder_2d_editor_plugin.h" -#include "editor/plugins/lightmap_gi_editor_plugin.h" -#include "editor/plugins/line_2d_editor_plugin.h" -#include "editor/plugins/material_editor_plugin.h" -#include "editor/plugins/mesh_editor_plugin.h" -#include "editor/plugins/mesh_instance_3d_editor_plugin.h" -#include "editor/plugins/mesh_library_editor_plugin.h" -#include "editor/plugins/multimesh_editor_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" -#include "editor/plugins/occluder_instance_3d_editor_plugin.h" -#include "editor/plugins/packed_scene_editor_plugin.h" -#include "editor/plugins/particles_editor_plugin.h" -#include "editor/plugins/path_2d_editor_plugin.h" -#include "editor/plugins/path_3d_editor_plugin.h" -#include "editor/plugins/physical_bone_3d_editor_plugin.h" -#include "editor/plugins/polygon_2d_editor_plugin.h" -#include "editor/plugins/polygon_3d_editor_plugin.h" -#include "editor/plugins/resource_preloader_editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/plugins/shader_editor_plugin.h" -#include "editor/plugins/shader_file_editor_plugin.h" -#include "editor/plugins/skeleton_2d_editor_plugin.h" -#include "editor/plugins/skeleton_3d_editor_plugin.h" -#include "editor/plugins/sprite_2d_editor_plugin.h" -#include "editor/plugins/sprite_frames_editor_plugin.h" -#include "editor/plugins/style_box_editor_plugin.h" -#include "editor/plugins/sub_viewport_preview_editor_plugin.h" -#include "editor/plugins/texture_3d_editor_plugin.h" -#include "editor/plugins/texture_editor_plugin.h" -#include "editor/plugins/texture_layered_editor_plugin.h" -#include "editor/plugins/texture_region_editor_plugin.h" -#include "editor/plugins/theme_editor_plugin.h" -#include "editor/plugins/tiles/tiles_editor_plugin.h" -#include "editor/plugins/tool_button_editor_plugin.h" -#include "editor/plugins/voxel_gi_editor_plugin.h" -#include "editor/register_exporters.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/inspector/editor_resource_picker.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/inspector/editor_resource_tooltip_plugins.h" +#include "editor/inspector/input_event_editor_plugin.h" +#include "editor/inspector/sub_viewport_preview_editor_plugin.h" +#include "editor/inspector/tool_button_editor_plugin.h" +#include "editor/scene/2d/camera_2d_editor_plugin.h" +#include "editor/scene/2d/light_occluder_2d_editor_plugin.h" +#include "editor/scene/2d/line_2d_editor_plugin.h" +#include "editor/scene/2d/path_2d_editor_plugin.h" +#include "editor/scene/2d/physics/cast_2d_editor_plugin.h" +#include "editor/scene/2d/physics/collision_polygon_2d_editor_plugin.h" +#include "editor/scene/2d/physics/collision_shape_2d_editor_plugin.h" +#include "editor/scene/2d/polygon_2d_editor_plugin.h" +#include "editor/scene/2d/skeleton_2d_editor_plugin.h" +#include "editor/scene/2d/sprite_2d_editor_plugin.h" +#include "editor/scene/2d/tiles/tiles_editor_plugin.h" +#include "editor/scene/3d/camera_3d_editor_plugin.h" +#include "editor/scene/3d/lightmap_gi_editor_plugin.h" +#include "editor/scene/3d/mesh_editor_plugin.h" +#include "editor/scene/3d/mesh_instance_3d_editor_plugin.h" +#include "editor/scene/3d/mesh_library_editor_plugin.h" +#include "editor/scene/3d/multimesh_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" +#include "editor/scene/3d/occluder_instance_3d_editor_plugin.h" +#include "editor/scene/3d/path_3d_editor_plugin.h" +#include "editor/scene/3d/physics/physical_bone_3d_editor_plugin.h" +#include "editor/scene/3d/polygon_3d_editor_plugin.h" +#include "editor/scene/3d/skeleton_3d_editor_plugin.h" +#include "editor/scene/3d/voxel_gi_editor_plugin.h" +#include "editor/scene/bone_map_editor_plugin.h" +#include "editor/scene/curve_editor_plugin.h" +#include "editor/scene/gpu_particles_collision_sdf_editor_plugin.h" +#include "editor/scene/gradient_editor_plugin.h" +#include "editor/scene/gui/control_editor_plugin.h" +#include "editor/scene/gui/font_config_plugin.h" +#include "editor/scene/gui/style_box_editor_plugin.h" +#include "editor/scene/gui/theme_editor_plugin.h" +#include "editor/scene/material_editor_plugin.h" +#include "editor/scene/packed_scene_editor_plugin.h" +#include "editor/scene/particles_editor_plugin.h" +#include "editor/scene/resource_preloader_editor_plugin.h" +#include "editor/scene/sprite_frames_editor_plugin.h" +#include "editor/scene/texture/bit_map_editor_plugin.h" +#include "editor/scene/texture/gradient_texture_2d_editor_plugin.h" +#include "editor/scene/texture/texture_3d_editor_plugin.h" +#include "editor/scene/texture/texture_editor_plugin.h" +#include "editor/scene/texture/texture_layered_editor_plugin.h" +#include "editor/scene/texture/texture_region_editor_plugin.h" +#include "editor/script/editor_script.h" +#include "editor/script/editor_script_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" +#include "editor/shader/shader_editor_plugin.h" +#include "editor/shader/shader_file_editor_plugin.h" +#include "editor/translations/editor_translation_parser.h" +#include "editor/version_control/editor_vcs_interface.h" #ifndef DISABLE_DEPRECATED -#include "editor/plugins/parallax_background_editor_plugin.h" -#include "editor/plugins/skeleton_ik_3d_editor_plugin.h" +#include "editor/scene/2d/parallax_background_editor_plugin.h" +#include "editor/scene/3d/skeleton_ik_3d_editor_plugin.h" #endif void register_editor_types() { diff --git a/editor/run/SCsub b/editor/run/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/run/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_run.cpp b/editor/run/editor_run.cpp similarity index 99% rename from editor/editor_run.cpp rename to editor/run/editor_run.cpp index c3dbcd41e7a..059032cf74a 100644 --- a/editor/editor_run.cpp +++ b/editor/run/editor_run.cpp @@ -33,8 +33,8 @@ #include "core/config/project_settings.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" -#include "editor/run_instances_dialog.h" +#include "editor/run/run_instances_dialog.h" +#include "editor/settings/editor_settings.h" #include "main/main.h" #include "servers/display_server.h" diff --git a/editor/editor_run.h b/editor/run/editor_run.h similarity index 100% rename from editor/editor_run.h rename to editor/run/editor_run.h diff --git a/editor/gui/editor_run_bar.cpp b/editor/run/editor_run_bar.cpp similarity index 99% rename from editor/gui/editor_run_bar.cpp rename to editor/run/editor_run_bar.cpp index 3a43fe5eedb..c882b783539 100644 --- a/editor/gui/editor_run_bar.cpp +++ b/editor/run/editor_run_bar.cpp @@ -33,15 +33,15 @@ #include "core/config/project_settings.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" -#include "editor/editor_run_native.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_quick_open_dialog.h" #include "editor/gui/editor_toaster.h" -#include "editor/project_settings_editor.h" +#include "editor/run/editor_run_native.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/gui/editor_run_bar.h b/editor/run/editor_run_bar.h similarity index 99% rename from editor/gui/editor_run_bar.h rename to editor/run/editor_run_bar.h index 12821b7b292..36b7f4044ad 100644 --- a/editor/gui/editor_run_bar.h +++ b/editor/run/editor_run_bar.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/editor_run.h" #include "editor/export/editor_export.h" +#include "editor/run/editor_run.h" #include "scene/gui/margin_container.h" class Button; diff --git a/editor/editor_run_native.cpp b/editor/run/editor_run_native.cpp similarity index 99% rename from editor/editor_run_native.cpp rename to editor/run/editor_run_native.cpp index 3e4594cd09d..11a8de2f49d 100644 --- a/editor/editor_run_native.cpp +++ b/editor/run/editor_run_native.cpp @@ -31,9 +31,9 @@ #include "editor_run_native.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export.h" #include "editor/export/editor_export_platform.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" void EditorRunNative::_notification(int p_what) { diff --git a/editor/editor_run_native.h b/editor/run/editor_run_native.h similarity index 100% rename from editor/editor_run_native.h rename to editor/run/editor_run_native.h diff --git a/editor/plugins/embedded_process.cpp b/editor/run/embedded_process.cpp similarity index 100% rename from editor/plugins/embedded_process.cpp rename to editor/run/embedded_process.cpp diff --git a/editor/plugins/embedded_process.h b/editor/run/embedded_process.h similarity index 100% rename from editor/plugins/embedded_process.h rename to editor/run/embedded_process.h diff --git a/editor/plugins/game_view_plugin.cpp b/editor/run/game_view_plugin.cpp similarity index 99% rename from editor/plugins/game_view_plugin.cpp rename to editor/run/game_view_plugin.cpp index 8b29c215fc3..aa8c8ca77df 100644 --- a/editor/plugins/game_view_plugin.cpp +++ b/editor/run/game_view_plugin.cpp @@ -36,17 +36,17 @@ #include "core/string/translation_server.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" -#include "editor/editor_feature_profile.h" #include "editor/editor_interface.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/plugins/embedded_process.h" +#include "editor/gui/window_wrapper.h" +#include "editor/run/editor_run_bar.h" +#include "editor/run/embedded_process.h" +#include "editor/settings/editor_feature_profile.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "editor/window_wrapper.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/game_view_plugin.h b/editor/run/game_view_plugin.h similarity index 99% rename from editor/plugins/game_view_plugin.h rename to editor/run/game_view_plugin.h index 907112027c0..d5df1406554 100644 --- a/editor/plugins/game_view_plugin.h +++ b/editor/run/game_view_plugin.h @@ -31,8 +31,8 @@ #pragma once #include "editor/debugger/editor_debugger_node.h" +#include "editor/debugger/editor_debugger_plugin.h" #include "editor/editor_main_screen.h" -#include "editor/plugins/editor_debugger_plugin.h" #include "editor/plugins/editor_plugin.h" #include "scene/debugger/scene_debugger.h" #include "scene/gui/box_container.h" diff --git a/editor/run_instances_dialog.cpp b/editor/run/run_instances_dialog.cpp similarity index 99% rename from editor/run_instances_dialog.cpp rename to editor/run/run_instances_dialog.cpp index 2597d161ec7..f09ad218bb4 100644 --- a/editor/run_instances_dialog.cpp +++ b/editor/run/run_instances_dialog.cpp @@ -31,7 +31,7 @@ #include "run_instances_dialog.h" #include "core/config/project_settings.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" diff --git a/editor/run_instances_dialog.h b/editor/run/run_instances_dialog.h similarity index 100% rename from editor/run_instances_dialog.h rename to editor/run/run_instances_dialog.h diff --git a/editor/scene/2d/SCsub b/editor/scene/2d/SCsub new file mode 100644 index 00000000000..91b24a965b2 --- /dev/null +++ b/editor/scene/2d/SCsub @@ -0,0 +1,9 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") + +SConscript("physics/SCsub") +SConscript("tiles/SCsub") diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/scene/2d/abstract_polygon_2d_editor.cpp similarity index 99% rename from editor/plugins/abstract_polygon_2d_editor.cpp rename to editor/scene/2d/abstract_polygon_2d_editor.cpp index a91bdcbd7fa..5a6994f1923 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/scene/2d/abstract_polygon_2d_editor.cpp @@ -30,13 +30,13 @@ #include "abstract_polygon_2d_editor.h" -#include "canvas_item_editor_plugin.h" #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/scene/2d/abstract_polygon_2d_editor.h similarity index 100% rename from editor/plugins/abstract_polygon_2d_editor.h rename to editor/scene/2d/abstract_polygon_2d_editor.h diff --git a/editor/plugins/camera_2d_editor_plugin.cpp b/editor/scene/2d/camera_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/camera_2d_editor_plugin.cpp rename to editor/scene/2d/camera_2d_editor_plugin.cpp index f7dcc49f46e..7d7a23b4ee2 100644 --- a/editor/plugins/camera_2d_editor_plugin.cpp +++ b/editor/scene/2d/camera_2d_editor_plugin.cpp @@ -30,10 +30,10 @@ #include "camera_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/config/project_settings.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/2d/camera_2d.h" #include "scene/gui/label.h" diff --git a/editor/plugins/camera_2d_editor_plugin.h b/editor/scene/2d/camera_2d_editor_plugin.h similarity index 100% rename from editor/plugins/camera_2d_editor_plugin.h rename to editor/scene/2d/camera_2d_editor_plugin.h diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/scene/2d/light_occluder_2d_editor_plugin.cpp similarity index 100% rename from editor/plugins/light_occluder_2d_editor_plugin.cpp rename to editor/scene/2d/light_occluder_2d_editor_plugin.cpp diff --git a/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/scene/2d/light_occluder_2d_editor_plugin.h similarity index 98% rename from editor/plugins/light_occluder_2d_editor_plugin.h rename to editor/scene/2d/light_occluder_2d_editor_plugin.h index 2ff254b5ed1..8749ea17f6d 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.h +++ b/editor/scene/2d/light_occluder_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" #include "scene/2d/light_occluder_2d.h" class LightOccluder2DEditor : public AbstractPolygon2DEditor { diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/scene/2d/line_2d_editor_plugin.cpp similarity index 100% rename from editor/plugins/line_2d_editor_plugin.cpp rename to editor/scene/2d/line_2d_editor_plugin.cpp diff --git a/editor/plugins/line_2d_editor_plugin.h b/editor/scene/2d/line_2d_editor_plugin.h similarity index 98% rename from editor/plugins/line_2d_editor_plugin.h rename to editor/scene/2d/line_2d_editor_plugin.h index 2707da6b617..a30fcba1f79 100644 --- a/editor/plugins/line_2d_editor_plugin.h +++ b/editor/scene/2d/line_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" #include "scene/2d/line_2d.h" class Line2DEditor : public AbstractPolygon2DEditor { diff --git a/editor/plugins/parallax_background_editor_plugin.cpp b/editor/scene/2d/parallax_background_editor_plugin.cpp similarity index 98% rename from editor/plugins/parallax_background_editor_plugin.cpp rename to editor/scene/2d/parallax_background_editor_plugin.cpp index b15232e8225..f079bef8f55 100644 --- a/editor/plugins/parallax_background_editor_plugin.cpp +++ b/editor/scene/2d/parallax_background_editor_plugin.cpp @@ -30,10 +30,10 @@ #include "parallax_background_editor_plugin.h" -#include "canvas_item_editor_plugin.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/scene_tree_dock.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "scene/2d/parallax_2d.h" #include "scene/2d/parallax_background.h" #include "scene/2d/parallax_layer.h" diff --git a/editor/plugins/parallax_background_editor_plugin.h b/editor/scene/2d/parallax_background_editor_plugin.h similarity index 100% rename from editor/plugins/parallax_background_editor_plugin.h rename to editor/scene/2d/parallax_background_editor_plugin.h diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/scene/2d/path_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/path_2d_editor_plugin.cpp rename to editor/scene/2d/path_2d_editor_plugin.cpp index c13e977ae6d..e9f0c42d27f 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/scene/2d/path_2d_editor_plugin.cpp @@ -30,11 +30,11 @@ #include "path_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/scene/2d/path_2d_editor_plugin.h similarity index 100% rename from editor/plugins/path_2d_editor_plugin.h rename to editor/scene/2d/path_2d_editor_plugin.h diff --git a/editor/scene/2d/physics/SCsub b/editor/scene/2d/physics/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/2d/physics/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/cast_2d_editor_plugin.cpp b/editor/scene/2d/physics/cast_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/cast_2d_editor_plugin.cpp rename to editor/scene/2d/physics/cast_2d_editor_plugin.cpp index 3839671e21d..79b91a0aadc 100644 --- a/editor/plugins/cast_2d_editor_plugin.cpp +++ b/editor/scene/2d/physics/cast_2d_editor_plugin.cpp @@ -30,9 +30,9 @@ #include "cast_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "scene/2d/physics/ray_cast_2d.h" #include "scene/2d/physics/shape_cast_2d.h" #include "scene/main/viewport.h" diff --git a/editor/plugins/cast_2d_editor_plugin.h b/editor/scene/2d/physics/cast_2d_editor_plugin.h similarity index 100% rename from editor/plugins/cast_2d_editor_plugin.h rename to editor/scene/2d/physics/cast_2d_editor_plugin.h diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/scene/2d/physics/collision_polygon_2d_editor_plugin.cpp similarity index 100% rename from editor/plugins/collision_polygon_2d_editor_plugin.cpp rename to editor/scene/2d/physics/collision_polygon_2d_editor_plugin.cpp diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/scene/2d/physics/collision_polygon_2d_editor_plugin.h similarity index 98% rename from editor/plugins/collision_polygon_2d_editor_plugin.h rename to editor/scene/2d/physics/collision_polygon_2d_editor_plugin.h index 34b7ca0e7d0..3317cbf0a29 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.h +++ b/editor/scene/2d/physics/collision_polygon_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" #include "scene/2d/physics/collision_polygon_2d.h" class CollisionPolygon2DEditor : public AbstractPolygon2DEditor { diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/collision_shape_2d_editor_plugin.cpp rename to editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp index 0b8ffa833c1..16aa2d6dc7d 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp @@ -30,11 +30,11 @@ #include "collision_shape_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/main/viewport.h" #include "scene/resources/2d/capsule_shape_2d.h" #include "scene/resources/2d/circle_shape_2d.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/scene/2d/physics/collision_shape_2d_editor_plugin.h similarity index 100% rename from editor/plugins/collision_shape_2d_editor_plugin.h rename to editor/scene/2d/physics/collision_shape_2d_editor_plugin.h diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/scene/2d/polygon_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/polygon_2d_editor_plugin.cpp rename to editor/scene/2d/polygon_2d_editor_plugin.cpp index c2d2af5402c..6b97d44e400 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/scene/2d/polygon_2d_editor_plugin.cpp @@ -32,13 +32,13 @@ #include "core/input/input_event.h" #include "core/math/geometry_2d.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_zoom_widget.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/check_box.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/scene/2d/polygon_2d_editor_plugin.h similarity index 99% rename from editor/plugins/polygon_2d_editor_plugin.h rename to editor/scene/2d/polygon_2d_editor_plugin.h index bbdf7924d70..4d27efc1bbd 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/scene/2d/polygon_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" #include "scene/2d/polygon_2d.h" class AcceptDialog; diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/scene/2d/skeleton_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/skeleton_2d_editor_plugin.cpp rename to editor/scene/2d/skeleton_2d_editor_plugin.cpp index a0426e8fdaf..fd61c5bca67 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/scene/2d/skeleton_2d_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/scene/2d/skeleton_2d_editor_plugin.h similarity index 100% rename from editor/plugins/skeleton_2d_editor_plugin.h rename to editor/scene/2d/skeleton_2d_editor_plugin.h diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp similarity index 99% rename from editor/plugins/sprite_2d_editor_plugin.cpp rename to editor/scene/2d/sprite_2d_editor_plugin.cpp index a5f88dc6c73..fb529223e73 100644 --- a/editor/plugins/sprite_2d_editor_plugin.cpp +++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp @@ -30,13 +30,13 @@ #include "sprite_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/math/geometry_2d.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_zoom_widget.h" -#include "editor/scene_tree_dock.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/mesh_instance_2d.h" diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/scene/2d/sprite_2d_editor_plugin.h similarity index 100% rename from editor/plugins/sprite_2d_editor_plugin.h rename to editor/scene/2d/sprite_2d_editor_plugin.h diff --git a/editor/scene/2d/tiles/SCsub b/editor/scene/2d/tiles/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/2d/tiles/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/scene/2d/tiles/atlas_merging_dialog.cpp similarity index 100% rename from editor/plugins/tiles/atlas_merging_dialog.cpp rename to editor/scene/2d/tiles/atlas_merging_dialog.cpp diff --git a/editor/plugins/tiles/atlas_merging_dialog.h b/editor/scene/2d/tiles/atlas_merging_dialog.h similarity index 98% rename from editor/plugins/tiles/atlas_merging_dialog.h rename to editor/scene/2d/tiles/atlas_merging_dialog.h index 99d23330706..92b4c30a5d8 100644 --- a/editor/plugins/tiles/atlas_merging_dialog.h +++ b/editor/scene/2d/tiles/atlas_merging_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" #include "scene/gui/texture_rect.h" diff --git a/editor/plugins/tiles/tile_atlas_view.cpp b/editor/scene/2d/tiles/tile_atlas_view.cpp similarity index 99% rename from editor/plugins/tiles/tile_atlas_view.cpp rename to editor/scene/2d/tiles/tile_atlas_view.cpp index e2c2c391ca7..ad43ecf1862 100644 --- a/editor/plugins/tiles/tile_atlas_view.cpp +++ b/editor/scene/2d/tiles/tile_atlas_view.cpp @@ -30,7 +30,7 @@ #include "tile_atlas_view.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map_layer.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/tiles/tile_atlas_view.h b/editor/scene/2d/tiles/tile_atlas_view.h similarity index 100% rename from editor/plugins/tiles/tile_atlas_view.h rename to editor/scene/2d/tiles/tile_atlas_view.h diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp similarity index 99% rename from editor/plugins/tiles/tile_data_editors.cpp rename to editor/scene/2d/tiles/tile_data_editors.cpp index cbbf4071e80..609d51987c9 100644 --- a/editor/plugins/tiles/tile_data_editors.cpp +++ b/editor/scene/2d/tiles/tile_data_editors.cpp @@ -37,10 +37,10 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_properties.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/control.h" diff --git a/editor/plugins/tiles/tile_data_editors.h b/editor/scene/2d/tiles/tile_data_editors.h similarity index 99% rename from editor/plugins/tiles/tile_data_editors.h rename to editor/scene/2d/tiles/tile_data_editors.h index 85eae74d5f9..47fdf403875 100644 --- a/editor/plugins/tiles/tile_data_editors.h +++ b/editor/scene/2d/tiles/tile_data_editors.h @@ -32,7 +32,7 @@ #include "tile_atlas_view.h" -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "scene/gui/box_container.h" class Label; diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/scene/2d/tiles/tile_map_layer_editor.cpp similarity index 99% rename from editor/plugins/tiles/tile_map_layer_editor.cpp rename to editor/scene/2d/tiles/tile_map_layer_editor.cpp index 5d42115c3cc..43f12473f13 100644 --- a/editor/plugins/tiles/tile_map_layer_editor.cpp +++ b/editor/scene/2d/tiles/tile_map_layer_editor.cpp @@ -33,11 +33,11 @@ #include "tiles_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map.h" #include "scene/2d/tile_map_layer.h" diff --git a/editor/plugins/tiles/tile_map_layer_editor.h b/editor/scene/2d/tiles/tile_map_layer_editor.h similarity index 100% rename from editor/plugins/tiles/tile_map_layer_editor.h rename to editor/scene/2d/tiles/tile_map_layer_editor.h diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp similarity index 99% rename from editor/plugins/tiles/tile_proxies_manager_dialog.cpp rename to editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp index 91e3557387a..5e38bc586d5 100644 --- a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp +++ b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp @@ -30,9 +30,9 @@ #include "tile_proxies_manager_dialog.h" -#include "editor/editor_properties_vector.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_properties_vector.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/popup_menu.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.h b/editor/scene/2d/tiles/tile_proxies_manager_dialog.h similarity index 98% rename from editor/plugins/tiles/tile_proxies_manager_dialog.h rename to editor/scene/2d/tiles/tile_proxies_manager_dialog.h index 0408f7da061..70a05e062c1 100644 --- a/editor/plugins/tiles/tile_proxies_manager_dialog.h +++ b/editor/scene/2d/tiles/tile_proxies_manager_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" #include "scene/resources/2d/tile_set.h" diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp similarity index 99% rename from editor/plugins/tiles/tile_set_atlas_source_editor.cpp rename to editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp index c8612f15e35..30716e05c38 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp @@ -32,13 +32,13 @@ #include "tiles_editor_plugin.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_toaster.h" -#include "editor/plugins/tiles/tile_set_editor.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/scene/2d/tiles/tile_set_editor.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.h b/editor/scene/2d/tiles/tile_set_atlas_source_editor.h similarity index 100% rename from editor/plugins/tiles/tile_set_atlas_source_editor.h rename to editor/scene/2d/tiles/tile_set_atlas_source_editor.h diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/scene/2d/tiles/tile_set_editor.cpp similarity index 99% rename from editor/plugins/tiles/tile_set_editor.cpp rename to editor/scene/2d/tiles/tile_set_editor.cpp index 61d2deff56a..7e7df062219 100644 --- a/editor/plugins/tiles/tile_set_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_editor.cpp @@ -33,12 +33,12 @@ #include "tile_data_editors.h" #include "tiles_editor_plugin.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/tiles/tile_set_editor.h b/editor/scene/2d/tiles/tile_set_editor.h similarity index 100% rename from editor/plugins/tiles/tile_set_editor.h rename to editor/scene/2d/tiles/tile_set_editor.h diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp similarity index 99% rename from editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp rename to editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp index 1b04f777808..83255456c99 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp @@ -30,13 +30,13 @@ #include "tile_set_scenes_collection_source_editor.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/plugins/tiles/tile_set_editor.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/scene/2d/tiles/tile_set_editor.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h similarity index 99% rename from editor/plugins/tiles/tile_set_scenes_collection_source_editor.h rename to editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h index 396754e8a9c..11271873cd1 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h +++ b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/box_container.h" #include "scene/resources/2d/tile_set.h" diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/scene/2d/tiles/tiles_editor_plugin.cpp similarity index 99% rename from editor/plugins/tiles/tiles_editor_plugin.cpp rename to editor/scene/2d/tiles/tiles_editor_plugin.cpp index 610f7d0129e..f8987261b1d 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.cpp +++ b/editor/scene/2d/tiles/tiles_editor_plugin.cpp @@ -34,14 +34,14 @@ #include "core/os/mutex.h" -#include "editor/editor_command_palette.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map.h" #include "scene/2d/tile_map_layer.h" diff --git a/editor/plugins/tiles/tiles_editor_plugin.h b/editor/scene/2d/tiles/tiles_editor_plugin.h similarity index 100% rename from editor/plugins/tiles/tiles_editor_plugin.h rename to editor/scene/2d/tiles/tiles_editor_plugin.h diff --git a/editor/scene/3d/SCsub b/editor/scene/3d/SCsub new file mode 100644 index 00000000000..f7d80e48ae9 --- /dev/null +++ b/editor/scene/3d/SCsub @@ -0,0 +1,9 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") + +SConscript("gizmos/SCsub") +SConscript("physics/SCsub") diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/scene/3d/camera_3d_editor_plugin.cpp similarity index 100% rename from editor/plugins/camera_3d_editor_plugin.cpp rename to editor/scene/3d/camera_3d_editor_plugin.cpp diff --git a/editor/plugins/camera_3d_editor_plugin.h b/editor/scene/3d/camera_3d_editor_plugin.h similarity index 98% rename from editor/plugins/camera_3d_editor_plugin.h rename to editor/scene/3d/camera_3d_editor_plugin.h index 4a05eaf99cb..602ec20c1f3 100644 --- a/editor/plugins/camera_3d_editor_plugin.h +++ b/editor/scene/3d/camera_3d_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/texture_editor_plugin.h" +#include "editor/scene/texture/texture_editor_plugin.h" class Camera3D; class SubViewport; diff --git a/editor/scene/3d/gizmos/SCsub b/editor/scene/3d/gizmos/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/3d/gizmos/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.h index 77445d0da99..490daf515f7 100644 --- a/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class AudioListener3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(AudioListener3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp index 610ac60fc83..9361d3b489d 100644 --- a/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp @@ -31,9 +31,9 @@ #include "audio_stream_player_3d_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/audio_stream_player_3d.h" AudioStreamPlayer3DGizmoPlugin::AudioStreamPlayer3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.h index 9cbaef14da6..1ce06902757 100644 --- a/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class AudioStreamPlayer3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(AudioStreamPlayer3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp index f8a83322eba..61bbf5f602a 100644 --- a/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp @@ -31,10 +31,10 @@ #include "camera_3d_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/camera_3d.h" Camera3DGizmoPlugin::Camera3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/camera_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/camera_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/camera_3d_gizmo_plugin.h index 26156f29ed2..181b641da04 100644 --- a/editor/plugins/gizmos/camera_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Camera3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Camera3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/collision_object_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h index 69fa12a656f..e53e2ad0479 100644 --- a/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class CollisionObject3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(CollisionObject3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h index 7d6edcd94ca..63701df4907 100644 --- a/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class CollisionPolygon3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(CollisionPolygon3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp index 957979bc2dc..61ce34031ff 100644 --- a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp @@ -33,8 +33,8 @@ #include "core/math/convex_hull.h" #include "core/math/geometry_3d.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/physics/collision_shape_3d.h" #include "scene/resources/3d/box_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h" diff --git a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h index 2f19f0b7051..e63c6fd736a 100644 --- a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.cpp index 77f30384482..058f4fcc9c7 100644 --- a/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.cpp @@ -31,8 +31,8 @@ #include "cpu_particles_3d_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/cpu_particles_3d.h" CPUParticles3DGizmoPlugin::CPUParticles3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.h index 19dc4965376..ec7da05aca4 100644 --- a/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class CPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(CPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/decal_gizmo_plugin.cpp b/editor/scene/3d/gizmos/decal_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/decal_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/decal_gizmo_plugin.cpp index 6d6b5648725..f0597fbfa35 100644 --- a/editor/plugins/gizmos/decal_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/decal_gizmo_plugin.cpp @@ -31,9 +31,9 @@ #include "decal_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/decal.h" DecalGizmoPlugin::DecalGizmoPlugin() { diff --git a/editor/plugins/gizmos/decal_gizmo_plugin.h b/editor/scene/3d/gizmos/decal_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/decal_gizmo_plugin.h rename to editor/scene/3d/gizmos/decal_gizmo_plugin.h index 448b5c2e145..d85ab7cfdd2 100644 --- a/editor/plugins/gizmos/decal_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/decal_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp b/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp index a9572e9be31..286909a3849 100644 --- a/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp @@ -31,9 +31,9 @@ #include "fog_volume_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/fog_volume.h" FogVolumeGizmoPlugin::FogVolumeGizmoPlugin() { diff --git a/editor/plugins/gizmos/fog_volume_gizmo_plugin.h b/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/fog_volume_gizmo_plugin.h rename to editor/scene/3d/gizmos/fog_volume_gizmo_plugin.h index 998bda13f45..b24cabd299c 100644 --- a/editor/plugins/gizmos/fog_volume_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.cpp index c12b14f643b..026e5d48e6e 100644 --- a/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.cpp @@ -30,7 +30,7 @@ #include "geometry_instance_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/visual_instance_3d.h" bool GeometryInstance3DGizmoPlugin::has_gizmo(Node3D *p_spatial) { diff --git a/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.h index f9b7524f409..6c065ea2aa2 100644 --- a/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class GeometryInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(GeometryInstance3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/gizmo_3d_helper.cpp b/editor/scene/3d/gizmos/gizmo_3d_helper.cpp similarity index 99% rename from editor/plugins/gizmos/gizmo_3d_helper.cpp rename to editor/scene/3d/gizmos/gizmo_3d_helper.cpp index 220ddea206d..57f27e45685 100644 --- a/editor/plugins/gizmos/gizmo_3d_helper.cpp +++ b/editor/scene/3d/gizmos/gizmo_3d_helper.cpp @@ -31,7 +31,7 @@ #include "gizmo_3d_helper.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" void Gizmo3DHelper::initialize_handle_action(const Variant &p_initial_value, const Transform3D &p_initial_transform) { diff --git a/editor/plugins/gizmos/gizmo_3d_helper.h b/editor/scene/3d/gizmos/gizmo_3d_helper.h similarity index 100% rename from editor/plugins/gizmos/gizmo_3d_helper.h rename to editor/scene/3d/gizmos/gizmo_3d_helper.h diff --git a/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.cpp index 18c66edd055..0a619bd8180 100644 --- a/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.cpp @@ -31,8 +31,8 @@ #include "gpu_particles_3d_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/gpu_particles_3d.h" GPUParticles3DGizmoPlugin::GPUParticles3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.h index 6a23bba7572..19f44661678 100644 --- a/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class GPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(GPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp index e52178e8091..54dd9ca47df 100644 --- a/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp @@ -30,10 +30,10 @@ #include "gpu_particles_collision_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/gpu_particles_collision_3d.h" GPUParticlesCollision3DGizmoPlugin::GPUParticlesCollision3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.h index 33b3ddbccf6..09504373e6a 100644 --- a/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/joint_3d_gizmo_plugin.cpp index 6e598bc78d8..32b59def3b4 100644 --- a/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.cpp @@ -31,7 +31,7 @@ #include "joint_3d_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/physics/joints/cone_twist_joint_3d.h" #include "scene/3d/physics/joints/generic_6dof_joint_3d.h" #include "scene/3d/physics/joints/hinge_joint_3d.h" diff --git a/editor/plugins/gizmos/joint_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h similarity index 99% rename from editor/plugins/gizmos/joint_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h index 1af50c7f9ca..0b58fcdb88d 100644 --- a/editor/plugins/gizmos/joint_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Joint3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Joint3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/label_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/label_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/label_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/label_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/label_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/label_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/label_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/label_3d_gizmo_plugin.h index f23698cc62a..89d6e73c444 100644 --- a/editor/plugins/gizmos/label_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/label_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Label3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Label3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/light_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp index 56bfae69b95..6154d8f73d7 100644 --- a/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp @@ -33,7 +33,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/light_3d.h" Light3DGizmoPlugin::Light3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/light_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/light_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/light_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/light_3d_gizmo_plugin.h index b301d5d7020..025f0065dcd 100644 --- a/editor/plugins/gizmos/light_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/light_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Light3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Light3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp b/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp index 7eb205803a0..88dbea6a200 100644 --- a/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp @@ -31,8 +31,8 @@ #include "lightmap_gi_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/lightmap_gi.h" LightmapGIGizmoPlugin::LightmapGIGizmoPlugin() { diff --git a/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h b/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h rename to editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.h index 882be1c7eff..5b8aaf75483 100644 --- a/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class LightmapGIGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(LightmapGIGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp b/editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.cpp index c01b3592f2b..6fac686ae63 100644 --- a/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.cpp @@ -31,8 +31,8 @@ #include "lightmap_probe_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/lightmap_probe.h" LightmapProbeGizmoPlugin::LightmapProbeGizmoPlugin() { diff --git a/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h b/editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h rename to editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.h index a17d9b9c840..d69ae54b6fe 100644 --- a/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class LightmapProbeGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(LightmapProbeGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/marker_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/marker_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/marker_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/marker_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/marker_3d_gizmo_plugin.h index bd7834311db..ac1c99fdfce 100644 --- a/editor/plugins/gizmos/marker_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Marker3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Marker3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp index 4a84aa8ea8d..e65050d7279 100644 --- a/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp @@ -30,7 +30,7 @@ #include "mesh_instance_3d_gizmo_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics/soft_body_3d.h" #include "scene/resources/3d/primitive_meshes.h" diff --git a/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h index bd87ff4ddf1..7589aa9561b 100644 --- a/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class MeshInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(MeshInstance3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp index fbe72b5f803..0c57fac8908 100644 --- a/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp @@ -30,9 +30,9 @@ #include "occluder_instance_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/occluder_instance_3d.h" OccluderInstance3DGizmoPlugin::OccluderInstance3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.h index 4c5763f070e..3c8bcd98825 100644 --- a/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class OccluderInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(OccluderInstance3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp index 65861b89ca4..5183115ceb5 100644 --- a/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp @@ -31,10 +31,10 @@ #include "particles_3d_emission_shape_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/cpu_particles_3d.h" #include "scene/3d/gpu_particles_3d.h" #include "scene/resources/3d/primitive_meshes.h" diff --git a/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.h similarity index 96% rename from editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h rename to editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.h index 2efa8a1f8f7..7b6352dacd8 100644 --- a/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/plugins/gizmos/gizmo_3d_helper.h" -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Particles3DEmissionShapeGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(Particles3DEmissionShapeGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp index 8a0d4fd3e62..b3a65e9a247 100644 --- a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp @@ -30,8 +30,8 @@ #include "physics_bone_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" -#include "editor/plugins/gizmos/joint_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/physics/physical_bone_3d.h" #include "scene/3d/physics/physical_bone_simulator_3d.h" diff --git a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h index b617eaff12b..e43e35efa75 100644 --- a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class PhysicalBone3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(PhysicalBone3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h index 0233bd96d4b..7832b02147c 100644 --- a/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class RayCast3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(RayCast3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp b/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp index 483220b74ab..5310076ef25 100644 --- a/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp @@ -31,11 +31,11 @@ #include "reflection_probe_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/reflection_probe.h" ReflectionProbeGizmoPlugin::ReflectionProbeGizmoPlugin() { diff --git a/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h b/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/reflection_probe_gizmo_plugin.h rename to editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h index 788d21a9f0b..214e02a1997 100644 --- a/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h index 3c1c1dc1daa..84e228c17d2 100644 --- a/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class ShapeCast3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(ShapeCast3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h index 95b5b4249d1..c6d0cfd1dbe 100644 --- a/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class SoftBody3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(SoftBody3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h index 91fd64d2625..8082daeb472 100644 --- a/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class SpringArm3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(SpringArm3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp similarity index 99% rename from editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp index d1e7f6ead77..cd51b411beb 100644 --- a/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp @@ -30,7 +30,7 @@ #include "spring_bone_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/spring_bone_collision_capsule_3d.h" #include "scene/3d/spring_bone_collision_plane_3d.h" #include "scene/3d/spring_bone_collision_sphere_3d.h" diff --git a/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h index 41943ed44d1..f38b998cbd1 100644 --- a/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/spring_bone_collision_3d.h" #include "scene/3d/spring_bone_simulator_3d.h" #include "scene/resources/surface_tool.h" diff --git a/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h index 5f65a9834e1..64fb4688ed9 100644 --- a/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class SpriteBase3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(SpriteBase3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h index 16e13a9be4b..8b2ce7e1e8f 100644 --- a/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class VehicleWheel3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(VehicleWheel3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp index 2d40e66811c..9b1cc54b3d2 100644 --- a/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp @@ -30,9 +30,9 @@ #include "visible_on_screen_notifier_3d_gizmo_plugin.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/visible_on_screen_notifier_3d.h" VisibleOnScreenNotifier3DGizmoPlugin::VisibleOnScreenNotifier3DGizmoPlugin() { diff --git a/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h rename to editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h index 3fa89a34f91..2236b356a5f 100644 --- a/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class VisibleOnScreenNotifier3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(VisibleOnScreenNotifier3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp b/editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.cpp similarity index 98% rename from editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp rename to editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.cpp index 485337063d8..913c42a9bae 100644 --- a/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.cpp @@ -31,9 +31,9 @@ #include "voxel_gi_gizmo_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/voxel_gi.h" VoxelGIGizmoPlugin::VoxelGIGizmoPlugin() { diff --git a/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h b/editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h similarity index 98% rename from editor/plugins/gizmos/voxel_gi_gizmo_plugin.h rename to editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h index e68e316515f..6a01c3c6b11 100644 --- a/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class Gizmo3DHelper; diff --git a/editor/plugins/lightmap_gi_editor_plugin.cpp b/editor/scene/3d/lightmap_gi_editor_plugin.cpp similarity index 100% rename from editor/plugins/lightmap_gi_editor_plugin.cpp rename to editor/scene/3d/lightmap_gi_editor_plugin.cpp diff --git a/editor/plugins/lightmap_gi_editor_plugin.h b/editor/scene/3d/lightmap_gi_editor_plugin.h similarity index 100% rename from editor/plugins/lightmap_gi_editor_plugin.h rename to editor/scene/3d/lightmap_gi_editor_plugin.h diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/scene/3d/mesh_editor_plugin.cpp similarity index 100% rename from editor/plugins/mesh_editor_plugin.cpp rename to editor/scene/3d/mesh_editor_plugin.cpp diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/scene/3d/mesh_editor_plugin.h similarity index 98% rename from editor/plugins/mesh_editor_plugin.h rename to editor/scene/3d/mesh_editor_plugin.h index 36ec6cd404a..2091f74a881 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/scene/3d/mesh_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/3d/light_3d.h" diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/mesh_instance_3d_editor_plugin.cpp rename to editor/scene/3d/mesh_instance_3d_editor_plugin.cpp index 8cfe819516b..6c78f61c149 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp @@ -33,8 +33,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/3d/navigation/navigation_region_3d.h" #include "scene/3d/physics/collision_shape_3d.h" diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/scene/3d/mesh_instance_3d_editor_plugin.h similarity index 100% rename from editor/plugins/mesh_instance_3d_editor_plugin.h rename to editor/scene/3d/mesh_instance_3d_editor_plugin.h diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/scene/3d/mesh_library_editor_plugin.cpp similarity index 99% rename from editor/plugins/mesh_library_editor_plugin.cpp rename to editor/scene/3d/mesh_library_editor_plugin.cpp index 7c997787e55..12aa704da62 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/scene/3d/mesh_library_editor_plugin.cpp @@ -30,13 +30,13 @@ #include "mesh_library_editor_plugin.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "main/main.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/navigation/navigation_region_3d.h" diff --git a/editor/plugins/mesh_library_editor_plugin.h b/editor/scene/3d/mesh_library_editor_plugin.h similarity index 100% rename from editor/plugins/mesh_library_editor_plugin.h rename to editor/scene/3d/mesh_library_editor_plugin.h diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/scene/3d/multimesh_editor_plugin.cpp similarity index 99% rename from editor/plugins/multimesh_editor_plugin.cpp rename to editor/scene/3d/multimesh_editor_plugin.cpp index a56690e6d59..9c3e6a13802 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/scene/3d/multimesh_editor_plugin.cpp @@ -32,8 +32,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/scene_tree_editor.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/box_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/scene/3d/multimesh_editor_plugin.h similarity index 100% rename from editor/plugins/multimesh_editor_plugin.h rename to editor/scene/3d/multimesh_editor_plugin.h diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/scene/3d/node_3d_editor_gizmos.cpp similarity index 99% rename from editor/plugins/node_3d_editor_gizmos.cpp rename to editor/scene/3d/node_3d_editor_gizmos.cpp index f4554685450..a2c836d02a0 100644 --- a/editor/plugins/node_3d_editor_gizmos.cpp +++ b/editor/scene/3d/node_3d_editor_gizmos.cpp @@ -33,9 +33,9 @@ #include "core/math/geometry_2d.h" #include "core/math/geometry_3d.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/resources/3d/primitive_meshes.h" #define HANDLE_HALF_SIZE 9.5 diff --git a/editor/plugins/node_3d_editor_gizmos.h b/editor/scene/3d/node_3d_editor_gizmos.h similarity index 100% rename from editor/plugins/node_3d_editor_gizmos.h rename to editor/scene/3d/node_3d_editor_gizmos.h diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/node_3d_editor_plugin.cpp rename to editor/scene/3d/node_3d_editor_plugin.cpp index dfbf3d5582e..9039bd0a805 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/scene/3d/node_3d_editor_plugin.cpp @@ -36,51 +36,51 @@ #include "core/math/math_funcs.h" #include "core/math/projection.h" #include "core/os/keyboard.h" +#include "editor/animation/animation_player_editor_plugin.h" #include "editor/debugger/editor_debugger_node.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/editor_run_bar.h" #include "editor/gui/editor_spin_slider.h" -#include "editor/gui/editor_translation_preview_button.h" -#include "editor/gui/editor_translation_preview_menu.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/camera_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/decal_gizmo_plugin.h" -#include "editor/plugins/gizmos/fog_volume_gizmo_plugin.h" -#include "editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/joint_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/label_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/light_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h" -#include "editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h" -#include "editor/plugins/gizmos/marker_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h" -#include "editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/reflection_probe_gizmo_plugin.h" -#include "editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/voxel_gi_gizmo_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" -#include "editor/scene_tree_dock.h" +#include "editor/run/editor_run_bar.h" +#include "editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/camera_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/decal_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/fog_volume_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/label_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/light_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/lightmap_probe_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/marker_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h" +#include "editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" +#include "editor/settings/editor_settings.h" +#include "editor/translations/editor_translation_preview_button.h" +#include "editor/translations/editor_translation_preview_menu.h" #include "scene/3d/audio_stream_player_3d.h" #include "scene/3d/camera_3d.h" #include "scene/3d/decal.h" diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/scene/3d/node_3d_editor_plugin.h similarity index 99% rename from editor/plugins/node_3d_editor_plugin.h rename to editor/scene/3d/node_3d_editor_plugin.h index ac8d43293c9..28e7c750ca4 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/scene/3d/node_3d_editor_plugin.h @@ -32,7 +32,7 @@ #include "core/math/dynamic_bvh.h" #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.cpp b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp similarity index 100% rename from editor/plugins/occluder_instance_3d_editor_plugin.cpp rename to editor/scene/3d/occluder_instance_3d_editor_plugin.cpp diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.h b/editor/scene/3d/occluder_instance_3d_editor_plugin.h similarity index 100% rename from editor/plugins/occluder_instance_3d_editor_plugin.h rename to editor/scene/3d/occluder_instance_3d_editor_plugin.h diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/scene/3d/path_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/path_3d_editor_plugin.cpp rename to editor/scene/3d/path_3d_editor_plugin.cpp index 52fa94c921e..94a42671e7a 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/scene/3d/path_3d_editor_plugin.cpp @@ -34,10 +34,10 @@ #include "core/math/geometry_3d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" #include "scene/resources/curve.h" diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/scene/3d/path_3d_editor_plugin.h similarity index 99% rename from editor/plugins/path_3d_editor_plugin.h rename to editor/scene/3d/path_3d_editor_plugin.h index 15c8df00ff6..5526525aafb 100644 --- a/editor/plugins/path_3d_editor_plugin.h +++ b/editor/scene/3d/path_3d_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" #include "scene/3d/camera_3d.h" #include "scene/3d/path_3d.h" diff --git a/editor/scene/3d/physics/SCsub b/editor/scene/3d/physics/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/3d/physics/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/physical_bone_3d_editor_plugin.cpp b/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp similarity index 98% rename from editor/plugins/physical_bone_3d_editor_plugin.cpp rename to editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp index 2e58a0f7dd5..84348f724d1 100644 --- a/editor/plugins/physical_bone_3d_editor_plugin.cpp +++ b/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/physics/physical_bone_3d.h" void PhysicalBone3DEditor::_on_toggle_button_transform_joint(bool p_is_pressed) { diff --git a/editor/plugins/physical_bone_3d_editor_plugin.h b/editor/scene/3d/physics/physical_bone_3d_editor_plugin.h similarity index 100% rename from editor/plugins/physical_bone_3d_editor_plugin.h rename to editor/scene/3d/physics/physical_bone_3d_editor_plugin.h diff --git a/editor/plugins/polygon_3d_editor_plugin.cpp b/editor/scene/3d/polygon_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/polygon_3d_editor_plugin.cpp rename to editor/scene/3d/polygon_3d_editor_plugin.cpp index 49fca7f7ea7..6ef45384f77 100644 --- a/editor/plugins/polygon_3d_editor_plugin.cpp +++ b/editor/scene/3d/polygon_3d_editor_plugin.cpp @@ -34,11 +34,11 @@ #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/camera_3d.h" void Polygon3DEditor::_notification(int p_what) { diff --git a/editor/plugins/polygon_3d_editor_plugin.h b/editor/scene/3d/polygon_3d_editor_plugin.h similarity index 100% rename from editor/plugins/polygon_3d_editor_plugin.h rename to editor/scene/3d/polygon_3d_editor_plugin.h diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/scene/3d/root_motion_editor_plugin.cpp similarity index 100% rename from editor/plugins/root_motion_editor_plugin.cpp rename to editor/scene/3d/root_motion_editor_plugin.cpp diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/scene/3d/root_motion_editor_plugin.h similarity index 98% rename from editor/plugins/root_motion_editor_plugin.h rename to editor/scene/3d/root_motion_editor_plugin.h index a735e64411d..4aa90edc983 100644 --- a/editor/plugins/root_motion_editor_plugin.h +++ b/editor/scene/3d/root_motion_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" class Button; class ConfirmationDialog; diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/skeleton_3d_editor_plugin.cpp rename to editor/scene/3d/skeleton_3d_editor_plugin.cpp index c516bde0a84..921d7d9aa3b 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/scene/3d/skeleton_3d_editor_plugin.cpp @@ -31,14 +31,14 @@ #include "skeleton_3d_editor_plugin.h" #include "core/io/resource_saver.h" +#include "editor/animation/animation_player_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_properties.h" -#include "editor/editor_properties_vector.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_properties_vector.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics/collision_shape_3d.h" diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/scene/3d/skeleton_3d_editor_plugin.h similarity index 98% rename from editor/plugins/skeleton_3d_editor_plugin.h rename to editor/scene/3d/skeleton_3d_editor_plugin.h index 1779b4bebc1..d42010834c1 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.h +++ b/editor/scene/3d/skeleton_3d_editor_plugin.h @@ -30,11 +30,11 @@ #pragma once -#include "editor/add_metadata_dialog.h" -#include "editor/editor_properties.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/inspector/add_metadata_dialog.h" +#include "editor/inspector/editor_properties.h" #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/skeleton_3d.h" diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp similarity index 100% rename from editor/plugins/skeleton_ik_3d_editor_plugin.cpp rename to editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.h b/editor/scene/3d/skeleton_ik_3d_editor_plugin.h similarity index 100% rename from editor/plugins/skeleton_ik_3d_editor_plugin.h rename to editor/scene/3d/skeleton_ik_3d_editor_plugin.h diff --git a/editor/plugins/voxel_gi_editor_plugin.cpp b/editor/scene/3d/voxel_gi_editor_plugin.cpp similarity index 100% rename from editor/plugins/voxel_gi_editor_plugin.cpp rename to editor/scene/3d/voxel_gi_editor_plugin.cpp diff --git a/editor/plugins/voxel_gi_editor_plugin.h b/editor/scene/3d/voxel_gi_editor_plugin.h similarity index 100% rename from editor/plugins/voxel_gi_editor_plugin.h rename to editor/scene/3d/voxel_gi_editor_plugin.h diff --git a/editor/scene/SCsub b/editor/scene/SCsub new file mode 100644 index 00000000000..efc517acff1 --- /dev/null +++ b/editor/scene/SCsub @@ -0,0 +1,11 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") + +SConscript("2d/SCsub") +SConscript("3d/SCsub") +SConscript("gui/SCsub") +SConscript("texture/SCsub") diff --git a/editor/plugins/bone_map_editor_plugin.cpp b/editor/scene/bone_map_editor_plugin.cpp similarity index 99% rename from editor/plugins/bone_map_editor_plugin.cpp rename to editor/scene/bone_map_editor_plugin.cpp index 01b149d24fb..9d9663d65d9 100644 --- a/editor/plugins/bone_map_editor_plugin.cpp +++ b/editor/scene/bone_map_editor_plugin.cpp @@ -30,11 +30,11 @@ #include "bone_map_editor_plugin.h" -#include "editor/editor_settings.h" #include "editor/import/3d/post_import_plugin_skeleton_renamer.h" #include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h" #include "editor/import/3d/post_import_plugin_skeleton_track_organizer.h" #include "editor/import/3d/scene_import_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/aspect_ratio_container.h" diff --git a/editor/plugins/bone_map_editor_plugin.h b/editor/scene/bone_map_editor_plugin.h similarity index 99% rename from editor/plugins/bone_map_editor_plugin.h rename to editor/scene/bone_map_editor_plugin.h index 376d4a1d227..36ceea20605 100644 --- a/editor/plugins/bone_map_editor_plugin.h +++ b/editor/scene/bone_map_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/editor_node.h" -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "editor/plugins/editor_plugin.h" #include "scene/3d/skeleton_3d.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp similarity index 99% rename from editor/plugins/canvas_item_editor_plugin.cpp rename to editor/scene/canvas_item_editor_plugin.cpp index f05834bb5ad..7a73ce9c2c7 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -33,23 +33,23 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/os/keyboard.h" +#include "editor/animation/animation_player_editor_plugin.h" #include "editor/debugger/editor_debugger_node.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/editor_run_bar.h" #include "editor/gui/editor_toaster.h" -#include "editor/gui/editor_translation_preview_button.h" -#include "editor/gui/editor_translation_preview_menu.h" #include "editor/gui/editor_zoom_widget.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/editor_context_menu_plugin.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/scene_tree_dock.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/run/editor_run_bar.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" +#include "editor/translations/editor_translation_preview_button.h" +#include "editor/translations/editor_translation_preview_menu.h" #include "scene/2d/audio_stream_player_2d.h" #include "scene/2d/physics/touch_screen_button.h" #include "scene/2d/polygon_2d.h" diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/scene/canvas_item_editor_plugin.h similarity index 100% rename from editor/plugins/canvas_item_editor_plugin.h rename to editor/scene/canvas_item_editor_plugin.h diff --git a/editor/connections_dialog.cpp b/editor/scene/connections_dialog.cpp similarity index 99% rename from editor/connections_dialog.cpp rename to editor/scene/connections_dialog.cpp index 4e44920ade6..4207d267593 100644 --- a/editor/connections_dialog.cpp +++ b/editor/scene/connections_dialog.cpp @@ -32,18 +32,18 @@ #include "core/config/project_settings.h" #include "core/templates/hash_set.h" -#include "editor/editor_help.h" -#include "editor/editor_inspector.h" +#include "editor/doc/editor_help.h" +#include "editor/docks/node_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_variant_type_selectors.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/node_dock.h" -#include "editor/plugins/script_editor_plugin.h" -#include "editor/scene_tree_dock.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" diff --git a/editor/connections_dialog.h b/editor/scene/connections_dialog.h similarity index 100% rename from editor/connections_dialog.h rename to editor/scene/connections_dialog.h diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/scene/curve_editor_plugin.cpp similarity index 99% rename from editor/plugins/curve_editor_plugin.cpp rename to editor/scene/curve_editor_plugin.cpp index da1b51fab22..1628491b080 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/scene/curve_editor_plugin.cpp @@ -36,10 +36,10 @@ #include "core/os/keyboard.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/flow_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/curve_editor_plugin.h b/editor/scene/curve_editor_plugin.h similarity index 98% rename from editor/plugins/curve_editor_plugin.h rename to editor/scene/curve_editor_plugin.h index a8c45950b4d..2c3ffafe6ec 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/scene/curve_editor_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/editor_inspector.h" -#include "editor/editor_resource_preview.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/inspector/editor_resource_preview.h" #include "editor/plugins/editor_plugin.h" #include "scene/resources/curve.h" diff --git a/editor/gui/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp similarity index 98% rename from editor/gui/editor_scene_tabs.cpp rename to editor/scene/editor_scene_tabs.cpp index 9a2e1af799e..c9821ed4451 100644 --- a/editor/gui/editor_scene_tabs.cpp +++ b/editor/scene/editor_scene_tabs.cpp @@ -30,15 +30,15 @@ #include "editor_scene_tabs.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_resource_preview.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/inspector/editor_resource_preview.h" +#include "editor/run/editor_run_bar.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/gui/editor_scene_tabs.h b/editor/scene/editor_scene_tabs.h similarity index 100% rename from editor/gui/editor_scene_tabs.h rename to editor/scene/editor_scene_tabs.h diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/scene/gpu_particles_collision_sdf_editor_plugin.cpp similarity index 100% rename from editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp rename to editor/scene/gpu_particles_collision_sdf_editor_plugin.cpp diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/editor/scene/gpu_particles_collision_sdf_editor_plugin.h similarity index 100% rename from editor/plugins/gpu_particles_collision_sdf_editor_plugin.h rename to editor/scene/gpu_particles_collision_sdf_editor_plugin.h diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/scene/gradient_editor_plugin.cpp similarity index 99% rename from editor/plugins/gradient_editor_plugin.cpp rename to editor/scene/gradient_editor_plugin.cpp index 7699a8a7496..dd6f7efa3dd 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/scene/gradient_editor_plugin.cpp @@ -32,12 +32,12 @@ #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/color_picker.h" #include "scene/gui/flow_container.h" diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/scene/gradient_editor_plugin.h similarity index 99% rename from editor/plugins/gradient_editor_plugin.h rename to editor/scene/gradient_editor_plugin.h index a8dadd0e79a..2f945394f70 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/scene/gradient_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" class EditorSpinSlider; diff --git a/editor/group_settings_editor.cpp b/editor/scene/group_settings_editor.cpp similarity index 99% rename from editor/group_settings_editor.cpp rename to editor/scene/group_settings_editor.cpp index ba13ecc69e0..7e024aef120 100644 --- a/editor/group_settings_editor.cpp +++ b/editor/scene/group_settings_editor.cpp @@ -31,11 +31,11 @@ #include "group_settings_editor.h" #include "core/config/project_settings.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_validation_panel.h" -#include "editor/scene_tree_dock.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/resources/packed_scene.h" diff --git a/editor/group_settings_editor.h b/editor/scene/group_settings_editor.h similarity index 100% rename from editor/group_settings_editor.h rename to editor/scene/group_settings_editor.h diff --git a/editor/scene/gui/SCsub b/editor/scene/gui/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/gui/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/scene/gui/control_editor_plugin.cpp similarity index 99% rename from editor/plugins/control_editor_plugin.cpp rename to editor/scene/gui/control_editor_plugin.cpp index 0a795b590c9..66ae5049099 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/scene/gui/control_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" diff --git a/editor/plugins/control_editor_plugin.h b/editor/scene/gui/control_editor_plugin.h similarity index 99% rename from editor/plugins/control_editor_plugin.h rename to editor/scene/gui/control_editor_plugin.h index 488c686adda..b7261770d70 100644 --- a/editor/plugins/control_editor_plugin.h +++ b/editor/scene/gui/control_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/plugins/font_config_plugin.cpp b/editor/scene/gui/font_config_plugin.cpp similarity index 99% rename from editor/plugins/font_config_plugin.cpp rename to editor/scene/gui/font_config_plugin.cpp index b84d7643d48..3b02a8a59fb 100644 --- a/editor/plugins/font_config_plugin.cpp +++ b/editor/scene/gui/font_config_plugin.cpp @@ -31,8 +31,8 @@ #include "font_config_plugin.h" #include "core/string/translation_server.h" -#include "editor/editor_settings.h" #include "editor/import/dynamic_font_import_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/margin_container.h" diff --git a/editor/plugins/font_config_plugin.h b/editor/scene/gui/font_config_plugin.h similarity index 98% rename from editor/plugins/font_config_plugin.h rename to editor/scene/gui/font_config_plugin.h index 0fb0694e35e..290031a2508 100644 --- a/editor/plugins/font_config_plugin.h +++ b/editor/scene/gui/font_config_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/editor_properties.h" -#include "editor/editor_properties_array_dict.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_properties_array_dict.h" #include "editor/plugins/editor_plugin.h" /*************************************************************************/ diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/scene/gui/style_box_editor_plugin.cpp similarity index 100% rename from editor/plugins/style_box_editor_plugin.cpp rename to editor/scene/gui/style_box_editor_plugin.cpp diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/scene/gui/style_box_editor_plugin.h similarity index 98% rename from editor/plugins/style_box_editor_plugin.h rename to editor/scene/gui/style_box_editor_plugin.h index 8103bac1be3..930ebe6e72d 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/scene/gui/style_box_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/texture_rect.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/scene/gui/theme_editor_plugin.cpp similarity index 99% rename from editor/plugins/theme_editor_plugin.cpp rename to editor/scene/gui/theme_editor_plugin.cpp index c9ef9376b3f..46b92f1aef0 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/scene/gui/theme_editor_plugin.cpp @@ -30,17 +30,17 @@ #include "theme_editor_plugin.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_file_system.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" -#include "editor/editor_resource_picker.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/inspector_dock.h" -#include "editor/progress_dialog.h" +#include "editor/gui/progress_dialog.h" +#include "editor/inspector/editor_resource_picker.h" +#include "editor/settings/editor_command_palette.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" diff --git a/editor/plugins/theme_editor_plugin.h b/editor/scene/gui/theme_editor_plugin.h similarity index 99% rename from editor/plugins/theme_editor_plugin.h rename to editor/scene/gui/theme_editor_plugin.h index 7e6d933d273..b1ced140b96 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/scene/gui/theme_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/theme_editor_preview.h" +#include "editor/scene/gui/theme_editor_preview.h" #include "scene/gui/dialogs.h" #include "scene/gui/margin_container.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/scene/gui/theme_editor_preview.cpp similarity index 100% rename from editor/plugins/theme_editor_preview.cpp rename to editor/scene/gui/theme_editor_preview.cpp diff --git a/editor/plugins/theme_editor_preview.h b/editor/scene/gui/theme_editor_preview.h similarity index 100% rename from editor/plugins/theme_editor_preview.h rename to editor/scene/gui/theme_editor_preview.h diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/scene/material_editor_plugin.cpp similarity index 99% rename from editor/plugins/material_editor_plugin.cpp rename to editor/scene/material_editor_plugin.cpp index ef970b1a2be..9965ed65aca 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/scene/material_editor_plugin.cpp @@ -32,9 +32,9 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/camera_3d.h" #include "scene/3d/light_3d.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/scene/material_editor_plugin.h similarity index 99% rename from editor/plugins/material_editor_plugin.h rename to editor/scene/material_editor_plugin.h index 44e885e4299..3afdcc23f74 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/scene/material_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h" #include "scene/resources/3d/primitive_meshes.h" diff --git a/editor/plugins/packed_scene_editor_plugin.cpp b/editor/scene/packed_scene_editor_plugin.cpp similarity index 100% rename from editor/plugins/packed_scene_editor_plugin.cpp rename to editor/scene/packed_scene_editor_plugin.cpp diff --git a/editor/plugins/packed_scene_editor_plugin.h b/editor/scene/packed_scene_editor_plugin.h similarity index 98% rename from editor/plugins/packed_scene_editor_plugin.h rename to editor/scene/packed_scene_editor_plugin.h index 20346b824bd..25d9ce6882a 100644 --- a/editor/plugins/packed_scene_editor_plugin.h +++ b/editor/scene/packed_scene_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/particle_process_material_editor_plugin.cpp b/editor/scene/particle_process_material_editor_plugin.cpp similarity index 99% rename from editor/plugins/particle_process_material_editor_plugin.cpp rename to editor/scene/particle_process_material_editor_plugin.cpp index 52cc2e658bd..cd06fbb4877 100644 --- a/editor/plugins/particle_process_material_editor_plugin.cpp +++ b/editor/scene/particle_process_material_editor_plugin.cpp @@ -30,9 +30,9 @@ #include "particle_process_material_editor_plugin.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_spin_slider.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/plugins/particle_process_material_editor_plugin.h b/editor/scene/particle_process_material_editor_plugin.h similarity index 98% rename from editor/plugins/particle_process_material_editor_plugin.h rename to editor/scene/particle_process_material_editor_plugin.h index 0dc47dd42d0..9f91b70840a 100644 --- a/editor/plugins/particle_process_material_editor_plugin.h +++ b/editor/scene/particle_process_material_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "editor/plugins/editor_plugin.h" class Button; diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/scene/particles_editor_plugin.cpp similarity index 99% rename from editor/plugins/particles_editor_plugin.cpp rename to editor/scene/particles_editor_plugin.cpp index 28b0f9cddb2..6bd97057205 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/scene/particles_editor_plugin.cpp @@ -32,11 +32,11 @@ #include "canvas_item_editor_plugin.h" #include "core/io/image_loader.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/scene_tree_dock.h" +#include "editor/settings/editor_settings.h" #include "scene/2d/cpu_particles_2d.h" #include "scene/2d/gpu_particles_2d.h" #include "scene/3d/cpu_particles_3d.h" diff --git a/editor/plugins/particles_editor_plugin.h b/editor/scene/particles_editor_plugin.h similarity index 100% rename from editor/plugins/particles_editor_plugin.h rename to editor/scene/particles_editor_plugin.h diff --git a/editor/rename_dialog.cpp b/editor/scene/rename_dialog.cpp similarity index 99% rename from editor/rename_dialog.cpp rename to editor/scene/rename_dialog.cpp index 69803b331c8..b89615f3af0 100644 --- a/editor/rename_dialog.cpp +++ b/editor/scene/rename_dialog.cpp @@ -33,7 +33,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/control.h" diff --git a/editor/rename_dialog.h b/editor/scene/rename_dialog.h similarity index 99% rename from editor/rename_dialog.h rename to editor/scene/rename_dialog.h index 1aa3967995b..1e23cdd65e0 100644 --- a/editor/rename_dialog.h +++ b/editor/scene/rename_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/gui/scene_tree_editor.h" +#include "editor/scene/scene_tree_editor.h" #include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" diff --git a/editor/reparent_dialog.cpp b/editor/scene/reparent_dialog.cpp similarity index 98% rename from editor/reparent_dialog.cpp rename to editor/scene/reparent_dialog.cpp index ff8cfd5e937..fae52a27e2d 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/scene/reparent_dialog.cpp @@ -30,7 +30,7 @@ #include "reparent_dialog.h" -#include "editor/gui/scene_tree_editor.h" +#include "editor/scene/scene_tree_editor.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" diff --git a/editor/reparent_dialog.h b/editor/scene/reparent_dialog.h similarity index 100% rename from editor/reparent_dialog.h rename to editor/scene/reparent_dialog.h diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/scene/resource_preloader_editor_plugin.cpp similarity index 99% rename from editor/plugins/resource_preloader_editor_plugin.cpp rename to editor/scene/resource_preloader_editor_plugin.cpp index 01d7b3d797e..abb1d290757 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/scene/resource_preloader_editor_plugin.cpp @@ -31,13 +31,13 @@ #include "resource_preloader_editor_plugin.h" #include "core/io/resource_loader.h" -#include "editor/editor_command_palette.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" void ResourcePreloaderEditor::_notification(int p_what) { diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/scene/resource_preloader_editor_plugin.h similarity index 100% rename from editor/plugins/resource_preloader_editor_plugin.h rename to editor/scene/resource_preloader_editor_plugin.h diff --git a/editor/scene_create_dialog.cpp b/editor/scene/scene_create_dialog.cpp similarity index 99% rename from editor/scene_create_dialog.cpp rename to editor/scene/scene_create_dialog.cpp index 24ad3064e9a..6bd42defb21 100644 --- a/editor/scene_create_dialog.cpp +++ b/editor/scene/scene_create_dialog.cpp @@ -31,9 +31,9 @@ #include "scene_create_dialog.h" #include "core/io/dir_access.h" -#include "editor/create_dialog.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/gui/create_dialog.h" #include "editor/gui/editor_validation_panel.h" #include "editor/themes/editor_scale.h" #include "scene/2d/node_2d.h" diff --git a/editor/scene_create_dialog.h b/editor/scene/scene_create_dialog.h similarity index 100% rename from editor/scene_create_dialog.h rename to editor/scene/scene_create_dialog.h diff --git a/editor/gui/scene_tree_editor.cpp b/editor/scene/scene_tree_editor.cpp similarity index 99% rename from editor/gui/scene_tree_editor.cpp rename to editor/scene/scene_tree_editor.cpp index 3376f9435d4..a455cde2d2c 100644 --- a/editor/gui/scene_tree_editor.cpp +++ b/editor/scene/scene_tree_editor.cpp @@ -32,16 +32,16 @@ #include "core/config/project_settings.h" #include "core/object/script_language.h" -#include "editor/editor_dock_manager.h" -#include "editor/editor_file_system.h" +#include "editor/animation/animation_player_editor_plugin.h" +#include "editor/docks/editor_dock_manager.h" +#include "editor/docks/node_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/node_dock.h" -#include "editor/plugins/animation_player_editor_plugin.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/node_2d.h" #include "scene/gui/flow_container.h" diff --git a/editor/gui/scene_tree_editor.h b/editor/scene/scene_tree_editor.h similarity index 100% rename from editor/gui/scene_tree_editor.h rename to editor/scene/scene_tree_editor.h diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/scene/sprite_frames_editor_plugin.cpp similarity index 99% rename from editor/plugins/sprite_frames_editor_plugin.cpp rename to editor/scene/sprite_frames_editor_plugin.cpp index 32b704af29b..5133a0c7edd 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/scene/sprite_frames_editor_plugin.cpp @@ -32,16 +32,16 @@ #include "core/io/resource_loader.h" #include "core/os/keyboard.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_file_system.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/scene_tree_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/scene_tree_dock.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/animated_sprite_2d.h" #include "scene/3d/sprite_3d.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/scene/sprite_frames_editor_plugin.h similarity index 100% rename from editor/plugins/sprite_frames_editor_plugin.h rename to editor/scene/sprite_frames_editor_plugin.h diff --git a/editor/scene/texture/SCsub b/editor/scene/texture/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/scene/texture/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/plugins/bit_map_editor_plugin.cpp b/editor/scene/texture/bit_map_editor_plugin.cpp similarity index 100% rename from editor/plugins/bit_map_editor_plugin.cpp rename to editor/scene/texture/bit_map_editor_plugin.cpp diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/scene/texture/bit_map_editor_plugin.h similarity index 98% rename from editor/plugins/bit_map_editor_plugin.h rename to editor/scene/texture/bit_map_editor_plugin.h index 5f67d6b55da..3210cd3a1d6 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/scene/texture/bit_map_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/resources/bit_map.h" diff --git a/editor/plugins/color_channel_selector.cpp b/editor/scene/texture/color_channel_selector.cpp similarity index 100% rename from editor/plugins/color_channel_selector.cpp rename to editor/scene/texture/color_channel_selector.cpp diff --git a/editor/plugins/color_channel_selector.h b/editor/scene/texture/color_channel_selector.h similarity index 100% rename from editor/plugins/color_channel_selector.h rename to editor/scene/texture/color_channel_selector.h diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp similarity index 100% rename from editor/plugins/gradient_texture_2d_editor_plugin.cpp rename to editor/scene/texture/gradient_texture_2d_editor_plugin.cpp diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/scene/texture/gradient_texture_2d_editor_plugin.h similarity index 98% rename from editor/plugins/gradient_texture_2d_editor_plugin.h rename to editor/scene/texture/gradient_texture_2d_editor_plugin.h index 73f3f957d84..eb43745bdef 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.h +++ b/editor/scene/texture/gradient_texture_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" class Button; diff --git a/editor/plugins/texture_3d_editor_plugin.cpp b/editor/scene/texture/texture_3d_editor_plugin.cpp similarity index 99% rename from editor/plugins/texture_3d_editor_plugin.cpp rename to editor/scene/texture/texture_3d_editor_plugin.cpp index b3500e4ca50..f42037f2f58 100644 --- a/editor/plugins/texture_3d_editor_plugin.cpp +++ b/editor/scene/texture/texture_3d_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "texture_3d_editor_plugin.h" #include "editor/editor_string_names.h" -#include "editor/plugins/color_channel_selector.h" +#include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" #include "scene/gui/label.h" diff --git a/editor/plugins/texture_3d_editor_plugin.h b/editor/scene/texture/texture_3d_editor_plugin.h similarity index 98% rename from editor/plugins/texture_3d_editor_plugin.h rename to editor/scene/texture/texture_3d_editor_plugin.h index fc446a94713..64fb3b1e09a 100644 --- a/editor/plugins/texture_3d_editor_plugin.h +++ b/editor/scene/texture/texture_3d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/spin_box.h" #include "scene/resources/shader.h" diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/scene/texture/texture_editor_plugin.cpp similarity index 99% rename from editor/plugins/texture_editor_plugin.cpp rename to editor/scene/texture/texture_editor_plugin.cpp index 7190b9ac2f8..27c73f6f157 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/scene/texture/texture_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "texture_editor_plugin.h" #include "editor/editor_string_names.h" -#include "editor/plugins/color_channel_selector.h" +#include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" #include "scene/gui/aspect_ratio_container.h" #include "scene/gui/color_rect.h" diff --git a/editor/plugins/texture_editor_plugin.h b/editor/scene/texture/texture_editor_plugin.h similarity index 98% rename from editor/plugins/texture_editor_plugin.h rename to editor/scene/texture/texture_editor_plugin.h index 9f5e2dbb1b9..be043dc5357 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/scene/texture/texture_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/margin_container.h" #include "scene/resources/texture.h" diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/scene/texture/texture_layered_editor_plugin.cpp similarity index 99% rename from editor/plugins/texture_layered_editor_plugin.cpp rename to editor/scene/texture/texture_layered_editor_plugin.cpp index 56263ca5a98..98adcc3d6ef 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/scene/texture/texture_layered_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "texture_layered_editor_plugin.h" #include "editor/editor_string_names.h" -#include "editor/plugins/color_channel_selector.h" +#include "editor/scene/texture/color_channel_selector.h" #include "editor/themes/editor_scale.h" #include "scene/gui/label.h" diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/scene/texture/texture_layered_editor_plugin.h similarity index 98% rename from editor/plugins/texture_layered_editor_plugin.h rename to editor/scene/texture/texture_layered_editor_plugin.h index 065380c7f4a..900c2ab9b03 100644 --- a/editor/plugins/texture_layered_editor_plugin.h +++ b/editor/scene/texture/texture_layered_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/spin_box.h" #include "scene/resources/shader.h" diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/scene/texture/texture_region_editor_plugin.cpp similarity index 99% rename from editor/plugins/texture_region_editor_plugin.cpp rename to editor/scene/texture/texture_region_editor_plugin.cpp index 394dbd5c452..c599150ff37 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/scene/texture/texture_region_editor_plugin.cpp @@ -33,9 +33,9 @@ #include "core/input/input.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/sprite_2d.h" #include "scene/3d/sprite_3d.h" diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/scene/texture/texture_region_editor_plugin.h similarity index 99% rename from editor/plugins/texture_region_editor_plugin.h rename to editor/scene/texture/texture_region_editor_plugin.h index 30f80bf350e..1ca3f3bd62b 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/scene/texture/texture_region_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/dialogs.h" diff --git a/editor/script/SCsub b/editor/script/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/script/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_script.cpp b/editor/script/editor_script.cpp similarity index 98% rename from editor/editor_script.cpp rename to editor/script/editor_script.cpp index 6968c7f25a9..0c96044f7a9 100644 --- a/editor/editor_script.cpp +++ b/editor/script/editor_script.cpp @@ -33,7 +33,7 @@ #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/editor_scene_tabs.h" +#include "editor/scene/editor_scene_tabs.h" #include "scene/main/node.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_script.h b/editor/script/editor_script.h similarity index 100% rename from editor/editor_script.h rename to editor/script/editor_script.h diff --git a/editor/plugins/editor_script_plugin.cpp b/editor/script/editor_script_plugin.cpp similarity index 97% rename from editor/plugins/editor_script_plugin.cpp rename to editor/script/editor_script_plugin.cpp index 49fca9fc16d..4696a97c6ca 100644 --- a/editor/plugins/editor_script_plugin.cpp +++ b/editor/script/editor_script_plugin.cpp @@ -30,9 +30,9 @@ #include "editor_script_plugin.h" -#include "editor/editor_command_palette.h" #include "editor/editor_interface.h" -#include "editor/editor_script.h" +#include "editor/script/editor_script.h" +#include "editor/settings/editor_command_palette.h" Ref create_instance(const StringName &p_name) { Ref es; diff --git a/editor/plugins/editor_script_plugin.h b/editor/script/editor_script_plugin.h similarity index 100% rename from editor/plugins/editor_script_plugin.h rename to editor/script/editor_script_plugin.h diff --git a/editor/find_in_files.cpp b/editor/script/find_in_files.cpp similarity index 100% rename from editor/find_in_files.cpp rename to editor/script/find_in_files.cpp diff --git a/editor/find_in_files.h b/editor/script/find_in_files.h similarity index 100% rename from editor/find_in_files.h rename to editor/script/find_in_files.h diff --git a/editor/script_create_dialog.cpp b/editor/script/script_create_dialog.cpp similarity index 99% rename from editor/script_create_dialog.cpp rename to editor/script/script_create_dialog.cpp index 4def82b2d57..12a12a48eeb 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script/script_create_dialog.cpp @@ -33,14 +33,14 @@ #include "core/config/project_settings.h" #include "core/io/file_access.h" #include "core/io/resource_saver.h" -#include "editor/create_dialog.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/create_dialog.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_validation_panel.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/grid_container.h" #include "scene/gui/line_edit.h" diff --git a/editor/script_create_dialog.h b/editor/script/script_create_dialog.h similarity index 100% rename from editor/script_create_dialog.h rename to editor/script/script_create_dialog.h diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp similarity index 99% rename from editor/plugins/script_editor_plugin.cpp rename to editor/script/script_editor_plugin.cpp index 77c20d4501e..b165b681be8 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/script/script_editor_plugin.cpp @@ -40,32 +40,32 @@ #include "core/os/os.h" #include "core/string/fuzzy_search.h" #include "core/version.h" -#include "editor/code_editor.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_help_search.h" +#include "editor/doc/editor_help_search.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/node_dock.h" #include "editor/editor_interface.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_script.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" -#include "editor/find_in_files.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/code_editor.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/gui/editor_run_bar.h" #include "editor/gui/editor_toaster.h" -#include "editor/inspector_dock.h" -#include "editor/node_dock.h" -#include "editor/plugins/editor_context_menu_plugin.h" -#include "editor/plugins/shader_editor_plugin.h" -#include "editor/plugins/text_shader_editor.h" +#include "editor/gui/window_wrapper.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/run/editor_run_bar.h" +#include "editor/script/editor_script.h" +#include "editor/script/find_in_files.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" +#include "editor/shader/shader_editor_plugin.h" +#include "editor/shader/text_shader_editor.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" -#include "editor/window_wrapper.h" #include "scene/gui/separator.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" diff --git a/editor/plugins/script_editor_plugin.h b/editor/script/script_editor_plugin.h similarity index 100% rename from editor/plugins/script_editor_plugin.h rename to editor/script/script_editor_plugin.h diff --git a/editor/plugins/script_text_editor.cpp b/editor/script/script_text_editor.cpp similarity index 99% rename from editor/plugins/script_text_editor.cpp rename to editor/script/script_text_editor.cpp index d8dfd40add6..9809b80946d 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/script/script_text_editor.cpp @@ -35,13 +35,13 @@ #include "core/math/expression.h" #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_toaster.h" -#include "editor/plugins/editor_context_menu_plugin.h" +#include "editor/inspector/editor_context_menu_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/grid_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/script_text_editor.h b/editor/script/script_text_editor.h similarity index 99% rename from editor/plugins/script_text_editor.h rename to editor/script/script_text_editor.h index 270c324402b..7669caea533 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/script/script_text_editor.h @@ -32,7 +32,7 @@ #include "script_editor_plugin.h" -#include "editor/code_editor.h" +#include "editor/gui/code_editor.h" #include "scene/gui/color_picker.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" diff --git a/editor/plugins/text_editor.cpp b/editor/script/text_editor.cpp similarity index 99% rename from editor/plugins/text_editor.cpp rename to editor/script/text_editor.cpp index b8cee7b74de..988729d11c3 100644 --- a/editor/plugins/text_editor.cpp +++ b/editor/script/text_editor.cpp @@ -32,7 +32,7 @@ #include "core/io/json.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/menu_button.h" #include "scene/gui/split_container.h" diff --git a/editor/plugins/text_editor.h b/editor/script/text_editor.h similarity index 98% rename from editor/plugins/text_editor.h rename to editor/script/text_editor.h index 35b40dcf422..f0aa9ac65c5 100644 --- a/editor/plugins/text_editor.h +++ b/editor/script/text_editor.h @@ -30,9 +30,9 @@ #pragma once -#include "script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" -#include "editor/code_editor.h" +#include "editor/gui/code_editor.h" class TextEditor : public ScriptEditorBase { GDCLASS(TextEditor, ScriptEditorBase); diff --git a/editor/settings/SCsub b/editor/settings/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/settings/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/action_map_editor.cpp b/editor/settings/action_map_editor.cpp similarity index 98% rename from editor/action_map_editor.cpp rename to editor/settings/action_map_editor.cpp index 28a0e5d4701..7959945162b 100644 --- a/editor/action_map_editor.cpp +++ b/editor/settings/action_map_editor.cpp @@ -28,13 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/action_map_editor.h" +#include "action_map_editor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/event_listener_line_edit.h" -#include "editor/gui/editor_event_search_bar.h" -#include "editor/input_event_configuration_dialog.h" +#include "editor/settings/editor_event_search_bar.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/event_listener_line_edit.h" +#include "editor/settings/input_event_configuration_dialog.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" #include "scene/gui/separator.h" diff --git a/editor/action_map_editor.h b/editor/settings/action_map_editor.h similarity index 100% rename from editor/action_map_editor.h rename to editor/settings/action_map_editor.h diff --git a/editor/editor_autoload_settings.cpp b/editor/settings/editor_autoload_settings.cpp similarity index 99% rename from editor/editor_autoload_settings.cpp rename to editor/settings/editor_autoload_settings.cpp index ae079b9ab4e..5bda36536b3 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/settings/editor_autoload_settings.cpp @@ -32,12 +32,12 @@ #include "core/config/project_settings.h" #include "core/core_constants.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/project_settings_editor.h" +#include "editor/settings/project_settings_editor.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_autoload_settings.h b/editor/settings/editor_autoload_settings.h similarity index 100% rename from editor/editor_autoload_settings.h rename to editor/settings/editor_autoload_settings.h diff --git a/editor/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp similarity index 99% rename from editor/editor_build_profile.cpp rename to editor/settings/editor_build_profile.cpp index c6f46584334..d8579eaf375 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/settings/editor_build_profile.cpp @@ -32,12 +32,12 @@ #include "core/config/project_settings.h" #include "core/io/json.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/gui/separator.h" diff --git a/editor/editor_build_profile.h b/editor/settings/editor_build_profile.h similarity index 99% rename from editor/editor_build_profile.h rename to editor/settings/editor_build_profile.h index 07c7f85db1d..4d2c3f21271 100644 --- a/editor/editor_build_profile.h +++ b/editor/settings/editor_build_profile.h @@ -31,7 +31,7 @@ #pragma once #include "core/object/ref_counted.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" diff --git a/editor/editor_command_palette.cpp b/editor/settings/editor_command_palette.cpp similarity index 99% rename from editor/editor_command_palette.cpp rename to editor/settings/editor_command_palette.cpp index 79f38c7b9e2..ad70973e107 100644 --- a/editor/editor_command_palette.cpp +++ b/editor/settings/editor_command_palette.cpp @@ -28,12 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/editor_command_palette.h" +#include "editor_command_palette.h" + #include "core/os/keyboard.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_toaster.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/control.h" #include "scene/gui/line_edit.h" diff --git a/editor/editor_command_palette.h b/editor/settings/editor_command_palette.h similarity index 100% rename from editor/editor_command_palette.h rename to editor/settings/editor_command_palette.h diff --git a/editor/gui/editor_event_search_bar.cpp b/editor/settings/editor_event_search_bar.cpp similarity index 98% rename from editor/gui/editor_event_search_bar.cpp rename to editor/settings/editor_event_search_bar.cpp index c9212d215d3..e65e7d5feb5 100644 --- a/editor/gui/editor_event_search_bar.cpp +++ b/editor/settings/editor_event_search_bar.cpp @@ -30,7 +30,7 @@ #include "editor_event_search_bar.h" -#include "editor/event_listener_line_edit.h" +#include "editor/settings/event_listener_line_edit.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" diff --git a/editor/gui/editor_event_search_bar.h b/editor/settings/editor_event_search_bar.h similarity index 100% rename from editor/gui/editor_event_search_bar.h rename to editor/settings/editor_event_search_bar.h diff --git a/editor/editor_feature_profile.cpp b/editor/settings/editor_feature_profile.cpp similarity index 99% rename from editor/editor_feature_profile.cpp rename to editor/settings/editor_feature_profile.cpp index 5e1d11b594e..4aa9e922681 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/settings/editor_feature_profile.cpp @@ -33,11 +33,11 @@ #include "core/io/dir_access.h" #include "core/io/json.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_paths.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/gui/separator.h" diff --git a/editor/editor_feature_profile.h b/editor/settings/editor_feature_profile.h similarity index 99% rename from editor/editor_feature_profile.h rename to editor/settings/editor_feature_profile.h index f6f6bd6eea0..a57c01dff4d 100644 --- a/editor/editor_feature_profile.h +++ b/editor/settings/editor_feature_profile.h @@ -31,7 +31,7 @@ #pragma once #include "core/object/ref_counted.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" #include "scene/gui/split_container.h" diff --git a/editor/editor_folding.cpp b/editor/settings/editor_folding.cpp similarity index 99% rename from editor/editor_folding.cpp rename to editor/settings/editor_folding.cpp index 42e54a243b8..f65948c2fca 100644 --- a/editor/editor_folding.cpp +++ b/editor/settings/editor_folding.cpp @@ -32,8 +32,8 @@ #include "core/io/config_file.h" #include "core/io/file_access.h" -#include "editor/editor_inspector.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_paths.h" +#include "editor/inspector/editor_inspector.h" Vector EditorFolding::_get_unfolds(const Object *p_object) { Vector sections; diff --git a/editor/editor_folding.h b/editor/settings/editor_folding.h similarity index 100% rename from editor/editor_folding.h rename to editor/settings/editor_folding.h diff --git a/editor/editor_layouts_dialog.cpp b/editor/settings/editor_layouts_dialog.cpp similarity index 99% rename from editor/editor_layouts_dialog.cpp rename to editor/settings/editor_layouts_dialog.cpp index 081ffa579c7..46c0e2b9a93 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/settings/editor_layouts_dialog.cpp @@ -31,7 +31,7 @@ #include "editor_layouts_dialog.h" #include "core/io/config_file.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" #include "scene/gui/line_edit.h" diff --git a/editor/editor_layouts_dialog.h b/editor/settings/editor_layouts_dialog.h similarity index 100% rename from editor/editor_layouts_dialog.h rename to editor/settings/editor_layouts_dialog.h diff --git a/editor/editor_settings.cpp b/editor/settings/editor_settings.cpp similarity index 99% rename from editor/editor_settings.cpp rename to editor/settings/editor_settings.cpp index 83d86c4d860..6175cc57039 100644 --- a/editor/editor_settings.cpp +++ b/editor/settings/editor_settings.cpp @@ -46,10 +46,10 @@ #include "core/string/translation_server.h" #include "core/version.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_translation.h" -#include "editor/engine_update_label.h" +#include "editor/file_system/editor_paths.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/project_manager/engine_update_label.h" +#include "editor/translations/editor_translation.h" #include "modules/regex/regex.h" #include "scene/gui/color_picker.h" #include "scene/main/node.h" diff --git a/editor/editor_settings.h b/editor/settings/editor_settings.h similarity index 100% rename from editor/editor_settings.h rename to editor/settings/editor_settings.h diff --git a/editor/editor_settings_dialog.cpp b/editor/settings/editor_settings_dialog.cpp similarity index 99% rename from editor/editor_settings_dialog.cpp rename to editor/settings/editor_settings_dialog.cpp index b461bd33db9..a51e4a2ec2e 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/settings/editor_settings_dialog.cpp @@ -34,18 +34,18 @@ #include "core/input/input_map.h" #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/editor_inspector.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_property_name_processor.h" -#include "editor/editor_sectioned_inspector.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/event_listener_line_edit.h" -#include "editor/gui/editor_event_search_bar.h" -#include "editor/input_event_configuration_dialog.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/inspector/editor_property_name_processor.h" +#include "editor/inspector/editor_sectioned_inspector.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_event_search_bar.h" +#include "editor/settings/editor_settings.h" +#include "editor/settings/event_listener_line_edit.h" +#include "editor/settings/input_event_configuration_dialog.h" +#include "editor/settings/project_settings_editor.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/check_button.h" diff --git a/editor/editor_settings_dialog.h b/editor/settings/editor_settings_dialog.h similarity index 99% rename from editor/editor_settings_dialog.h rename to editor/settings/editor_settings_dialog.h index 0f275aac08e..7731a410969 100644 --- a/editor/editor_settings_dialog.h +++ b/editor/settings/editor_settings_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/dialogs.h" class CheckButton; diff --git a/editor/event_listener_line_edit.cpp b/editor/settings/event_listener_line_edit.cpp similarity index 99% rename from editor/event_listener_line_edit.cpp rename to editor/settings/event_listener_line_edit.cpp index c53129e90ff..8da77323bf4 100644 --- a/editor/event_listener_line_edit.cpp +++ b/editor/settings/event_listener_line_edit.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/event_listener_line_edit.h" +#include "event_listener_line_edit.h" #include "core/input/input_map.h" #include "scene/gui/dialogs.h" diff --git a/editor/event_listener_line_edit.h b/editor/settings/event_listener_line_edit.h similarity index 100% rename from editor/event_listener_line_edit.h rename to editor/settings/event_listener_line_edit.h diff --git a/editor/input_event_configuration_dialog.cpp b/editor/settings/input_event_configuration_dialog.cpp similarity index 99% rename from editor/input_event_configuration_dialog.cpp rename to editor/settings/input_event_configuration_dialog.cpp index 2a90c777cd9..6d37ddcae09 100644 --- a/editor/input_event_configuration_dialog.cpp +++ b/editor/settings/input_event_configuration_dialog.cpp @@ -28,10 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/input_event_configuration_dialog.h" +#include "input_event_configuration_dialog.h" + #include "core/input/input_map.h" #include "editor/editor_string_names.h" -#include "editor/event_listener_line_edit.h" +#include "editor/settings/event_listener_line_edit.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/line_edit.h" diff --git a/editor/input_event_configuration_dialog.h b/editor/settings/input_event_configuration_dialog.h similarity index 100% rename from editor/input_event_configuration_dialog.h rename to editor/settings/input_event_configuration_dialog.h diff --git a/editor/project_settings_editor.cpp b/editor/settings/project_settings_editor.cpp similarity index 99% rename from editor/project_settings_editor.cpp rename to editor/settings/project_settings_editor.cpp index 87b4773e1bb..41aa2162586 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/settings/project_settings_editor.cpp @@ -32,13 +32,13 @@ #include "core/config/project_settings.h" #include "core/input/input_map.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/export/editor_export.h" #include "editor/gui/editor_variant_type_selectors.h" +#include "editor/inspector/editor_inspector.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_button.h" #include "servers/movie_writer/movie_writer.h" diff --git a/editor/project_settings_editor.h b/editor/settings/project_settings_editor.h similarity index 94% rename from editor/project_settings_editor.h rename to editor/settings/project_settings_editor.h index 9d747a977cb..6263f09549b 100644 --- a/editor/project_settings_editor.h +++ b/editor/settings/project_settings_editor.h @@ -31,15 +31,15 @@ #pragma once #include "core/config/project_settings.h" -#include "editor/action_map_editor.h" -#include "editor/editor_autoload_settings.h" #include "editor/editor_data.h" -#include "editor/editor_sectioned_inspector.h" -#include "editor/group_settings_editor.h" -#include "editor/import_defaults_editor.h" -#include "editor/localization_editor.h" +#include "editor/import/import_defaults_editor.h" +#include "editor/inspector/editor_sectioned_inspector.h" #include "editor/plugins/editor_plugin_settings.h" -#include "editor/shader_globals_editor.h" +#include "editor/scene/group_settings_editor.h" +#include "editor/settings/action_map_editor.h" +#include "editor/settings/editor_autoload_settings.h" +#include "editor/shader/shader_globals_editor.h" +#include "editor/translations/localization_editor.h" #include "scene/gui/panel_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" diff --git a/editor/shader/SCsub b/editor/shader/SCsub new file mode 100644 index 00000000000..fc5c46d2aa5 --- /dev/null +++ b/editor/shader/SCsub @@ -0,0 +1,8 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") + +SConscript("shader_baker/SCsub") diff --git a/editor/editor_native_shader_source_visualizer.cpp b/editor/shader/editor_native_shader_source_visualizer.cpp similarity index 99% rename from editor/editor_native_shader_source_visualizer.cpp rename to editor/shader/editor_native_shader_source_visualizer.cpp index 72f78e4e63b..9d9dd5af6eb 100644 --- a/editor/editor_native_shader_source_visualizer.cpp +++ b/editor/shader/editor_native_shader_source_visualizer.cpp @@ -30,8 +30,8 @@ #include "editor_native_shader_source_visualizer.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/code_edit.h" #include "scene/gui/text_edit.h" diff --git a/editor/editor_native_shader_source_visualizer.h b/editor/shader/editor_native_shader_source_visualizer.h similarity index 100% rename from editor/editor_native_shader_source_visualizer.h rename to editor/shader/editor_native_shader_source_visualizer.h diff --git a/editor/plugins/shader_baker/SCsub b/editor/shader/shader_baker/SCsub similarity index 100% rename from editor/plugins/shader_baker/SCsub rename to editor/shader/shader_baker/SCsub diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.cpp b/editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.cpp similarity index 100% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.cpp rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.cpp diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.h b/editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.h similarity index 98% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.h rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.h index abc5aa81e08..1da227b6673 100644 --- a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_d3d12.h +++ b/editor/shader/shader_baker/shader_baker_export_plugin_platform_d3d12.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/shader_baker_export_plugin.h" +#include "editor/export/shader_baker_export_plugin.h" class ShaderBakerExportPluginPlatformD3D12 : public ShaderBakerExportPluginPlatform { GDCLASS(ShaderBakerExportPluginPlatformD3D12, ShaderBakerExportPluginPlatform); diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.cpp b/editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.cpp similarity index 100% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.cpp rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.cpp diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.h b/editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h similarity index 97% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.h rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h index 8d65cbe4dc1..ed23f704145 100644 --- a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_metal.h +++ b/editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/shader_baker_export_plugin.h" +#include "editor/export/shader_baker_export_plugin.h" class ShaderBakerExportPluginPlatformMetal : public ShaderBakerExportPluginPlatform { public: diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.cpp b/editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.cpp similarity index 100% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.cpp rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.cpp diff --git a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.h b/editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h similarity index 97% rename from editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.h rename to editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h index ff174a03eb8..08a8e21296e 100644 --- a/editor/plugins/shader_baker/shader_baker_export_plugin_platform_vulkan.h +++ b/editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/shader_baker_export_plugin.h" +#include "editor/export/shader_baker_export_plugin.h" class ShaderBakerExportPluginPlatformVulkan : public ShaderBakerExportPluginPlatform { GDCLASS(ShaderBakerExportPluginPlatformVulkan, ShaderBakerExportPluginPlatform); diff --git a/editor/shader_create_dialog.cpp b/editor/shader/shader_create_dialog.cpp similarity index 100% rename from editor/shader_create_dialog.cpp rename to editor/shader/shader_create_dialog.cpp diff --git a/editor/shader_create_dialog.h b/editor/shader/shader_create_dialog.h similarity index 98% rename from editor/shader_create_dialog.h rename to editor/shader/shader_create_dialog.h index 51d6f5306c6..18f8d7ea54a 100644 --- a/editor/shader_create_dialog.h +++ b/editor/shader/shader_create_dialog.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" #include "scene/gui/grid_container.h" diff --git a/editor/plugins/shader/shader_editor.h b/editor/shader/shader_editor.h similarity index 100% rename from editor/plugins/shader/shader_editor.h rename to editor/shader/shader_editor.h diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/shader/shader_editor_plugin.cpp similarity index 99% rename from editor/plugins/shader_editor_plugin.cpp rename to editor/shader/shader_editor_plugin.cpp index 67456d7cd32..17970340892 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/shader/shader_editor_plugin.cpp @@ -30,18 +30,18 @@ #include "shader_editor_plugin.h" -#include "editor/editor_command_palette.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/text_shader_editor.h" -#include "editor/plugins/visual_shader_editor_plugin.h" -#include "editor/shader_create_dialog.h" +#include "editor/gui/window_wrapper.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/shader/shader_create_dialog.h" +#include "editor/shader/text_shader_editor.h" +#include "editor/shader/visual_shader_editor_plugin.h" #include "editor/themes/editor_scale.h" -#include "editor/window_wrapper.h" #include "scene/gui/item_list.h" #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" diff --git a/editor/plugins/shader_editor_plugin.h b/editor/shader/shader_editor_plugin.h similarity index 100% rename from editor/plugins/shader_editor_plugin.h rename to editor/shader/shader_editor_plugin.h diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/shader/shader_file_editor_plugin.cpp similarity index 99% rename from editor/plugins/shader_file_editor_plugin.cpp rename to editor/shader/shader_file_editor_plugin.cpp index 1b08a46d807..24e22ce3650 100644 --- a/editor/plugins/shader_file_editor_plugin.cpp +++ b/editor/shader/shader_file_editor_plugin.cpp @@ -30,10 +30,10 @@ #include "shader_file_editor_plugin.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/settings/editor_command_palette.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" #include "scene/gui/split_container.h" diff --git a/editor/plugins/shader_file_editor_plugin.h b/editor/shader/shader_file_editor_plugin.h similarity index 100% rename from editor/plugins/shader_file_editor_plugin.h rename to editor/shader/shader_file_editor_plugin.h diff --git a/editor/shader_globals_editor.cpp b/editor/shader/shader_globals_editor.cpp similarity index 99% rename from editor/shader_globals_editor.cpp rename to editor/shader/shader_globals_editor.cpp index 8081a7d8da7..c8c96ace501 100644 --- a/editor/shader_globals_editor.cpp +++ b/editor/shader/shader_globals_editor.cpp @@ -31,9 +31,9 @@ #include "shader_globals_editor.h" #include "core/config/project_settings.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "servers/rendering/shader_language.h" diff --git a/editor/shader_globals_editor.h b/editor/shader/shader_globals_editor.h similarity index 98% rename from editor/shader_globals_editor.h rename to editor/shader/shader_globals_editor.h index 6ec631d79a0..4fc0daaa10f 100644 --- a/editor/shader_globals_editor.h +++ b/editor/shader/shader_globals_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_sectioned_inspector.h" +#include "editor/inspector/editor_sectioned_inspector.h" #include "scene/gui/box_container.h" #include "scene/gui/option_button.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/text_shader_editor.cpp b/editor/shader/text_shader_editor.cpp similarity index 99% rename from editor/plugins/text_shader_editor.cpp rename to editor/shader/text_shader_editor.cpp index 99b50d8dd00..411d4bfe24a 100644 --- a/editor/plugins/text_shader_editor.cpp +++ b/editor/shader/text_shader_editor.cpp @@ -32,10 +32,10 @@ #include "core/config/project_settings.h" #include "core/version_generated.gen.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/text_shader_editor.h b/editor/shader/text_shader_editor.h similarity index 98% rename from editor/plugins/text_shader_editor.h rename to editor/shader/text_shader_editor.h index a1c575aaaff..c1f14361939 100644 --- a/editor/plugins/text_shader_editor.h +++ b/editor/shader/text_shader_editor.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/code_editor.h" -#include "editor/plugins/shader/shader_editor.h" +#include "editor/gui/code_editor.h" +#include "editor/shader/shader_editor.h" #include "scene/gui/menu_button.h" #include "scene/gui/rich_text_label.h" #include "servers/rendering/shader_warnings.h" diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/shader/visual_shader_editor_plugin.cpp similarity index 99% rename from editor/plugins/visual_shader_editor_plugin.cpp rename to editor/shader/visual_shader_editor_plugin.cpp index 2741150eaef..a66cd93e9c1 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/shader/visual_shader_editor_plugin.cpp @@ -35,18 +35,18 @@ #include "core/math/math_defs.h" #include "core/os/keyboard.h" #include "core/version_generated.gen.h" +#include "editor/docks/filesystem_dock.h" +#include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_properties.h" -#include "editor/editor_properties_vector.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" -#include "editor/inspector_dock.h" -#include "editor/plugins/curve_editor_plugin.h" -#include "editor/plugins/material_editor_plugin.h" -#include "editor/plugins/shader_editor_plugin.h" +#include "editor/file_system/editor_paths.h" +#include "editor/inspector/editor_properties.h" +#include "editor/inspector/editor_properties_vector.h" +#include "editor/scene/curve_editor_plugin.h" +#include "editor/scene/material_editor_plugin.h" +#include "editor/settings/editor_settings.h" +#include "editor/shader/shader_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/animation/tween.h" diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/shader/visual_shader_editor_plugin.h similarity index 99% rename from editor/plugins/visual_shader_editor_plugin.h rename to editor/shader/visual_shader_editor_plugin.h index 3b8afd502f6..87b69e29f75 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/shader/visual_shader_editor_plugin.h @@ -30,10 +30,10 @@ #pragma once -#include "editor/editor_properties.h" +#include "editor/inspector/editor_properties.h" #include "editor/plugins/editor_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "editor/plugins/shader/shader_editor.h" +#include "editor/shader/shader_editor.h" #include "scene/gui/graph_edit.h" #include "scene/resources/syntax_highlighter.h" #include "scene/resources/visual_shader.h" diff --git a/editor/themes/editor_fonts.cpp b/editor/themes/editor_fonts.cpp index 372393c67c5..c972ded2ddd 100644 --- a/editor/themes/editor_fonts.cpp +++ b/editor/themes/editor_fonts.cpp @@ -31,8 +31,8 @@ #include "editor_fonts.h" #include "core/io/dir_access.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/builtin_fonts.gen.h" #include "editor/themes/editor_scale.h" #include "scene/resources/font.h" diff --git a/editor/themes/editor_theme_manager.cpp b/editor/themes/editor_theme_manager.cpp index cfafb44c5db..0fcbd690ef4 100644 --- a/editor/themes/editor_theme_manager.cpp +++ b/editor/themes/editor_theme_manager.cpp @@ -32,8 +32,8 @@ #include "core/error/error_macros.h" #include "core/io/resource_loader.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_color_map.h" #include "editor/themes/editor_fonts.h" #include "editor/themes/editor_icons.h" diff --git a/editor/translations/SCsub b/editor/translations/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/translations/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_locale_dialog.cpp b/editor/translations/editor_locale_dialog.cpp similarity index 100% rename from editor/editor_locale_dialog.cpp rename to editor/translations/editor_locale_dialog.cpp diff --git a/editor/editor_locale_dialog.h b/editor/translations/editor_locale_dialog.h similarity index 100% rename from editor/editor_locale_dialog.h rename to editor/translations/editor_locale_dialog.h diff --git a/editor/editor_translation.cpp b/editor/translations/editor_translation.cpp similarity index 97% rename from editor/editor_translation.cpp rename to editor/translations/editor_translation.cpp index 7d70cd26ac6..8f0ded8c945 100644 --- a/editor/editor_translation.cpp +++ b/editor/translations/editor_translation.cpp @@ -28,16 +28,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/editor_translation.h" +#include "editor_translation.h" #include "core/io/compression.h" #include "core/io/file_access_memory.h" #include "core/io/translation_loader_po.h" #include "core/string/translation_server.h" -#include "editor/doc_translations.gen.h" -#include "editor/editor_translations.gen.h" -#include "editor/extractable_translations.gen.h" -#include "editor/property_translations.gen.h" +#include "editor/translations/doc_translations.gen.h" +#include "editor/translations/editor_translations.gen.h" +#include "editor/translations/extractable_translations.gen.h" +#include "editor/translations/property_translations.gen.h" Vector get_editor_locales() { Vector locales; diff --git a/editor/editor_translation.h b/editor/translations/editor_translation.h similarity index 100% rename from editor/editor_translation.h rename to editor/translations/editor_translation.h diff --git a/editor/editor_translation_parser.cpp b/editor/translations/editor_translation_parser.cpp similarity index 100% rename from editor/editor_translation_parser.cpp rename to editor/translations/editor_translation_parser.cpp diff --git a/editor/editor_translation_parser.h b/editor/translations/editor_translation_parser.h similarity index 100% rename from editor/editor_translation_parser.h rename to editor/translations/editor_translation_parser.h diff --git a/editor/gui/editor_translation_preview_button.cpp b/editor/translations/editor_translation_preview_button.cpp similarity index 100% rename from editor/gui/editor_translation_preview_button.cpp rename to editor/translations/editor_translation_preview_button.cpp diff --git a/editor/gui/editor_translation_preview_button.h b/editor/translations/editor_translation_preview_button.h similarity index 100% rename from editor/gui/editor_translation_preview_button.h rename to editor/translations/editor_translation_preview_button.h diff --git a/editor/gui/editor_translation_preview_menu.cpp b/editor/translations/editor_translation_preview_menu.cpp similarity index 98% rename from editor/gui/editor_translation_preview_menu.cpp rename to editor/translations/editor_translation_preview_menu.cpp index 3fa67d005cb..0aee1edfebb 100644 --- a/editor/gui/editor_translation_preview_menu.cpp +++ b/editor/translations/editor_translation_preview_menu.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/gui/editor_translation_preview_menu.h" +#include "editor_translation_preview_menu.h" #include "core/string/translation_server.h" #include "editor/editor_node.h" diff --git a/editor/gui/editor_translation_preview_menu.h b/editor/translations/editor_translation_preview_menu.h similarity index 100% rename from editor/gui/editor_translation_preview_menu.h rename to editor/translations/editor_translation_preview_menu.h diff --git a/editor/localization_editor.cpp b/editor/translations/localization_editor.cpp similarity index 99% rename from editor/localization_editor.cpp rename to editor/translations/localization_editor.cpp index af14fbeccb1..1a73cc6fd77 100644 --- a/editor/localization_editor.cpp +++ b/editor/translations/localization_editor.cpp @@ -32,12 +32,12 @@ #include "core/config/project_settings.h" #include "core/string/translation_server.h" -#include "editor/editor_settings.h" -#include "editor/editor_translation_parser.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/filesystem_dock.h" #include "editor/gui/editor_file_dialog.h" -#include "editor/pot_generator.h" +#include "editor/settings/editor_settings.h" +#include "editor/translations/editor_translation_parser.h" +#include "editor/translations/pot_generator.h" #include "scene/gui/control.h" #include "scene/gui/tab_container.h" diff --git a/editor/localization_editor.h b/editor/translations/localization_editor.h similarity index 98% rename from editor/localization_editor.h rename to editor/translations/localization_editor.h index f5e693d2e54..c608edce40f 100644 --- a/editor/localization_editor.h +++ b/editor/translations/localization_editor.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_locale_dialog.h" +#include "editor/translations/editor_locale_dialog.h" #include "scene/gui/check_box.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/packed_scene_translation_parser_plugin.cpp b/editor/translations/packed_scene_translation_parser_plugin.cpp similarity index 100% rename from editor/plugins/packed_scene_translation_parser_plugin.cpp rename to editor/translations/packed_scene_translation_parser_plugin.cpp diff --git a/editor/plugins/packed_scene_translation_parser_plugin.h b/editor/translations/packed_scene_translation_parser_plugin.h similarity index 98% rename from editor/plugins/packed_scene_translation_parser_plugin.h rename to editor/translations/packed_scene_translation_parser_plugin.h index 2020ebe7c91..bc0097629d8 100644 --- a/editor/plugins/packed_scene_translation_parser_plugin.h +++ b/editor/translations/packed_scene_translation_parser_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_translation_parser.h" +#include "editor/translations/editor_translation_parser.h" class PackedSceneEditorTranslationParserPlugin : public EditorTranslationParserPlugin { GDCLASS(PackedSceneEditorTranslationParserPlugin, EditorTranslationParserPlugin); diff --git a/editor/pot_generator.cpp b/editor/translations/pot_generator.cpp similarity index 98% rename from editor/pot_generator.cpp rename to editor/translations/pot_generator.cpp index 272bb0f01cd..17c5da2a906 100644 --- a/editor/pot_generator.cpp +++ b/editor/translations/pot_generator.cpp @@ -32,8 +32,8 @@ #include "core/config/project_settings.h" #include "core/error/error_macros.h" -#include "editor/editor_translation.h" -#include "editor/editor_translation_parser.h" +#include "editor/translations/editor_translation.h" +#include "editor/translations/editor_translation_parser.h" POTGenerator *POTGenerator::singleton = nullptr; diff --git a/editor/pot_generator.h b/editor/translations/pot_generator.h similarity index 100% rename from editor/pot_generator.h rename to editor/translations/pot_generator.h diff --git a/editor/version_control/SCsub b/editor/version_control/SCsub new file mode 100644 index 00000000000..b3cff5b9dc6 --- /dev/null +++ b/editor/version_control/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") + +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_vcs_interface.cpp b/editor/version_control/editor_vcs_interface.cpp similarity index 99% rename from editor/editor_vcs_interface.cpp rename to editor/version_control/editor_vcs_interface.cpp index 6a5d49e41a9..4c9eeb97c18 100644 --- a/editor/editor_vcs_interface.cpp +++ b/editor/version_control/editor_vcs_interface.cpp @@ -30,7 +30,7 @@ #include "editor_vcs_interface.h" -#include "editor_node.h" +#include "editor/editor_node.h" EditorVCSInterface *EditorVCSInterface::singleton = nullptr; diff --git a/editor/editor_vcs_interface.h b/editor/version_control/editor_vcs_interface.h similarity index 100% rename from editor/editor_vcs_interface.h rename to editor/version_control/editor_vcs_interface.h diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/version_control/version_control_editor_plugin.cpp similarity index 99% rename from editor/plugins/version_control_editor_plugin.cpp rename to editor/version_control/version_control_editor_plugin.cpp index 81693a81aca..6d7f4a0beef 100644 --- a/editor/plugins/version_control_editor_plugin.cpp +++ b/editor/version_control/version_control_editor_plugin.cpp @@ -33,16 +33,16 @@ #include "core/config/project_settings.h" #include "core/os/keyboard.h" #include "core/os/time.h" -#include "editor/editor_command_palette.h" -#include "editor/editor_dock_manager.h" -#include "editor/editor_file_system.h" +#include "editor/docks/editor_dock_manager.h" +#include "editor/docks/filesystem_dock.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/filesystem_dock.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_bottom_panel.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/flow_container.h" #include "scene/gui/line_edit.h" diff --git a/editor/plugins/version_control_editor_plugin.h b/editor/version_control/version_control_editor_plugin.h similarity index 99% rename from editor/plugins/version_control_editor_plugin.h rename to editor/version_control/version_control_editor_plugin.h index 9d6e1e81323..0e7319c8f0e 100644 --- a/editor/plugins/version_control_editor_plugin.h +++ b/editor/version_control/version_control_editor_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/editor_vcs_interface.h" #include "editor/plugins/editor_plugin.h" +#include "editor/version_control/editor_vcs_interface.h" #include "scene/gui/check_button.h" #include "scene/gui/file_dialog.h" #include "scene/gui/menu_button.h" diff --git a/main/main.cpp b/main/main.cpp index 13ec7d3f4b2..7e0e7b15c85 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -109,24 +109,24 @@ #ifdef TOOLS_ENABLED #include "editor/debugger/debug_adapter/debug_adapter_server.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/doc_data_class_path.gen.h" -#include "editor/doc_tools.h" -#include "editor/editor_file_system.h" -#include "editor/editor_help.h" +#include "editor/doc/doc_data_class_path.gen.h" +#include "editor/doc/doc_tools.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" -#include "editor/editor_translation.h" -#include "editor/progress_dialog.h" -#include "editor/project_manager.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" +#include "editor/gui/progress_dialog.h" +#include "editor/project_manager/project_manager.h" #include "editor/register_editor_types.h" +#include "editor/settings/editor_settings.h" +#include "editor/translations/editor_translation.h" #if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH) #include "main/splash_editor.gen.h" #endif #ifndef DISABLE_DEPRECATED -#include "editor/project_converter_3_to_4.h" +#include "editor/project_upgrade/project_converter_3_to_4.h" #endif // DISABLE_DEPRECATED #endif // TOOLS_ENABLED diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp index 88173d19ddc..d26e0ad0da5 100644 --- a/modules/csg/editor/csg_gizmos.cpp +++ b/modules/csg/editor/csg_gizmos.cpp @@ -31,10 +31,10 @@ #include "csg_gizmos.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/gizmos/gizmo_3d_helper.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/gizmos/gizmo_3d_helper.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/camera_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics/collision_shape_3d.h" diff --git a/modules/csg/editor/csg_gizmos.h b/modules/csg/editor/csg_gizmos.h index 32f5ba6a48f..b313efc91ad 100644 --- a/modules/csg/editor/csg_gizmos.h +++ b/modules/csg/editor/csg_gizmos.h @@ -33,7 +33,7 @@ #include "../csg_shape.h" #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" #include "scene/gui/control.h" class AcceptDialog; diff --git a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp index 949be212f7d..5d6eb5febaa 100644 --- a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp +++ b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp @@ -31,7 +31,7 @@ #include "editor_scene_importer_fbx2gltf.h" #include "core/config/project_settings.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor_scene_importer_ufbx.h" #include "modules/gltf/gltf_document.h" diff --git a/modules/fbx/fbx_document.cpp b/modules/fbx/fbx_document.cpp index e9776538a47..f04cd984379 100644 --- a/modules/fbx/fbx_document.cpp +++ b/modules/fbx/fbx_document.cpp @@ -53,7 +53,7 @@ #include "modules/gltf/structures/gltf_camera.h" #ifdef TOOLS_ENABLED -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" #endif // FIXME: Hardcoded to avoid editor dependency. diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp index a3cb4e5c074..60e0aa21a39 100644 --- a/modules/gdscript/editor/gdscript_highlighter.cpp +++ b/modules/gdscript/editor/gdscript_highlighter.cpp @@ -35,7 +35,7 @@ #include "core/config/project_settings.h" #include "core/core_constants.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/text_edit.h" diff --git a/modules/gdscript/editor/gdscript_highlighter.h b/modules/gdscript/editor/gdscript_highlighter.h index 7f317184885..263c2a02377 100644 --- a/modules/gdscript/editor/gdscript_highlighter.h +++ b/modules/gdscript/editor/gdscript_highlighter.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/script_editor_plugin.h" +#include "editor/script/script_editor_plugin.h" class GDScriptSyntaxHighlighter : public EditorSyntaxHighlighter { GDCLASS(GDScriptSyntaxHighlighter, EditorSyntaxHighlighter) diff --git a/modules/gdscript/editor/gdscript_translation_parser_plugin.h b/modules/gdscript/editor/gdscript_translation_parser_plugin.h index cfa8faada0c..2b95a827eef 100644 --- a/modules/gdscript/editor/gdscript_translation_parser_plugin.h +++ b/modules/gdscript/editor/gdscript_translation_parser_plugin.h @@ -35,7 +35,7 @@ #include "core/templates/hash_map.h" #include "core/templates/hash_set.h" -#include "editor/editor_translation_parser.h" +#include "editor/translations/editor_translation_parser.h" class GDScriptEditorTranslationParserPlugin : public EditorTranslationParserPlugin { GDCLASS(GDScriptEditorTranslationParserPlugin, EditorTranslationParserPlugin); diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 6e60e1528f7..8209014d948 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -56,7 +56,7 @@ #ifdef TOOLS_ENABLED #include "core/extension/gdextension_manager.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_paths.h" #endif /////////////////////////// diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 5f0791477ec..fa3871e9ef1 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -46,7 +46,7 @@ #if defined(TOOLS_ENABLED) && !defined(DISABLE_DEPRECATED) #define SUGGEST_GODOT4_RENAMES -#include "editor/renames_map_3_to_4.h" +#include "editor/project_upgrade/renames_map_3_to_4.h" #endif #define UNNAMED_ENUM "" diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 2533e8ad69c..82607534a99 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -47,10 +47,10 @@ #ifdef TOOLS_ENABLED #include "core/config/project_settings.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" #endif Vector GDScriptLanguage::get_comment_delimiters() const { diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 79ca8513c32..5fc01d7bc71 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -44,7 +44,7 @@ #endif #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif // This function is used to determine that a type is "built-in" as opposed to native diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index c46555a9db6..04e9da8c132 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -38,7 +38,7 @@ #endif #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif static const char *token_names[] = { diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp index d2eab727bea..83309547a51 100644 --- a/modules/gdscript/language_server/gdscript_extend_parser.cpp +++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp @@ -32,7 +32,7 @@ #include "../gdscript.h" #include "../gdscript_analyzer.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "gdscript_language_protocol.h" #include "gdscript_workspace.h" diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index 2f0c6bbe4f2..7e19fa8e731 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -31,11 +31,11 @@ #include "gdscript_language_protocol.h" #include "core/config/project_settings.h" -#include "editor/doc_tools.h" -#include "editor/editor_help.h" +#include "editor/doc/doc_tools.h" +#include "editor/doc/editor_help.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" GDScriptLanguageProtocol *GDScriptLanguageProtocol::singleton = nullptr; diff --git a/modules/gdscript/language_server/gdscript_language_server.cpp b/modules/gdscript/language_server/gdscript_language_server.cpp index f13632e67f0..e415af75c1d 100644 --- a/modules/gdscript/language_server/gdscript_language_server.cpp +++ b/modules/gdscript/language_server/gdscript_language_server.cpp @@ -33,7 +33,7 @@ #include "core/os/os.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" int GDScriptLanguageServer::port_override = -1; diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp index 617be2f96c5..eaaa4bb2705 100644 --- a/modules/gdscript/language_server/gdscript_text_document.cpp +++ b/modules/gdscript/language_server/gdscript_text_document.cpp @@ -34,8 +34,8 @@ #include "gdscript_extend_parser.h" #include "gdscript_language_protocol.h" -#include "editor/editor_settings.h" -#include "editor/plugins/script_text_editor.h" +#include "editor/script/script_text_editor.h" +#include "editor/settings/editor_settings.h" #include "servers/display_server.h" void GDScriptTextDocument::_bind_methods() { diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index 4121f01c607..4670f64f81a 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -36,11 +36,11 @@ #include "core/config/project_settings.h" #include "core/object/script_language.h" -#include "editor/doc_tools.h" -#include "editor/editor_file_system.h" -#include "editor/editor_help.h" +#include "editor/doc/doc_tools.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" #include "scene/resources/packed_scene.h" void GDScriptWorkspace::_bind_methods() { diff --git a/modules/gdscript/language_server/gdscript_workspace.h b/modules/gdscript/language_server/gdscript_workspace.h index 63ff8e1bf5e..84278f7c8a7 100644 --- a/modules/gdscript/language_server/gdscript_workspace.h +++ b/modules/gdscript/language_server/gdscript_workspace.h @@ -35,7 +35,7 @@ #include "godot_lsp.h" #include "core/variant/variant.h" -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" class GDScriptWorkspace : public RefCounted { GDCLASS(GDScriptWorkspace, RefCounted); diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp index 5e7bb30d309..64197c6010d 100644 --- a/modules/gdscript/register_types.cpp +++ b/modules/gdscript/register_types.cpp @@ -54,8 +54,8 @@ #ifdef TOOLS_ENABLED #include "editor/editor_node.h" -#include "editor/editor_translation_parser.h" #include "editor/export/editor_export.h" +#include "editor/translations/editor_translation_parser.h" #ifndef GDSCRIPT_NO_LSP #include "core/config/engine.h" diff --git a/modules/gdscript/tests/test_completion.h b/modules/gdscript/tests/test_completion.h index 02c13f49c9f..56fdd3426bd 100644 --- a/modules/gdscript/tests/test_completion.h +++ b/modules/gdscript/tests/test_completion.h @@ -44,7 +44,7 @@ #include "core/object/script_language.h" #include "core/variant/dictionary.h" #include "core/variant/variant.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/resources/packed_scene.h" #include "scene/theme/theme_db.h" diff --git a/modules/gdscript/tests/test_gdscript.cpp b/modules/gdscript/tests/test_gdscript.cpp index 2c79f41ffe1..bde44d7dbf6 100644 --- a/modules/gdscript/tests/test_gdscript.cpp +++ b/modules/gdscript/tests/test_gdscript.cpp @@ -42,7 +42,7 @@ #include "core/string/string_builder.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif namespace GDScriptTests { diff --git a/modules/gdscript/tests/test_lsp.h b/modules/gdscript/tests/test_lsp.h index 535a935983c..4f67d40f610 100644 --- a/modules/gdscript/tests/test_lsp.h +++ b/modules/gdscript/tests/test_lsp.h @@ -46,7 +46,7 @@ #include "core/io/dir_access.h" #include "core/io/file_access_pack.h" #include "core/os/os.h" -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "editor/editor_node.h" #include "modules/gdscript/gdscript_analyzer.h" diff --git a/modules/gltf/editor/editor_import_blend_runner.cpp b/modules/gltf/editor/editor_import_blend_runner.cpp index f10ca5278d9..7b99ba656c4 100644 --- a/modules/gltf/editor/editor_import_blend_runner.cpp +++ b/modules/gltf/editor/editor_import_blend_runner.cpp @@ -31,9 +31,9 @@ #include "editor_import_blend_runner.h" #include "core/io/http_client.h" -#include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" static constexpr char PYTHON_SCRIPT_RPC[] = R"( import bpy, sys, threading diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp index f16224f238d..96b7485a4fd 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp @@ -32,11 +32,11 @@ #include "editor_scene_exporter_gltf_settings.h" -#include "editor/editor_file_system.h" -#include "editor/editor_inspector.h" #include "editor/editor_node.h" +#include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" #include "editor/import/3d/scene_import_settings.h" +#include "editor/inspector/editor_inspector.h" #include "editor/themes/editor_scale.h" String SceneExporterGLTFPlugin::get_plugin_name() const { diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 2e233a80e9b..7705ae15032 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -36,9 +36,9 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "main/main.h" #include "scene/gui/line_edit.h" diff --git a/modules/gltf/editor/editor_scene_importer_blend.h b/modules/gltf/editor/editor_scene_importer_blend.h index 3d104d5aae7..3e703f20e2f 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.h +++ b/modules/gltf/editor/editor_scene_importer_blend.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" #include "editor/import/3d/resource_importer_scene.h" class Animation; diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 18998195173..d5470a33dc7 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -59,7 +59,7 @@ #include "scene/resources/surface_tool.h" #ifdef TOOLS_ENABLED -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" #endif #include "modules/modules_enabled.gen.h" // For csg, gridmap. diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp index 49dca319808..8a211649e99 100644 --- a/modules/gltf/register_types.cpp +++ b/modules/gltf/register_types.cpp @@ -50,7 +50,7 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" static void _editor_init() { Ref import_gltf; diff --git a/modules/gltf/tests/test_gltf.h b/modules/gltf/tests/test_gltf.h index 1a7c8472090..fb4dfc1bdb8 100644 --- a/modules/gltf/tests/test_gltf.h +++ b/modules/gltf/tests/test_gltf.h @@ -36,9 +36,9 @@ #include "core/os/os.h" #include "drivers/png/image_loader_png.h" -#include "editor/editor_resource_preview.h" #include "editor/import/3d/resource_importer_scene.h" #include "editor/import/resource_importer_texture.h" +#include "editor/inspector/editor_resource_preview.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/skeleton_3d.h" #include "scene/main/window.h" diff --git a/modules/gltf/tests/test_gltf_images.h b/modules/gltf/tests/test_gltf_images.h index f364f7aa4da..c64c89a1e04 100644 --- a/modules/gltf/tests/test_gltf_images.h +++ b/modules/gltf/tests/test_gltf_images.h @@ -34,8 +34,8 @@ #ifdef TOOLS_ENABLED -#include "editor/editor_file_system.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/file_system/editor_paths.h" #include "scene/resources/image_texture.h" namespace TestGltf { diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index aa377172eab..d96c98c52ac 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -31,15 +31,15 @@ #include "grid_map_editor_plugin.h" #include "core/os/keyboard.h" -#include "editor/editor_command_palette.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_zoom_widget.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/3d/camera_3d.h" #include "scene/gui/dialogs.h" diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h index b7e527de20d..58873f61e2c 100644 --- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h +++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" #include "scene/gui/dialogs.h" diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp index 5b6b158499c..cbf74091188 100644 --- a/modules/lightmapper_rd/lightmapper_rd.cpp +++ b/modules/lightmapper_rd/lightmapper_rd.cpp @@ -38,8 +38,8 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/math/geometry_2d.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "servers/rendering/rendering_device_binds.h" #include "servers/rendering/rendering_server_globals.h" diff --git a/modules/mbedtls/tls_context_mbedtls.cpp b/modules/mbedtls/tls_context_mbedtls.cpp index 06d5223af26..68956391468 100644 --- a/modules/mbedtls/tls_context_mbedtls.cpp +++ b/modules/mbedtls/tls_context_mbedtls.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif // TOOLS_ENABLED static void my_debug(void *ctx, int level, diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 499451ab0fc..8bbb185d241 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -59,11 +59,11 @@ #ifdef TOOLS_ENABLED #include "core/os/keyboard.h" -#include "editor/editor_file_system.h" +#include "editor/docks/inspector_dock.h" +#include "editor/docks/node_dock.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" -#include "editor/inspector_dock.h" -#include "editor/node_dock.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" #endif // Types that will be skipped over (in favor of their base types) when setting up instance bindings. diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h index 75dd97100d2..6964470bc98 100644 --- a/modules/mono/editor/bindings_generator.h +++ b/modules/mono/editor/bindings_generator.h @@ -37,8 +37,8 @@ #include "core/string/string_builder.h" #include "core/string/ustring.h" #include "core/typedefs.h" -#include "editor/doc_tools.h" -#include "editor/editor_help.h" +#include "editor/doc/doc_tools.h" +#include "editor/doc/editor_help.h" class BindingsGenerator { struct ConstantInterface { diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp index c973dcbc8e0..b9936b8c2f3 100644 --- a/modules/mono/editor/code_completion.cpp +++ b/modules/mono/editor/code_completion.cpp @@ -32,8 +32,8 @@ #include "core/config/project_settings.h" #include "core/object/script_language.h" -#include "editor/editor_file_system.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_file_system.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/control.h" #include "scene/main/node.h" #include "scene/theme/theme_db.h" diff --git a/modules/mono/editor/editor_internal_calls.cpp b/modules/mono/editor/editor_internal_calls.cpp index adc150f1bc4..927adbe08d9 100644 --- a/modules/mono/editor/editor_internal_calls.cpp +++ b/modules/mono/editor/editor_internal_calls.cpp @@ -43,11 +43,11 @@ #include "editor/debugger/editor_debugger_node.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/export/lipo.h" -#include "editor/gui/editor_run_bar.h" -#include "editor/plugins/script_editor_plugin.h" +#include "editor/file_system/editor_paths.h" +#include "editor/run/editor_run_bar.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "main/main.h" diff --git a/modules/mono/glue/runtime_interop.cpp b/modules/mono/glue/runtime_interop.cpp index 607e7914bd9..65ad599cd2c 100644 --- a/modules/mono/glue/runtime_interop.cpp +++ b/modules/mono/glue/runtime_interop.cpp @@ -48,7 +48,7 @@ #include "core/string/string_name.h" #ifdef TOOLS_ENABLED -#include "editor/editor_file_system.h" +#include "editor/file_system/editor_file_system.h" #endif #ifdef __cplusplus diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index 5ee75ce8653..aed7effb7dd 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -39,7 +39,7 @@ #ifdef TOOLS_ENABLED #include "core/version.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_paths.h" #endif namespace GodotSharpDirs { diff --git a/modules/multiplayer/editor/editor_network_profiler.cpp b/modules/multiplayer/editor/editor_network_profiler.cpp index 9e2bde5050b..133fd034c4b 100644 --- a/modules/multiplayer/editor/editor_network_profiler.cpp +++ b/modules/multiplayer/editor/editor_network_profiler.cpp @@ -30,9 +30,9 @@ #include "editor_network_profiler.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/gui/editor_run_bar.h" +#include "editor/run/editor_run_bar.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp index 7488afda78e..10116b463f3 100644 --- a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp +++ b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp @@ -34,10 +34,10 @@ #include "editor_network_profiler.h" #include "replication_editor.h" -#include "editor/editor_command_palette.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/settings/editor_command_palette.h" void MultiplayerEditorDebugger::_bind_methods() { ADD_SIGNAL(MethodInfo("open_request", PropertyInfo(Variant::STRING, "path"))); diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.h b/modules/multiplayer/editor/multiplayer_editor_plugin.h index 2a3b3a12ae3..3832a6d3a63 100644 --- a/modules/multiplayer/editor/multiplayer_editor_plugin.h +++ b/modules/multiplayer/editor/multiplayer_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/editor_debugger_plugin.h" +#include "editor/debugger/editor_debugger_plugin.h" #include "editor/plugins/editor_plugin.h" class EditorNetworkProfiler; diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index 55fda45f735..7a415ab0dce 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -33,11 +33,11 @@ #include "../multiplayer_synchronizer.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/scene_tree_editor.h" -#include "editor/property_selector.h" +#include "editor/inspector/property_selector.h" +#include "editor/scene/scene_tree_editor.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/dialogs.h" diff --git a/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp b/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp index a0cac2a4f48..d3f427e5102 100644 --- a/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp +++ b/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp @@ -31,9 +31,9 @@ #include "navigation_link_2d_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/main/viewport.h" void NavigationLink2DEditor::_notification(int p_what) { diff --git a/modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.h b/modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.h index 62f5520581a..2cd55af49d7 100644 --- a/modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.h +++ b/modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" #include "scene/2d/navigation/navigation_obstacle_2d.h" class NavigationObstacle2DEditor : public AbstractPolygon2DEditor { diff --git a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp index e05c4ba1bf6..009079e3f48 100644 --- a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp +++ b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp @@ -31,8 +31,8 @@ #include "navigation_region_2d_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/settings/editor_settings.h" #include "scene/2d/navigation/navigation_region_2d.h" #include "scene/gui/dialogs.h" diff --git a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.h b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.h index 6caa2dc060b..864abb29801 100644 --- a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.h +++ b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.h @@ -30,8 +30,8 @@ #pragma once -#include "editor/plugins/abstract_polygon_2d_editor.h" #include "editor/plugins/editor_plugin.h" +#include "editor/scene/2d/abstract_polygon_2d_editor.h" class AcceptDialog; class HBoxContainer; diff --git a/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.cpp index 6c0bcc1856a..752849abce2 100644 --- a/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "navigation_link_3d_editor_plugin.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/navigation/navigation_link_3d.h" void NavigationLink3DEditorPlugin::edit(Object *p_object) { diff --git a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp index 139a2afe8af..375b31b6642 100644 --- a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp @@ -31,7 +31,7 @@ #include "navigation_link_3d_gizmo_plugin.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/navigation/navigation_link_3d.h" #include "servers/navigation_server_3d.h" diff --git a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.h b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.h index cb3e25e5e0f..24e22d81e14 100644 --- a/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.h +++ b/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class NavigationLink3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(NavigationLink3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp index debed29bed2..7e659465c8c 100644 --- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp @@ -32,10 +32,10 @@ #include "core/math/geometry_2d.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" +#include "editor/settings/editor_settings.h" #include "scene/3d/navigation/navigation_obstacle_3d.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h index f00c97efda1..cd529386f5d 100644 --- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h +++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" #include "scene/gui/box_container.h" class Button; diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp index a21164ca2ec..704c8908994 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp @@ -32,8 +32,8 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" -#include "editor/multi_node_edit.h" -#include "editor/plugins/node_3d_editor_plugin.h" +#include "editor/inspector/multi_node_edit.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/3d/navigation/navigation_region_3d.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h index 2235e25deda..15039b93f78 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h +++ b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/node_3d_editor_gizmos.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" class NavigationRegion3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(NavigationRegion3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/modules/noise/editor/noise_editor_plugin.cpp b/modules/noise/editor/noise_editor_plugin.cpp index b1f3cb5e720..4a922438083 100644 --- a/modules/noise/editor/noise_editor_plugin.cpp +++ b/modules/noise/editor/noise_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "../noise.h" #include "../noise_texture_2d.h" -#include "editor/editor_inspector.h" +#include "editor/inspector/editor_inspector.h" #include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #include "scene/gui/texture_rect.h" diff --git a/modules/openxr/editor/openxr_binding_modifier_editor.h b/modules/openxr/editor/openxr_binding_modifier_editor.h index cf1f586c57c..477bdb99dc8 100644 --- a/modules/openxr/editor/openxr_binding_modifier_editor.h +++ b/modules/openxr/editor/openxr_binding_modifier_editor.h @@ -33,8 +33,8 @@ #include "../action_map/openxr_action_map.h" #include "../action_map/openxr_action_set.h" #include "../action_map/openxr_binding_modifier.h" -#include "editor/editor_inspector.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/inspector/editor_inspector.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/label.h" diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.h b/modules/openxr/editor/openxr_binding_modifiers_dialog.h index 128781190d9..f973c03fe55 100644 --- a/modules/openxr/editor/openxr_binding_modifiers_dialog.h +++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.h @@ -33,8 +33,8 @@ #include "../action_map/openxr_action_map.h" #include "../action_map/openxr_interaction_profile.h" #include "../editor/openxr_binding_modifier_editor.h" -#include "editor/create_dialog.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/create_dialog.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/modules/openxr/editor/openxr_editor_plugin.cpp b/modules/openxr/editor/openxr_editor_plugin.cpp index 146c19b8c52..09b4ef3203b 100644 --- a/modules/openxr/editor/openxr_editor_plugin.cpp +++ b/modules/openxr/editor/openxr_editor_plugin.cpp @@ -32,9 +32,9 @@ #include "../action_map/openxr_action_map.h" -#include "editor/editor_command_palette.h" #include "editor/editor_node.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/settings/editor_command_palette.h" void OpenXREditorPlugin::edit(Object *p_node) { if (Object::cast_to(p_node)) { diff --git a/modules/openxr/editor/openxr_select_runtime.cpp b/modules/openxr/editor/openxr_select_runtime.cpp index bc90cd3e2eb..bc7ba844231 100644 --- a/modules/openxr/editor/openxr_select_runtime.cpp +++ b/modules/openxr/editor/openxr_select_runtime.cpp @@ -32,7 +32,7 @@ #include "core/io/dir_access.h" #include "core/os/os.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" void OpenXRSelectRuntime::_update_items() { Ref da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); diff --git a/modules/websocket/editor/editor_debugger_server_websocket.cpp b/modules/websocket/editor/editor_debugger_server_websocket.cpp index 6fc490d344b..6c032dd9daf 100644 --- a/modules/websocket/editor/editor_debugger_server_websocket.cpp +++ b/modules/websocket/editor/editor_debugger_server_websocket.cpp @@ -34,7 +34,7 @@ #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" void EditorDebuggerServerWebSocket::poll() { if (pending_peer.is_null() && tcp_server->is_connection_available()) { diff --git a/platform/android/editor/editor_utils_jni.cpp b/platform/android/editor/editor_utils_jni.cpp index 0167dceb31a..747548600e5 100644 --- a/platform/android/editor/editor_utils_jni.cpp +++ b/platform/android/editor/editor_utils_jni.cpp @@ -33,7 +33,7 @@ #include "jni_utils.h" #ifdef TOOLS_ENABLED -#include "editor/gui/editor_run_bar.h" +#include "editor/run/editor_run_bar.h" #include "main/main.h" #endif diff --git a/platform/android/editor/game_menu_utils_jni.cpp b/platform/android/editor/game_menu_utils_jni.cpp index 852894f5297..0049ee94e1a 100644 --- a/platform/android/editor/game_menu_utils_jni.cpp +++ b/platform/android/editor/game_menu_utils_jni.cpp @@ -33,7 +33,7 @@ #ifdef TOOLS_ENABLED #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/plugins/game_view_plugin.h" +#include "editor/run/game_view_plugin.h" static GameViewPlugin *_get_game_view_plugin() { ERR_FAIL_NULL_V(EditorNode::get_singleton(), nullptr); diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 7aba3d7a9a9..9b0c67a7d8a 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -33,9 +33,9 @@ #include "export_plugin.h" #include "core/os/os.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" String get_default_android_sdk_path(); diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index b7958842210..8a5d204e325 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -42,10 +42,10 @@ #include "drivers/png/png_driver_common.h" #include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" #include "editor/export/export_template_manager.h" +#include "editor/file_system/editor_paths.h" #include "editor/import/resource_importer_texture_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "main/splash.gen.h" #include "scene/resources/image_texture.h" diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index d2102785c32..cfe3832fdda 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -56,7 +56,7 @@ #endif // XR_DISABLED #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif #include diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index bba6ca27d9b..2f495b1539c 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -45,7 +45,7 @@ #include "drivers/unix/file_access_unix.h" #ifdef TOOLS_ENABLED #include "editor/editor_node.h" -#include "editor/plugins/game_view_plugin.h" +#include "editor/run/game_view_plugin.h" #endif #include "main/main.h" #include "scene/main/scene_tree.h" diff --git a/platform/linuxbsd/export/export_plugin.cpp b/platform/linuxbsd/export/export_plugin.cpp index 757d148e7b5..e184d8d94cd 100644 --- a/platform/linuxbsd/export/export_plugin.cpp +++ b/platform/linuxbsd/export/export_plugin.cpp @@ -35,9 +35,9 @@ #include "core/config/project_settings.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" +#include "editor/file_system/editor_paths.h" #include "editor/themes/editor_scale.h" #include "modules/svg/image_loader_svg.h" diff --git a/platform/linuxbsd/export/export_plugin.h b/platform/linuxbsd/export/export_plugin.h index d616e3af54b..d375ceef618 100644 --- a/platform/linuxbsd/export/export_plugin.h +++ b/platform/linuxbsd/export/export_plugin.h @@ -31,8 +31,8 @@ #pragma once #include "core/io/file_access.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export_platform_pc.h" +#include "editor/settings/editor_settings.h" #include "scene/resources/image_texture.h" class EditorExportPlatformLinuxBSD : public EditorExportPlatformPC { diff --git a/platform/macos/editor/embedded_game_view_plugin.h b/platform/macos/editor/embedded_game_view_plugin.h index b50d063c7b1..21a234324e6 100644 --- a/platform/macos/editor/embedded_game_view_plugin.h +++ b/platform/macos/editor/embedded_game_view_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/game_view_plugin.h" +#include "editor/run/game_view_plugin.h" class EmbeddedProcessMacOS; diff --git a/platform/macos/editor/embedded_game_view_plugin.mm b/platform/macos/editor/embedded_game_view_plugin.mm index 89655a2c010..f948ff69b4f 100644 --- a/platform/macos/editor/embedded_game_view_plugin.mm +++ b/platform/macos/editor/embedded_game_view_plugin.mm @@ -33,7 +33,7 @@ #include "embedded_process_macos.h" #include "editor/editor_node.h" -#include "editor/window_wrapper.h" +#include "editor/gui/window_wrapper.h" HashMap GameViewDebuggerMacOS::parse_message_handlers; diff --git a/platform/macos/editor/embedded_process_macos.h b/platform/macos/editor/embedded_process_macos.h index bd00766aade..aac0acd766f 100644 --- a/platform/macos/editor/embedded_process_macos.h +++ b/platform/macos/editor/embedded_process_macos.h @@ -30,7 +30,7 @@ #pragma once -#include "editor/plugins/embedded_process.h" +#include "editor/run/embedded_process.h" class DisplayServerMacOS; class EmbeddedProcessMacOS; diff --git a/platform/macos/editor/embedded_process_macos.mm b/platform/macos/editor/embedded_process_macos.mm index 81dd44e5a99..5a063f8a6cb 100644 --- a/platform/macos/editor/embedded_process_macos.mm +++ b/platform/macos/editor/embedded_process_macos.mm @@ -37,7 +37,7 @@ #include "editor/debugger/script_editor_debugger.h" #include "editor/editor_main_screen.h" #include "editor/editor_node.h" -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #include "scene/gui/control.h" #include "scene/main/window.h" diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index e180cfb408b..05bcf6a9c9d 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -38,11 +38,11 @@ #include "core/string/translation.h" #include "drivers/png/png_driver_common.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" #include "editor/editor_string_names.h" #include "editor/export/codesign.h" #include "editor/export/lipo.h" #include "editor/export/macho.h" +#include "editor/file_system/editor_paths.h" #include "editor/import/resource_importer_texture_settings.h" #include "editor/themes/editor_scale.h" #include "scene/resources/image_texture.h" diff --git a/platform/macos/export/export_plugin.h b/platform/macos/export/export_plugin.h index 607d98da9d7..5084bf02633 100644 --- a/platform/macos/export/export_plugin.h +++ b/platform/macos/export/export_plugin.h @@ -37,8 +37,8 @@ #include "core/io/marshalls.h" #include "core/io/resource_saver.h" #include "core/os/os.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export.h" +#include "editor/settings/editor_settings.h" #include diff --git a/platform/web/export/editor_http_server.h b/platform/web/export/editor_http_server.h index 32fbf4f5767..f5b2a8d2eec 100644 --- a/platform/web/export/editor_http_server.h +++ b/platform/web/export/editor_http_server.h @@ -34,7 +34,7 @@ #include "core/io/stream_peer_tls.h" #include "core/io/tcp_server.h" #include "core/io/zip_io.h" -#include "editor/editor_paths.h" +#include "editor/file_system/editor_paths.h" class EditorHTTPServer : public RefCounted { private: diff --git a/platform/web/export/export.cpp b/platform/web/export/export.cpp index ee6d02e68f5..f07d4d48d12 100644 --- a/platform/web/export/export.cpp +++ b/platform/web/export/export.cpp @@ -32,8 +32,8 @@ #include "export_plugin.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export.h" +#include "editor/settings/editor_settings.h" void register_web_exporter_types() { GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformWeb); diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp index 4575c3b51e1..f27ddb07ffd 100644 --- a/platform/web/export/export_plugin.cpp +++ b/platform/web/export/export_plugin.cpp @@ -34,10 +34,10 @@ #include "run_icon_svg.gen.h" #include "core/config/project_settings.h" -#include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" #include "editor/import/resource_importer_texture_settings.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/resources/image_texture.h" diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 9ea5bd8d024..3be93663462 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -37,9 +37,9 @@ #include "core/config/project_settings.h" #include "core/io/image_loader.h" #include "editor/editor_node.h" -#include "editor/editor_paths.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" +#include "editor/file_system/editor_paths.h" #include "editor/themes/editor_scale.h" #include "modules/svg/image_loader_svg.h" diff --git a/platform/windows/export/export_plugin.h b/platform/windows/export/export_plugin.h index 8a665769c07..034f58d8706 100644 --- a/platform/windows/export/export_plugin.h +++ b/platform/windows/export/export_plugin.h @@ -32,8 +32,8 @@ #include "core/io/file_access.h" #include "core/os/os.h" -#include "editor/editor_settings.h" #include "editor/export/editor_export_platform_pc.h" +#include "editor/settings/editor_settings.h" // Optional environment variables for defining confidential information. If any // of these is set, they will override the values set in the credentials file. diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp index 9459613d216..10bcbf77e4e 100644 --- a/scene/2d/skeleton_2d.cpp +++ b/scene/2d/skeleton_2d.cpp @@ -34,8 +34,8 @@ #ifdef TOOLS_ENABLED #include "editor/editor_data.h" -#include "editor/editor_settings.h" -#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/scene/canvas_item_editor_plugin.h" +#include "editor/settings/editor_settings.h" #endif //TOOLS_ENABLED bool Bone2D::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index ba6e2bb1cc3..0554ffc5c13 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -45,7 +45,7 @@ #include "servers/text_server.h" #ifdef TOOLS_ENABLED -#include "editor/plugins/control_editor_plugin.h" +#include "editor/scene/gui/control_editor_plugin.h" #endif // TOOLS_ENABLED // Editor plugin interoperability. diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 87236dade7c..0f54d6a2b60 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -42,7 +42,7 @@ #include "servers/text_server.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif void LineEdit::edit() { diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp index 181eef4018f..36aacc8a722 100644 --- a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp +++ b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp @@ -32,7 +32,7 @@ #include "scene/2d/skeleton_2d.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif // TOOLS_ENABLED /////////////////////////////////////// diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp index 310abf84fb9..8b4a6fcd095 100644 --- a/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp +++ b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp @@ -32,7 +32,7 @@ #include "scene/2d/skeleton_2d.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/settings/editor_settings.h" #endif // TOOLS_ENABLED bool SkeletonModification2DTwoBoneIK::_set(const StringName &p_path, const Variant &p_value) { diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 6bd28ac6240..08d27f13c3d 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -39,7 +39,7 @@ #include "texture.h" #ifdef TOOLS_ENABLED -#include "editor/editor_help.h" +#include "editor/doc/editor_help.h" #include "modules/modules_enabled.gen.h" // For regex. #ifdef MODULE_REGEX_ENABLED diff --git a/scu_builders.py b/scu_builders.py index b49df0a04a7..0a98d85ded0 100644 --- a/scu_builders.py +++ b/scu_builders.py @@ -289,18 +289,38 @@ def generate_scu_files(max_includes_per_scu): process_folder(["drivers/gles3/effects"]) process_folder(["drivers/gles3/storage"]) - process_folder(["editor"], ["file_system_dock", "editor_resource_preview"], 32) + process_folder(["editor"], [], 32) + process_folder(["editor/animation"]) + process_folder(["editor/asset_library"]) + process_folder(["editor/audio"]) process_folder(["editor/debugger"]) process_folder(["editor/debugger/debug_adapter"]) + process_folder(["editor/doc"]) + process_folder(["editor/docks"], ["file_system_dock"]) process_folder(["editor/export"]) + process_folder(["editor/file_system"]) process_folder(["editor/gui"]) + process_folder(["editor/inspector"], ["editor_resource_preview"]) process_folder(["editor/themes"]) process_folder(["editor/project_manager"]) + process_folder(["editor/project_upgrade"]) process_folder(["editor/import"]) process_folder(["editor/import/3d"]) process_folder(["editor/plugins"]) - process_folder(["editor/plugins/gizmos"]) - process_folder(["editor/plugins/tiles"]) + process_folder(["editor/run"]) + process_folder(["editor/scene"]) + process_folder(["editor/scene/2d"]) + process_folder(["editor/scene/2d/physics"]) + process_folder(["editor/scene/2d/tiles"]) + process_folder(["editor/scene/3d"]) + process_folder(["editor/scene/3d/gizmos"]) + process_folder(["editor/scene/gui"]) + process_folder(["editor/scene/texture"]) + process_folder(["editor/script"]) + process_folder(["editor/settings"]) + process_folder(["editor/shader"]) + process_folder(["editor/translations"]) + process_folder(["editor/version_control"]) process_folder(["platform/android/export"]) process_folder(["platform/ios/export"]) diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 1ef22167a64..46453d2f15c 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -35,8 +35,8 @@ #include "modules/modules_enabled.gen.h" #ifdef TOOLS_ENABLED -#include "editor/editor_paths.h" -#include "editor/editor_settings.h" +#include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #endif // TOOLS_ENABLED #include "tests/core/config/test_project_settings.h"