diff --git a/.gitignore b/.gitignore index 60d7dd4640c..9f761ce65c8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,12 +15,12 @@ core/method_bind_ext.inc core/script_encryption_key.cpp core/global_defaults.cpp drivers/unix/os_unix_global_settings_path.cpp -tools/editor/register_exporters.cpp -tools/editor/doc_data_compressed.h -tools/editor/certs_compressed.h -tools/editor/editor_icons.cpp -tools/editor/translations.h -tools/editor/builtin_fonts.h +editor/register_exporters.cpp +editor/doc_data_compressed.h +editor/certs_compressed.h +editor/editor_icons.cpp +editor/translations.h +editor/builtin_fonts.h .fscache make.bat log.txt diff --git a/SConstruct b/SConstruct index 84f3032f6e8..c43797b2e83 100644 --- a/SConstruct +++ b/SConstruct @@ -183,7 +183,7 @@ Help(opts.GenerateHelpText(env_base)) # generate help # add default include paths -env_base.Append(CPPPATH=['#core', '#core/math', '#tools', '#drivers', '#']) +env_base.Append(CPPPATH=['#core', '#core/math', '#editor', '#drivers', '#']) # configure ENV for platform env_base.platform_exporters = platform_exporters @@ -359,7 +359,7 @@ if selected_platform in platform_list: SConscript("core/SCsub") SConscript("servers/SCsub") SConscript("scene/SCsub") - SConscript("tools/editor/SCsub") + SConscript("editor/SCsub") SConscript("drivers/SCsub") SConscript("modules/SCsub") diff --git a/tools/editor/SCsub b/editor/SCsub similarity index 87% rename from tools/editor/SCsub rename to editor/SCsub index ee0223a2319..6c2b4b79b6f 100644 --- a/tools/editor/SCsub +++ b/editor/SCsub @@ -146,12 +146,12 @@ if (env["tools"] == "yes"): f.close() # API documentation - env.Depends("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml") - env.Command("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml", make_doc_header) + env.Depends("#editor/doc_data_compressed.h", "#doc/base/classes.xml") + env.Command("#editor/doc_data_compressed.h", "#doc/base/classes.xml", make_doc_header) # Certificates - env.Depends("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt") - env.Command("#tools/editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header) + env.Depends("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt") + env.Command("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header) import glob path = env.Dir('.').abspath @@ -159,15 +159,15 @@ if (env["tools"] == "yes"): # Translations tlist = glob.glob(path + "/translations/*.po") print("translations: ", tlist) - env.Depends('#tools/editor/translations.h', tlist) - env.Command('#tools/editor/translations.h', tlist, make_translations_header) + env.Depends('#editor/translations.h', tlist) + env.Command('#editor/translations.h', tlist, make_translations_header) # Fonts - flist = glob.glob(path + "/../../thirdparty/fonts/*.ttf") - flist.append(glob.glob(path + "/../../thirdparty/fonts/*.otf")) + flist = glob.glob(path + "/../thirdparty/fonts/*.ttf") + flist.append(glob.glob(path + "/../thirdparty/fonts/*.otf")) print("fonts: ", flist) - env.Depends('#tools/editor/builtin_fonts.h', flist) - env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header) + env.Depends('#editor/builtin_fonts.h', flist) + env.Command('#editor/builtin_fonts.h', flist, make_fonts_header) env.add_source_files(env.editor_sources, "*.cpp") diff --git a/tools/editor/animation_editor.cpp b/editor/animation_editor.cpp similarity index 99% rename from tools/editor/animation_editor.cpp rename to editor/animation_editor.cpp index 94d565f05de..8d57c2f68ae 100644 --- a/tools/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -34,7 +34,7 @@ #include "pair.h" #include "scene/gui/separator.h" #include "editor_node.h" -#include "tools/editor/plugins/animation_player_editor_plugin.h" +#include "editor/plugins/animation_player_editor_plugin.h" #include "scene/main/viewport.h" /* Missing to fix: diff --git a/tools/editor/animation_editor.h b/editor/animation_editor.h similarity index 100% rename from tools/editor/animation_editor.h rename to editor/animation_editor.h diff --git a/tools/editor/array_property_edit.cpp b/editor/array_property_edit.cpp similarity index 100% rename from tools/editor/array_property_edit.cpp rename to editor/array_property_edit.cpp diff --git a/tools/editor/array_property_edit.h b/editor/array_property_edit.h similarity index 100% rename from tools/editor/array_property_edit.h rename to editor/array_property_edit.h diff --git a/tools/editor/asset_library_editor_plugin.cpp b/editor/asset_library_editor_plugin.cpp similarity index 100% rename from tools/editor/asset_library_editor_plugin.cpp rename to editor/asset_library_editor_plugin.cpp diff --git a/tools/editor/asset_library_editor_plugin.h b/editor/asset_library_editor_plugin.h similarity index 100% rename from tools/editor/asset_library_editor_plugin.h rename to editor/asset_library_editor_plugin.h diff --git a/tools/editor/call_dialog.cpp b/editor/call_dialog.cpp similarity index 100% rename from tools/editor/call_dialog.cpp rename to editor/call_dialog.cpp diff --git a/tools/editor/call_dialog.h b/editor/call_dialog.h similarity index 98% rename from tools/editor/call_dialog.h rename to editor/call_dialog.h index d6c39281225..27394b822ed 100644 --- a/tools/editor/call_dialog.h +++ b/editor/call_dialog.h @@ -34,7 +34,7 @@ #include "scene/gui/tree.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" -#include "tools/editor/property_editor.h" +#include "editor/property_editor.h" /** @author Juan Linietsky */ diff --git a/tools/editor/code_editor.cpp b/editor/code_editor.cpp similarity index 99% rename from tools/editor/code_editor.cpp rename to editor/code_editor.cpp index 589e18cb017..2175a532d42 100644 --- a/tools/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -32,7 +32,7 @@ #include "scene/gui/separator.h" #include "scene/resources/dynamic_font.h" #include "os/keyboard.h" -#include "tools/editor/editor_scale.h" +#include "editor/editor_scale.h" void GotoLineDialog::popup_find_line(TextEdit *p_edit) { diff --git a/tools/editor/code_editor.h b/editor/code_editor.h similarity index 99% rename from tools/editor/code_editor.h rename to editor/code_editor.h index 6c2fe6ac4c7..9bc14a7f331 100644 --- a/tools/editor/code_editor.h +++ b/editor/code_editor.h @@ -29,7 +29,7 @@ #ifndef CODE_EDITOR_H #define CODE_EDITOR_H -#include "tools/editor/editor_plugin.h" +#include "editor/editor_plugin.h" #include "scene/gui/text_edit.h" #include "scene/gui/dialogs.h" #include "scene/main/timer.h" diff --git a/tools/editor/collada/SCsub b/editor/collada/SCsub similarity index 100% rename from tools/editor/collada/SCsub rename to editor/collada/SCsub diff --git a/tools/editor/collada/collada.cpp b/editor/collada/collada.cpp similarity index 100% rename from tools/editor/collada/collada.cpp rename to editor/collada/collada.cpp diff --git a/tools/editor/collada/collada.h b/editor/collada/collada.h similarity index 100% rename from tools/editor/collada/collada.h rename to editor/collada/collada.h diff --git a/tools/editor/connections_dialog.cpp b/editor/connections_dialog.cpp similarity index 100% rename from tools/editor/connections_dialog.cpp rename to editor/connections_dialog.cpp diff --git a/tools/editor/connections_dialog.h b/editor/connections_dialog.h similarity index 98% rename from tools/editor/connections_dialog.h rename to editor/connections_dialog.h index 028faccabd8..bf32573a331 100644 --- a/tools/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -36,8 +36,8 @@ #include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" #include "scene/gui/line_edit.h" -#include "tools/editor/scene_tree_editor.h" -#include "tools/editor/property_editor.h" +#include "editor/scene_tree_editor.h" +#include "editor/property_editor.h" #include "undo_redo.h" /** diff --git a/tools/editor/create_dialog.cpp b/editor/create_dialog.cpp similarity index 100% rename from tools/editor/create_dialog.cpp rename to editor/create_dialog.cpp diff --git a/tools/editor/create_dialog.h b/editor/create_dialog.h similarity index 100% rename from tools/editor/create_dialog.h rename to editor/create_dialog.h diff --git a/tools/editor/dependency_editor.cpp b/editor/dependency_editor.cpp similarity index 100% rename from tools/editor/dependency_editor.cpp rename to editor/dependency_editor.cpp diff --git a/tools/editor/dependency_editor.h b/editor/dependency_editor.h similarity index 100% rename from tools/editor/dependency_editor.h rename to editor/dependency_editor.h diff --git a/tools/editor/doc/SCsub b/editor/doc/SCsub similarity index 100% rename from tools/editor/doc/SCsub rename to editor/doc/SCsub diff --git a/tools/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp similarity index 100% rename from tools/editor/doc/doc_data.cpp rename to editor/doc/doc_data.cpp diff --git a/tools/editor/doc/doc_data.h b/editor/doc/doc_data.h similarity index 100% rename from tools/editor/doc/doc_data.h rename to editor/doc/doc_data.h diff --git a/tools/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp similarity index 100% rename from tools/editor/doc/doc_dump.cpp rename to editor/doc/doc_dump.cpp diff --git a/tools/editor/doc/doc_dump.h b/editor/doc/doc_dump.h similarity index 100% rename from tools/editor/doc/doc_dump.h rename to editor/doc/doc_dump.h diff --git a/tools/editor/doc_code_font.h b/editor/doc_code_font.h similarity index 100% rename from tools/editor/doc_code_font.h rename to editor/doc_code_font.h diff --git a/tools/editor/doc_font.h b/editor/doc_font.h similarity index 100% rename from tools/editor/doc_font.h rename to editor/doc_font.h diff --git a/tools/editor/doc_title_font.h b/editor/doc_title_font.h similarity index 100% rename from tools/editor/doc_title_font.h rename to editor/doc_title_font.h diff --git a/tools/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp similarity index 100% rename from tools/editor/editor_asset_installer.cpp rename to editor/editor_asset_installer.cpp diff --git a/tools/editor/editor_asset_installer.h b/editor/editor_asset_installer.h similarity index 100% rename from tools/editor/editor_asset_installer.h rename to editor/editor_asset_installer.h diff --git a/tools/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp similarity index 100% rename from tools/editor/editor_autoload_settings.cpp rename to editor/editor_autoload_settings.cpp diff --git a/tools/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h similarity index 100% rename from tools/editor/editor_autoload_settings.h rename to editor/editor_autoload_settings.h diff --git a/tools/editor/editor_data.cpp b/editor/editor_data.cpp similarity index 100% rename from tools/editor/editor_data.cpp rename to editor/editor_data.cpp diff --git a/tools/editor/editor_data.h b/editor/editor_data.h similarity index 99% rename from tools/editor/editor_data.h rename to editor/editor_data.h index cbb4222a431..938d046188f 100644 --- a/tools/editor/editor_data.h +++ b/editor/editor_data.h @@ -29,7 +29,7 @@ #ifndef EDITOR_DATA_H #define EDITOR_DATA_H -#include "tools/editor/editor_plugin.h" +#include "editor/editor_plugin.h" #include "scene/resources/texture.h" #include "list.h" #include "undo_redo.h" diff --git a/tools/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp similarity index 98% rename from tools/editor/editor_dir_dialog.cpp rename to editor/editor_dir_dialog.cpp index c542b1e7ccb..3d15197fb9c 100644 --- a/tools/editor/editor_dir_dialog.cpp +++ b/editor/editor_dir_dialog.cpp @@ -29,8 +29,8 @@ #include "editor_dir_dialog.h" #include "os/os.h" #include "os/keyboard.h" -#include "tools/editor/editor_settings.h" -#include "tools/editor/editor_file_system.h" +#include "editor/editor_settings.h" +#include "editor/editor_file_system.h" void EditorDirDialog::_update_dir(TreeItem* p_item) { diff --git a/tools/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h similarity index 100% rename from tools/editor/editor_dir_dialog.h rename to editor/editor_dir_dialog.h diff --git a/tools/editor/editor_export_godot3.cpp b/editor/editor_export_godot3.cpp similarity index 100% rename from tools/editor/editor_export_godot3.cpp rename to editor/editor_export_godot3.cpp diff --git a/tools/editor/editor_export_godot3.h b/editor/editor_export_godot3.h similarity index 97% rename from tools/editor/editor_export_godot3.h rename to editor/editor_export_godot3.h index 5e21c9edd96..9c2cffa29ed 100644 --- a/tools/editor/editor_export_godot3.h +++ b/editor/editor_export_godot3.h @@ -2,7 +2,7 @@ #define EDITOR_EXPORT_GODOT3_H #include "scene/main/node.h" -#include "tools/editor/editor_file_system.h" +#include "editor/editor_file_system.h" #include "io/export_data.h" class EditorExportGodot3 { diff --git a/tools/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp similarity index 100% rename from tools/editor/editor_file_dialog.cpp rename to editor/editor_file_dialog.cpp diff --git a/tools/editor/editor_file_dialog.h b/editor/editor_file_dialog.h similarity index 100% rename from tools/editor/editor_file_dialog.h rename to editor/editor_file_dialog.h diff --git a/tools/editor/editor_file_system.cpp b/editor/editor_file_system.cpp similarity index 100% rename from tools/editor/editor_file_system.cpp rename to editor/editor_file_system.cpp diff --git a/tools/editor/editor_file_system.h b/editor/editor_file_system.h similarity index 100% rename from tools/editor/editor_file_system.h rename to editor/editor_file_system.h diff --git a/tools/editor/editor_fonts.cpp b/editor/editor_fonts.cpp similarity index 100% rename from tools/editor/editor_fonts.cpp rename to editor/editor_fonts.cpp diff --git a/tools/editor/editor_fonts.h b/editor/editor_fonts.h similarity index 100% rename from tools/editor/editor_fonts.h rename to editor/editor_fonts.h diff --git a/tools/editor/editor_help.cpp b/editor/editor_help.cpp similarity index 99% rename from tools/editor/editor_help.cpp rename to editor/editor_help.cpp index 93251491a58..20ff3964cd5 100644 --- a/tools/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -31,7 +31,7 @@ #include "editor_settings.h" #include "os/keyboard.h" #include "doc_data_compressed.h" -#include "tools/editor/plugins/script_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" #include "os/keyboard.h" diff --git a/tools/editor/editor_help.h b/editor/editor_help.h similarity index 97% rename from tools/editor/editor_help.h rename to editor/editor_help.h index ff1322c91f2..d426e5db522 100644 --- a/tools/editor/editor_help.h +++ b/editor/editor_help.h @@ -29,7 +29,7 @@ #ifndef EDITOR_HELP_H #define EDITOR_HELP_H -#include "tools/editor/editor_plugin.h" +#include "editor/editor_plugin.h" #include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" #include "scene/gui/split_container.h" @@ -39,8 +39,8 @@ #include "scene/gui/tree.h" #include "scene/main/timer.h" -#include "tools/editor/code_editor.h" -#include "tools/editor/doc/doc_data.h" +#include "editor/code_editor.h" +#include "editor/doc/doc_data.h" class EditorNode; diff --git a/tools/editor/editor_icons.h b/editor/editor_icons.h similarity index 100% rename from tools/editor/editor_icons.h rename to editor/editor_icons.h diff --git a/tools/editor/editor_import_export.cpp b/editor/editor_import_export.cpp similarity index 99% rename from tools/editor/editor_import_export.cpp rename to editor/editor_import_export.cpp index 16a5494b04c..8708dc49a3f 100644 --- a/tools/editor/editor_import_export.cpp +++ b/editor/editor_import_export.cpp @@ -32,7 +32,7 @@ #include "globals.h" #include "os/file_access.h" #include "os/dir_access.h" -#include "tools/editor/editor_file_system.h" +#include "editor/editor_file_system.h" #include "io/resource_loader.h" #include "editor_node.h" #include "editor_settings.h" @@ -40,7 +40,7 @@ #include "io/resource_saver.h" #include "io/md5.h" #include "io_plugins/editor_texture_import_plugin.h" -#include "tools/editor/plugins/script_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" #include "io/zip_io.h" diff --git a/tools/editor/editor_import_export.h b/editor/editor_import_export.h similarity index 100% rename from tools/editor/editor_import_export.h rename to editor/editor_import_export.h diff --git a/tools/editor/editor_initialize_ssl.cpp b/editor/editor_initialize_ssl.cpp similarity index 100% rename from tools/editor/editor_initialize_ssl.cpp rename to editor/editor_initialize_ssl.cpp diff --git a/tools/editor/editor_initialize_ssl.h b/editor/editor_initialize_ssl.h similarity index 100% rename from tools/editor/editor_initialize_ssl.h rename to editor/editor_initialize_ssl.h diff --git a/tools/editor/editor_log.cpp b/editor/editor_log.cpp similarity index 100% rename from tools/editor/editor_log.cpp rename to editor/editor_log.cpp diff --git a/tools/editor/editor_log.h b/editor/editor_log.h similarity index 100% rename from tools/editor/editor_log.h rename to editor/editor_log.h diff --git a/tools/editor/editor_name_dialog.cpp b/editor/editor_name_dialog.cpp similarity index 100% rename from tools/editor/editor_name_dialog.cpp rename to editor/editor_name_dialog.cpp diff --git a/tools/editor/editor_name_dialog.h b/editor/editor_name_dialog.h similarity index 100% rename from tools/editor/editor_name_dialog.h rename to editor/editor_name_dialog.h diff --git a/tools/editor/editor_node.cpp b/editor/editor_node.cpp similarity index 99% rename from tools/editor/editor_node.cpp rename to editor/editor_node.cpp index 3bc5b4d68ca..9cfdea51b3c 100644 --- a/tools/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -100,14 +100,14 @@ #include "plugins/collision_shape_2d_editor_plugin.h" #include "main/input_default.h" // end -#include "tools/editor/io_plugins/editor_texture_import_plugin.h" -#include "tools/editor/io_plugins/editor_scene_import_plugin.h" -#include "tools/editor/io_plugins/editor_font_import_plugin.h" -#include "tools/editor/io_plugins/editor_sample_import_plugin.h" -#include "tools/editor/io_plugins/editor_translation_import_plugin.h" -#include "tools/editor/io_plugins/editor_bitmask_import_plugin.h" -#include "tools/editor/io_plugins/editor_mesh_import_plugin.h" -#include "tools/editor/io_plugins/editor_export_scene.h" +#include "editor/io_plugins/editor_texture_import_plugin.h" +#include "editor/io_plugins/editor_scene_import_plugin.h" +#include "editor/io_plugins/editor_font_import_plugin.h" +#include "editor/io_plugins/editor_sample_import_plugin.h" +#include "editor/io_plugins/editor_translation_import_plugin.h" +#include "editor/io_plugins/editor_bitmask_import_plugin.h" +#include "editor/io_plugins/editor_mesh_import_plugin.h" +#include "editor/io_plugins/editor_export_scene.h" #include "plugins/editor_preview_plugins.h" #include "editor_initialize_ssl.h" diff --git a/tools/editor/editor_node.h b/editor/editor_node.h similarity index 95% rename from tools/editor/editor_node.h rename to editor/editor_node.h index 19cca549e34..ae12f2fb3b0 100644 --- a/tools/editor/editor_node.h +++ b/editor/editor_node.h @@ -42,40 +42,40 @@ #include "scene/gui/split_container.h" #include "scene/gui/center_container.h" #include "scene/gui/texture_progress.h" -#include "tools/editor/filesystem_dock.h" -#include "tools/editor/scene_tree_editor.h" -#include "tools/editor/property_editor.h" -#include "tools/editor/create_dialog.h" -#include "tools/editor/call_dialog.h" -#include "tools/editor/reparent_dialog.h" -#include "tools/editor/connections_dialog.h" -#include "tools/editor/node_dock.h" -#include "tools/editor/settings_config_dialog.h" -#include "tools/editor/groups_editor.h" -#include "tools/editor/editor_data.h" -#include "tools/editor/editor_path.h" -#include "tools/editor/editor_run.h" +#include "editor/filesystem_dock.h" +#include "editor/scene_tree_editor.h" +#include "editor/property_editor.h" +#include "editor/create_dialog.h" +#include "editor/call_dialog.h" +#include "editor/reparent_dialog.h" +#include "editor/connections_dialog.h" +#include "editor/node_dock.h" +#include "editor/settings_config_dialog.h" +#include "editor/groups_editor.h" +#include "editor/editor_data.h" +#include "editor/editor_path.h" +#include "editor/editor_run.h" -#include "tools/editor/pane_drag.h" +#include "editor/pane_drag.h" -#include "tools/editor/script_create_dialog.h" -#include "tools/editor/run_settings_dialog.h" -#include "tools/editor/project_settings.h" -#include "tools/editor/project_export.h" -#include "tools/editor/editor_log.h" -#include "tools/editor/scene_tree_dock.h" -#include "tools/editor/resources_dock.h" -#include "tools/editor/editor_run_script.h" +#include "editor/script_create_dialog.h" +#include "editor/run_settings_dialog.h" +#include "editor/project_settings.h" +#include "editor/project_export.h" +#include "editor/editor_log.h" +#include "editor/scene_tree_dock.h" +#include "editor/resources_dock.h" +#include "editor/editor_run_script.h" -#include "tools/editor/editor_run_native.h" +#include "editor/editor_run_native.h" #include "scene/gui/tabs.h" -#include "tools/editor/quick_open.h" -#include "tools/editor/project_export.h" -#include "tools/editor/editor_sub_scene.h" +#include "editor/quick_open.h" +#include "editor/project_export.h" +#include "editor/editor_sub_scene.h" #include "editor_import_export.h" #include "editor_reimport_dialog.h" -#include "tools/editor/editor_plugin.h" -#include "tools/editor/editor_name_dialog.h" +#include "editor/editor_plugin.h" +#include "editor/editor_name_dialog.h" #include "fileserver/editor_file_server.h" #include "editor_resource_preview.h" diff --git a/tools/editor/editor_path.cpp b/editor/editor_path.cpp similarity index 100% rename from tools/editor/editor_path.cpp rename to editor/editor_path.cpp diff --git a/tools/editor/editor_path.h b/editor/editor_path.h similarity index 100% rename from tools/editor/editor_path.h rename to editor/editor_path.h diff --git a/tools/editor/editor_plugin.cpp b/editor/editor_plugin.cpp similarity index 99% rename from tools/editor/editor_plugin.cpp rename to editor/editor_plugin.cpp index 31ca9db762f..28f065d7db2 100644 --- a/tools/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -30,8 +30,8 @@ #include "scene/3d/camera.h" #include "plugins/canvas_item_editor_plugin.h" #include "plugins/spatial_editor_plugin.h" -#include "tools/editor/editor_node.h" -#include "tools/editor/editor_settings.h" +#include "editor/editor_node.h" +#include "editor/editor_settings.h" void EditorPlugin::add_custom_type(const String& p_type, const String& p_base,const Ref