Merge pull request godotengine#104696 from AThousandShips/editor_redux

Editor: Restructure editor code

Author: Repiteo

.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

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) {

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,43 +58,58 @@ 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),
     )
 
     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])

editor/plugins/gizmos/SCsub editor/animation/SCsubeditor/plugins/gizmos/SCsub renamed to editor/animation/SCsub

@@ -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"

editor/animation_bezier_editor.cpp …or/animation/animation_bezier_editor.cppeditor/animation_bezier_editor.cpp renamed to editor/animation/animation_bezier_editor.cpp editor/animation_bezier_editor.cpp renamed to editor/animation/animation_bezier_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"

editor/animation_bezier_editor.h …itor/animation/animation_bezier_editor.heditor/animation_bezier_editor.h renamed to editor/animation/animation_bezier_editor.h editor/animation_bezier_editor.h renamed to editor/animation/animation_bezier_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"

…gins/animation_blend_space_1d_editor.cpp …tion/animation_blend_space_1d_editor.cppeditor/plugins/animation_blend_space_1d_editor.cpp renamed to editor/animation/animation_blend_space_1d_editor.cpp editor/plugins/animation_blend_space_1d_editor.cpp renamed to editor/animation/animation_blend_space_1d_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"

…lugins/animation_blend_space_1d_editor.h …mation/animation_blend_space_1d_editor.heditor/plugins/animation_blend_space_1d_editor.h renamed to editor/animation/animation_blend_space_1d_editor.h editor/plugins/animation_blend_space_1d_editor.h renamed to 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_2d.h"
 #include "scene/gui/graph_edit.h"