diff --git a/editor/animation/animation_blend_space_2d_editor.cpp b/editor/animation/animation_blend_space_2d_editor.cpp index e65235c234..4e0a2af2b8 100644 --- a/editor/animation/animation_blend_space_2d_editor.cpp +++ b/editor/animation/animation_blend_space_2d_editor.cpp @@ -42,14 +42,11 @@ #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" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" #include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/separator.h" diff --git a/editor/animation/animation_library_editor.cpp b/editor/animation/animation_library_editor.cpp index 55b16ce973..e37b465d88 100644 --- a/editor/animation/animation_library_editor.cpp +++ b/editor/animation/animation_library_editor.cpp @@ -30,6 +30,7 @@ #include "animation_library_editor.h" +#include "core/io/config_file.h" #include "core/io/resource_loader.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" diff --git a/editor/animation/animation_library_editor.h b/editor/animation/animation_library_editor.h index 9a4f35abf5..a55047111b 100644 --- a/editor/animation/animation_library_editor.h +++ b/editor/animation/animation_library_editor.h @@ -30,7 +30,6 @@ #pragma once -#include "core/io/config_file.h" #include "core/templates/vector.h" #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_mixer.h" diff --git a/editor/animation/animation_player_editor_plugin.h b/editor/animation/animation_player_editor_plugin.h index ffc001783f..40ac7133c1 100644 --- a/editor/animation/animation_player_editor_plugin.h +++ b/editor/animation/animation_player_editor_plugin.h @@ -36,9 +36,7 @@ #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_player.h" #include "scene/gui/dialogs.h" -#include "scene/gui/slider.h" #include "scene/gui/spin_box.h" -#include "scene/gui/texture_button.h" #include "scene/gui/tree.h" #include "scene/resources/material.h" diff --git a/editor/animation/animation_tree_editor_plugin.cpp b/editor/animation/animation_tree_editor_plugin.cpp index 59c77b435f..db8c451fdd 100644 --- a/editor/animation/animation_tree_editor_plugin.cpp +++ b/editor/animation/animation_tree_editor_plugin.cpp @@ -45,6 +45,7 @@ #include "scene/animation/animation_blend_tree.h" #include "scene/gui/button.h" #include "scene/gui/margin_container.h" +#include "scene/gui/panel_container.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" diff --git a/editor/animation/animation_tree_editor_plugin.h b/editor/animation/animation_tree_editor_plugin.h index 66fff2b059..dc5790b191 100644 --- a/editor/animation/animation_tree_editor_plugin.h +++ b/editor/animation/animation_tree_editor_plugin.h @@ -33,10 +33,11 @@ #include "editor/docks/editor_dock.h" #include "editor/plugins/editor_plugin.h" #include "scene/animation/animation_tree.h" -#include "scene/gui/graph_edit.h" +#include "scene/gui/box_container.h" class Button; class EditorFileDialog; +class PanelContainer; class ScrollContainer; class RichTextLabel; diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/editor/debugger/debug_adapter/debug_adapter_parser.cpp index cd8ec70139..b8c64c4643 100644 --- a/editor/debugger/debug_adapter/debug_adapter_parser.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_parser.cpp @@ -36,7 +36,6 @@ #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" #include "editor/export/editor_export.h" -#include "editor/export/editor_export_platform.h" #include "editor/run/editor_run_bar.h" #include "editor/script/script_editor_plugin.h" diff --git a/editor/debugger/debugger_editor_plugin.cpp b/editor/debugger/debugger_editor_plugin.cpp index cf27dde5ef..75f4b9b19a 100644 --- a/editor/debugger/debugger_editor_plugin.cpp +++ b/editor/debugger/debugger_editor_plugin.cpp @@ -39,7 +39,6 @@ #include "editor/editor_node.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" diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 0258c68ef4..9ecd588260 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -32,7 +32,7 @@ #include "core/io/image.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/string/translation_server.h" #include "editor/editor_string_names.h" #include "editor/run/editor_run_bar.h" @@ -40,6 +40,7 @@ #include "editor/themes/editor_scale.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" +#include "scene/gui/label.h" #include "scene/resources/image_texture.h" void EditorProfiler::_make_metric_ptrs(Metric &m) { diff --git a/editor/debugger/editor_profiler.h b/editor/debugger/editor_profiler.h index 28e4c4d83f..32d8a84ca8 100644 --- a/editor/debugger/editor_profiler.h +++ b/editor/debugger/editor_profiler.h @@ -33,7 +33,6 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/check_button.h" -#include "scene/gui/label.h" #include "scene/gui/option_button.h" #include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 942e6a4fc0..80a525c40d 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -32,13 +32,14 @@ #include "core/io/image.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/string/translation_server.h" #include "editor/editor_string_names.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/gui/label.h" #include "scene/resources/image_texture.h" void EditorVisualProfiler::set_hardware_info(const String &p_cpu_name, const String &p_gpu_name) { diff --git a/editor/debugger/editor_visual_profiler.h b/editor/debugger/editor_visual_profiler.h index b4a8b1a661..f79e08b808 100644 --- a/editor/debugger/editor_visual_profiler.h +++ b/editor/debugger/editor_visual_profiler.h @@ -33,7 +33,6 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" -#include "scene/gui/label.h" #include "scene/gui/option_button.h" #include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" diff --git a/editor/doc/doc_tools.cpp b/editor/doc/doc_tools.cpp index ae8688fb00..36e08c4d53 100644 --- a/editor/doc/doc_tools.cpp +++ b/editor/doc/doc_tools.cpp @@ -46,9 +46,6 @@ #include "scene/resources/theme.h" #include "scene/theme/theme_db.h" -// Used for a hack preserving Mono properties on non-Mono builds. -#include "modules/modules_enabled.gen.h" // For mono. - static String _get_indent(const String &p_text) { String indent; bool has_text = false; diff --git a/editor/doc/editor_help.h b/editor/doc/editor_help.h index 114062f4b4..9d1b26a8ba 100644 --- a/editor/doc/editor_help.h +++ b/editor/doc/editor_help.h @@ -36,7 +36,6 @@ #include "scene/gui/dialogs.h" #include "scene/gui/popup.h" #include "scene/gui/rich_text_label.h" -#include "scene/gui/split_container.h" #include "scene/gui/text_edit.h" #include "scene/main/timer.h" diff --git a/editor/doc/editor_help_search.cpp b/editor/doc/editor_help_search.cpp index 1e07b564d4..fe30b336f2 100644 --- a/editor/doc/editor_help_search.cpp +++ b/editor/doc/editor_help_search.cpp @@ -41,7 +41,6 @@ #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" #include "scene/gui/margin_container.h" #include "servers/display/display_server.h" diff --git a/editor/docks/editor_dock.cpp b/editor/docks/editor_dock.cpp index 293444b132..09b174582c 100644 --- a/editor/docks/editor_dock.cpp +++ b/editor/docks/editor_dock.cpp @@ -31,7 +31,6 @@ #include "editor_dock.h" #include "core/input/shortcut.h" -#include "core/io/config_file.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/dock_tab_container.h" diff --git a/editor/docks/editor_dock_manager.cpp b/editor/docks/editor_dock_manager.cpp index f273e9ee81..47826a2c8f 100644 --- a/editor/docks/editor_dock_manager.cpp +++ b/editor/docks/editor_dock_manager.cpp @@ -31,7 +31,7 @@ #include "editor_dock_manager.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/docks/dock_tab_container.h" #include "editor/docks/editor_dock.h" #include "editor/editor_node.h" @@ -42,6 +42,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/label.h" +#include "scene/gui/popup_menu.h" #include "scene/gui/split_container.h" #include "scene/gui/tab_container.h" #include "scene/main/window.h" diff --git a/editor/docks/history_dock.cpp b/editor/docks/history_dock.cpp index 7301de3664..ac81ee212b 100644 --- a/editor/docks/history_dock.cpp +++ b/editor/docks/history_dock.cpp @@ -36,7 +36,6 @@ #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/settings/editor_command_palette.h" -#include "editor/settings/editor_settings.h" #include "scene/gui/check_box.h" #include "scene/gui/item_list.h" diff --git a/editor/docks/import_dock.cpp b/editor/docks/import_dock.cpp index 36dade9959..cfd7b953a0 100644 --- a/editor/docks/import_dock.cpp +++ b/editor/docks/import_dock.cpp @@ -31,11 +31,13 @@ #include "import_dock.h" #include "core/config/project_settings.h" +#include "core/io/resource_importer.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/file_system/editor_file_system.h" #include "editor/inspector/editor_resource_preview.h" #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" diff --git a/editor/docks/import_dock.h b/editor/docks/import_dock.h index 109ff14ff3..fddaed080b 100644 --- a/editor/docks/import_dock.h +++ b/editor/docks/import_dock.h @@ -31,9 +31,7 @@ #pragma once #include "core/io/config_file.h" -#include "core/io/resource_importer.h" #include "editor/docks/editor_dock.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" diff --git a/editor/docks/inspector_dock.h b/editor/docks/inspector_dock.h index 55eff2a4f1..3a6fd3bc4f 100644 --- a/editor/docks/inspector_dock.h +++ b/editor/docks/inspector_dock.h @@ -34,7 +34,6 @@ #include "editor/editor_data.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" #include "scene/gui/line_edit.h" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 699f8d57cc..f2ba71bd74 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -46,7 +46,6 @@ #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "modules/regex/regex.h" #include "scene/gui/box_container.h" #include "scene/gui/flow_container.h" #include "scene/gui/separator.h" diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp index 66910a3c27..d4d02788fe 100644 --- a/editor/export/editor_export.cpp +++ b/editor/export/editor_export.cpp @@ -30,10 +30,9 @@ #include "editor_export.h" -#include "core/config/project_settings.h" #include "core/io/config_file.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/settings/editor_settings.h" #include "scene/main/timer.h" diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index 09087cdca0..f5514eb679 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -41,11 +41,12 @@ #include "core/io/image.h" #include "core/io/image_loader.h" #include "core/io/resource_uid.h" +#include "core/io/zip_io.h" #include "core/math/random_pcg.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/os/shared_object.h" -#include "core/string/translation_server.h" +#include "core/string/translation.h" #include "core/version.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/export/editor_export_platform.h b/editor/export/editor_export_platform.h index 918cb42624..540fe56cdc 100644 --- a/editor/export/editor_export_platform.h +++ b/editor/export/editor_export_platform.h @@ -30,13 +30,13 @@ #pragma once -#include "core/io/zip_io.h" #include "core/os/process_id.h" #include "editor/export/editor_export_preset.h" class DirAccess; class EditorExportPlugin; class EditorFileSystemDirectory; +class FileAccess; class Image; class Node; class RichTextLabel; @@ -44,6 +44,8 @@ class Texture2D; struct EditorProgress; struct SharedObject; +typedef void *zipFile; + const String ENV_SCRIPT_ENCRYPTION_KEY = "GODOT_SCRIPT_ENCRYPTION_KEY"; class EditorExportPlatform : public RefCounted { diff --git a/editor/export/editor_export_platform_apple_embedded.cpp b/editor/export/editor_export_platform_apple_embedded.cpp index 57eccb9238..2f9db30283 100644 --- a/editor/export/editor_export_platform_apple_embedded.cpp +++ b/editor/export/editor_export_platform_apple_embedded.cpp @@ -30,27 +30,31 @@ #include "editor_export_platform_apple_embedded.h" -#include "core/io/json.h" +#include "core/io/file_access.h" #include "core/io/plist.h" -#include "core/object/callable_mp.h" +#include "core/io/zip_io.h" #include "core/os/os.h" -#include "core/os/process_id.h" #include "core/string/translation_server.h" #include "editor/editor_node.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/script/script_editor_plugin.h" #include "editor/themes/editor_scale.h" #include "main/main.h" #include "servers/display/display_server.h" -#include "modules/modules_enabled.gen.h" // For mono. +#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono. #include "modules/svg/image_loader_svg.h" +#ifdef MACOS_ENABLED +#include "core/io/json.h" +#include "core/object/callable_mp.h" +#include "core/os/process_id.h" +#include "editor/file_system/editor_paths.h" +#include "editor/script/script_editor_plugin.h" +#include "editor/settings/editor_settings.h" +#endif + void EditorExportPlatformAppleEmbedded::get_preset_features(const Ref &p_preset, List *r_features) const { // Vulkan and OpenGL ES 3.0 both mandate ETC2 support. r_features->push_back("etc2"); diff --git a/editor/export/editor_export_platform_apple_embedded.h b/editor/export/editor_export_platform_apple_embedded.h index d41be858f4..b0d4e3f1f5 100644 --- a/editor/export/editor_export_platform_apple_embedded.h +++ b/editor/export/editor_export_platform_apple_embedded.h @@ -34,19 +34,15 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" -#include "core/io/file_access.h" -#include "core/io/image_loader.h" -#include "core/io/marshalls.h" -#include "core/io/resource_saver.h" -#include "core/io/zip_io.h" #include "core/templates/safe_refcount.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" #include + +#ifdef MACOS_ENABLED #include +#endif // 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/editor/export/editor_export_platform_pc.cpp b/editor/export/editor_export_platform_pc.cpp index 17515b3d38..b9c7f716c1 100644 --- a/editor/export/editor_export_platform_pc.cpp +++ b/editor/export/editor_export_platform_pc.cpp @@ -32,9 +32,10 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/os/os.h" #include "core/os/shared_object.h" -#include "scene/resources/image_texture.h" +#include "scene/resources/image_texture.h" // IWYU pragma: keep. Misdetection of `logo`. void EditorExportPlatformPC::get_preset_features(const Ref &p_preset, List *r_features) const { if (p_preset->get("texture_format/s3tc_bptc")) { diff --git a/editor/export/gdextension_export_plugin.h b/editor/export/gdextension_export_plugin.h index 56fc389a36..c80b7c5b3d 100644 --- a/editor/export/gdextension_export_plugin.h +++ b/editor/export/gdextension_export_plugin.h @@ -31,7 +31,7 @@ #pragma once #include "core/extension/gdextension_library_loader.h" -#include "editor/export/editor_export.h" +#include "editor/export/editor_export_plugin.h" class GDExtensionExportPlugin : public EditorExportPlugin { GDSOFTCLASS(GDExtensionExportPlugin, EditorExportPlugin); diff --git a/editor/export/project_zip_packer.cpp b/editor/export/project_zip_packer.cpp index 4e4639b107..5e09a5dbd0 100644 --- a/editor/export/project_zip_packer.cpp +++ b/editor/export/project_zip_packer.cpp @@ -33,8 +33,10 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" +#include "core/io/zip_io.h" #include "core/os/os.h" #include "core/os/time.h" +#include "core/string/ustring.h" String ProjectZIPPacker::get_project_zip_safe_name() { // Name the downloaded ZIP file to contain the project name and download date for easier organization. diff --git a/editor/export/project_zip_packer.h b/editor/export/project_zip_packer.h index c66d793f67..1fbbd86790 100644 --- a/editor/export/project_zip_packer.h +++ b/editor/export/project_zip_packer.h @@ -30,8 +30,9 @@ #pragma once -#include "core/io/zip_io.h" -#include "core/variant/variant.h" +class String; + +typedef void *zipFile; class ProjectZIPPacker { static void _zip_file(const String &p_path, const String &p_base_path, zipFile p_zip); diff --git a/editor/file_system/dependency_editor.cpp b/editor/file_system/dependency_editor.cpp index 0195261c1b..5631fb4a9d 100644 --- a/editor/file_system/dependency_editor.cpp +++ b/editor/file_system/dependency_editor.cpp @@ -34,7 +34,7 @@ #include "core/io/file_access.h" #include "core/io/resource_loader.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp index 475723f61f..93936109f7 100644 --- a/editor/gui/editor_dir_dialog.cpp +++ b/editor/gui/editor_dir_dialog.cpp @@ -31,7 +31,7 @@ #include "editor_dir_dialog.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/docks/filesystem_dock.h" #include "editor/file_system/editor_file_system.h" #include "editor/gui/directory_create_dialog.h" diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index dd5286ac51..ef7927d020 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -31,13 +31,14 @@ #include "editor_file_dialog.h" #include "core/config/project_settings.h" -#include "core/object/class_db.h" #include "core/os/os.h" #include "editor/docks/filesystem_dock.h" -#include "editor/editor_string_names.h" #include "editor/file_system/dependency_editor.h" #include "editor/settings/editor_settings.h" -#include "editor/themes/editor_scale.h" + +#ifndef DISABLE_DEPRECATED +#include "core/object/class_db.h" +#endif void EditorFileDialog::_item_menu_id_pressed(int p_option) { // Use dependency dialog to delete the entry in the editor, but only for project files. diff --git a/editor/gui/editor_object_selector.cpp b/editor/gui/editor_object_selector.cpp index 2dba594f2b..94d758e845 100644 --- a/editor/gui/editor_object_selector.cpp +++ b/editor/gui/editor_object_selector.cpp @@ -34,6 +34,7 @@ #include "editor/editor_data.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "scene/gui/box_container.h" #include "scene/gui/margin_container.h" Size2 EditorObjectSelector::get_minimum_size() const { diff --git a/editor/gui/editor_object_selector.h b/editor/gui/editor_object_selector.h index 7e7ace034c..a08da5ebbf 100644 --- a/editor/gui/editor_object_selector.h +++ b/editor/gui/editor_object_selector.h @@ -30,7 +30,6 @@ #pragma once -#include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/popup_menu.h" diff --git a/editor/gui/editor_quick_open_dialog.cpp b/editor/gui/editor_quick_open_dialog.cpp index 2cd6d35aa7..4c7745fd11 100644 --- a/editor/gui/editor_quick_open_dialog.cpp +++ b/editor/gui/editor_quick_open_dialog.cpp @@ -38,7 +38,6 @@ #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/file_system/editor_file_system.h" #include "editor/file_system/editor_paths.h" #include "editor/gui/editor_toaster.h" diff --git a/editor/gui/editor_title_bar.cpp b/editor/gui/editor_title_bar.cpp index 772106ad05..6e15c9abe5 100644 --- a/editor/gui/editor_title_bar.cpp +++ b/editor/gui/editor_title_bar.cpp @@ -32,6 +32,7 @@ #include "core/object/callable_mp.h" #include "scene/main/scene_tree.h" +#include "scene/main/window.h" #include "servers/display/display_server.h" void EditorTitleBar::gui_input(const Ref &p_event) { diff --git a/editor/gui/editor_title_bar.h b/editor/gui/editor_title_bar.h index 0041c0fe4a..d0f77e25e2 100644 --- a/editor/gui/editor_title_bar.h +++ b/editor/gui/editor_title_bar.h @@ -31,7 +31,6 @@ #pragma once #include "scene/gui/box_container.h" -#include "scene/main/window.h" class EditorTitleBar : public HBoxContainer { GDCLASS(EditorTitleBar, HBoxContainer); diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp index d5e7801461..a2017eb706 100644 --- a/editor/gui/touch_actions_panel.cpp +++ b/editor/gui/touch_actions_panel.cpp @@ -32,7 +32,6 @@ #include "core/input/input.h" #include "core/object/callable_mp.h" -#include "editor/editor_string_names.h" #include "editor/settings/editor_settings.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/editor/gui/window_wrapper.cpp b/editor/gui/window_wrapper.cpp index 07f0f2c9d0..e95b03fec0 100644 --- a/editor/gui/window_wrapper.cpp +++ b/editor/gui/window_wrapper.cpp @@ -31,7 +31,7 @@ #include "window_wrapper.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/progress_dialog.h" diff --git a/editor/gui/window_wrapper.h b/editor/gui/window_wrapper.h index e3ca68d61a..dfe585ac26 100644 --- a/editor/gui/window_wrapper.h +++ b/editor/gui/window_wrapper.h @@ -31,11 +31,12 @@ #pragma once #include "core/math/rect2.h" +#include "scene/gui/button.h" #include "scene/gui/margin_container.h" -#include "scene/gui/menu_button.h" -class Window; class HBoxContainer; +class Popup; +class Window; class WindowWrapper : public MarginContainer { GDCLASS(WindowWrapper, MarginContainer); diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 73c5de94b7..394fd930eb 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -39,7 +39,6 @@ #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/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/import/resource_importer_bmfont.cpp b/editor/import/resource_importer_bmfont.cpp index 0c7fe8b205..b8ddf84233 100644 --- a/editor/import/resource_importer_bmfont.cpp +++ b/editor/import/resource_importer_bmfont.cpp @@ -32,6 +32,8 @@ #include "core/io/config_file.h" #include "core/io/resource_saver.h" +#include "scene/resources/font.h" +#include "servers/text/text_server.h" String ResourceImporterBMFont::get_importer_name() const { return "font_data_bmfont"; diff --git a/editor/import/resource_importer_bmfont.h b/editor/import/resource_importer_bmfont.h index 871d893d6e..402f7d216a 100644 --- a/editor/import/resource_importer_bmfont.h +++ b/editor/import/resource_importer_bmfont.h @@ -31,8 +31,6 @@ #pragma once #include "core/io/resource_importer.h" -#include "scene/resources/font.h" -#include "servers/text/text_server.h" class ResourceImporterBMFont : public ResourceImporter { GDCLASS(ResourceImporterBMFont, ResourceImporter); diff --git a/editor/import/resource_importer_image.h b/editor/import/resource_importer_image.h index b5fbd411bd..d690d807df 100644 --- a/editor/import/resource_importer_image.h +++ b/editor/import/resource_importer_image.h @@ -30,7 +30,6 @@ #pragma once -#include "core/io/image.h" #include "core/io/resource_importer.h" class ResourceImporterImage : public ResourceImporter { diff --git a/editor/import/resource_importer_imagefont.cpp b/editor/import/resource_importer_imagefont.cpp index 9181ca836a..b361738013 100644 --- a/editor/import/resource_importer_imagefont.cpp +++ b/editor/import/resource_importer_imagefont.cpp @@ -32,6 +32,8 @@ #include "core/io/image_loader.h" #include "core/io/resource_saver.h" +#include "scene/resources/font.h" +#include "servers/text/text_server.h" String ResourceImporterImageFont::get_importer_name() const { return "font_data_image"; diff --git a/editor/import/resource_importer_imagefont.h b/editor/import/resource_importer_imagefont.h index 3ef86c1764..a1ac1c52de 100644 --- a/editor/import/resource_importer_imagefont.h +++ b/editor/import/resource_importer_imagefont.h @@ -31,8 +31,6 @@ #pragma once #include "core/io/resource_importer.h" -#include "scene/resources/font.h" -#include "servers/text/text_server.h" class ResourceImporterImageFont : public ResourceImporter { GDCLASS(ResourceImporterImageFont, ResourceImporter); diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index d103d238be..da01ef73f1 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -33,9 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/config_file.h" #include "core/io/image_loader.h" -#include "core/version.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" diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index 1abaf6dd22..365dea1f42 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -31,6 +31,7 @@ #include "resource_importer_wav.h" #include "core/io/resource_saver.h" +#include "scene/resources/audio_stream_wav.h" String ResourceImporterWAV::get_importer_name() const { return "wav"; diff --git a/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h index ba51db615b..28f431b770 100644 --- a/editor/import/resource_importer_wav.h +++ b/editor/import/resource_importer_wav.h @@ -31,7 +31,6 @@ #pragma once #include "core/io/resource_importer.h" -#include "scene/resources/audio_stream_wav.h" class ResourceImporterWAV : public ResourceImporter { GDCLASS(ResourceImporterWAV, ResourceImporter); diff --git a/editor/inspector/editor_inspector.cpp b/editor/inspector/editor_inspector.cpp index 0c543c955e..b59c20111c 100644 --- a/editor/inspector/editor_inspector.cpp +++ b/editor/inspector/editor_inspector.cpp @@ -35,7 +35,7 @@ #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" -#include "core/variant/typed_dictionary.h" +#include "core/variant/typed_dictionary.h" // IWYU pragma: keep. For EditorDebuggerRemoteObjects. #include "editor/debugger/editor_debugger_inspector.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/doc/doc_tools.h" diff --git a/editor/inspector/editor_resource_preview.cpp b/editor/inspector/editor_resource_preview.cpp index e61ce81b43..167363619c 100644 --- a/editor/inspector/editor_resource_preview.cpp +++ b/editor/inspector/editor_resource_preview.cpp @@ -36,7 +36,6 @@ #include "core/io/resource_saver.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" -#include "core/os/main_loop.h" #include "core/os/os.h" #include "core/variant/variant_utility.h" #include "editor/editor_node.h" diff --git a/editor/plugins/editor_plugin_settings.cpp b/editor/plugins/editor_plugin_settings.cpp index 1deaa3e5eb..02faf1898f 100644 --- a/editor/plugins/editor_plugin_settings.cpp +++ b/editor/plugins/editor_plugin_settings.cpp @@ -39,7 +39,6 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/margin_container.h" #include "scene/gui/separator.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" diff --git a/editor/plugins/editor_resource_conversion_plugin.cpp b/editor/plugins/editor_resource_conversion_plugin.cpp index b113b8c224..349a75a75d 100644 --- a/editor/plugins/editor_resource_conversion_plugin.cpp +++ b/editor/plugins/editor_resource_conversion_plugin.cpp @@ -30,7 +30,7 @@ #include "editor_resource_conversion_plugin.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro. void EditorResourceConversionPlugin::_bind_methods() { GDVIRTUAL_BIND(_converts_to); diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index 6f3c90f5e0..122a150330 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/editor/plugins/plugin_config_dialog.cpp @@ -33,7 +33,7 @@ #include "core/io/config_file.h" #include "core/io/dir_access.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/object/script_language.h" #include "editor/editor_node.h" #include "editor/file_system/editor_file_system.h" diff --git a/editor/plugins/plugin_config_dialog.h b/editor/plugins/plugin_config_dialog.h index 1e1218fe44..b213bdcbce 100644 --- a/editor/plugins/plugin_config_dialog.h +++ b/editor/plugins/plugin_config_dialog.h @@ -30,7 +30,6 @@ #pragma once -#include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" diff --git a/editor/project_manager/engine_update_label.cpp b/editor/project_manager/engine_update_label.cpp index a48008b1bf..26617e0c7a 100644 --- a/editor/project_manager/engine_update_label.cpp +++ b/editor/project_manager/engine_update_label.cpp @@ -32,7 +32,7 @@ #include "core/io/json.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "core/version.h" #include "editor/editor_string_names.h" diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index cb20a11475..028ec1faba 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -34,7 +34,7 @@ #include "core/io/dir_access.h" #include "core/io/zip_io.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "core/version.h" #include "editor/editor_node.h" diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp index dd628ae511..c8b6d1d794 100644 --- a/editor/project_manager/project_list.cpp +++ b/editor/project_manager/project_list.cpp @@ -34,7 +34,7 @@ #include "core/input/input.h" #include "core/io/dir_access.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "core/os/time.h" #include "core/version.h" diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp index 741bd91bd3..5345faf0d4 100644 --- a/editor/project_manager/quick_settings_dialog.cpp +++ b/editor/project_manager/quick_settings_dialog.cpp @@ -31,8 +31,7 @@ #include "quick_settings_dialog.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" -#include "core/string/translation_server.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/doc/editor_help.h" #include "editor/editor_string_names.h" #include "editor/inspector/editor_properties.h" diff --git a/editor/project_upgrade/project_upgrade_tool.cpp b/editor/project_upgrade/project_upgrade_tool.cpp index 9324c8a007..76792e0fa7 100644 --- a/editor/project_upgrade/project_upgrade_tool.cpp +++ b/editor/project_upgrade/project_upgrade_tool.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_node.h" #include "editor/file_system/editor_file_system.h" #include "editor/scene/editor_scene_tabs.h" diff --git a/editor/run/editor_run_bar.cpp b/editor/run/editor_run_bar.cpp index 1b5f7e7373..aa2dd48355 100644 --- a/editor/run/editor_run_bar.cpp +++ b/editor/run/editor_run_bar.cpp @@ -33,11 +33,13 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/export/editor_export_platform.h" +#include "editor/export/editor_export_preset.h" #include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_quick_open_dialog.h" #include "editor/gui/editor_toaster.h" diff --git a/editor/run/editor_run_bar.h b/editor/run/editor_run_bar.h index 1e7b16e920..98df6e1f38 100644 --- a/editor/run/editor_run_bar.h +++ b/editor/run/editor_run_bar.h @@ -31,16 +31,16 @@ #pragma once #include "core/os/process_id.h" -#include "editor/export/editor_export.h" #include "editor/run/editor_run.h" #include "scene/gui/margin_container.h" +class AcceptDialog; class Button; +class EditorExportPreset; class EditorRunNative; +class HBoxContainer; class MenuButton; class PanelContainer; -class HBoxContainer; -class AcceptDialog; class EditorRunBar : public MarginContainer { GDCLASS(EditorRunBar, MarginContainer); diff --git a/editor/run/editor_run_native.cpp b/editor/run/editor_run_native.cpp index e9b506e7d2..a1c42d2223 100644 --- a/editor/run/editor_run_native.cpp +++ b/editor/run/editor_run_native.cpp @@ -31,7 +31,7 @@ #include "editor_run_native.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_node.h" #include "editor/export/editor_export.h" #include "editor/export/editor_export_platform.h" diff --git a/editor/run/embedded_process.cpp b/editor/run/embedded_process.cpp index 9caac4c56a..c702e2fed0 100644 --- a/editor/run/embedded_process.cpp +++ b/editor/run/embedded_process.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "editor/editor_string_names.h" #include "scene/main/timer.h" @@ -445,8 +445,7 @@ Window *EmbeddedProcess::_get_current_modal_window() { return nullptr; } -EmbeddedProcess::EmbeddedProcess() : - EmbeddedProcessBase() { +EmbeddedProcess::EmbeddedProcess() { timer_embedding = memnew(Timer); timer_embedding->set_wait_time(0.1); timer_embedding->set_one_shot(true); diff --git a/editor/run/game_view_plugin.cpp b/editor/run/game_view_plugin.cpp index 4df1688a67..bf4b33e514 100644 --- a/editor/run/game_view_plugin.cpp +++ b/editor/run/game_view_plugin.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "core/debugger/debugger_marshalls.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/process_id.h" #include "core/string/translation_server.h" #include "editor/debugger/editor_debugger_node.h" diff --git a/editor/scene/2d/camera_2d_editor_plugin.cpp b/editor/scene/2d/camera_2d_editor_plugin.cpp index 400f704718..8c41c35cda 100644 --- a/editor/scene/2d/camera_2d_editor_plugin.cpp +++ b/editor/scene/2d/camera_2d_editor_plugin.cpp @@ -36,9 +36,7 @@ #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" #include "scene/gui/menu_button.h" void Camera2DEditor::edit(Camera2D *p_camera) { diff --git a/editor/scene/2d/particles_2d_editor_plugin.cpp b/editor/scene/2d/particles_2d_editor_plugin.cpp index 7a3c2ef8c5..402bdacdee 100644 --- a/editor/scene/2d/particles_2d_editor_plugin.cpp +++ b/editor/scene/2d/particles_2d_editor_plugin.cpp @@ -41,7 +41,6 @@ #include "scene/2d/gpu_particles_2d.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" -#include "scene/gui/margin_container.h" #include "scene/gui/option_button.h" #include "scene/gui/popup_menu.h" #include "scene/gui/spin_box.h" diff --git a/editor/scene/2d/path_2d_editor_plugin.cpp b/editor/scene/2d/path_2d_editor_plugin.cpp index 0170537911..dd894bff00 100644 --- a/editor/scene/2d/path_2d_editor_plugin.cpp +++ b/editor/scene/2d/path_2d_editor_plugin.cpp @@ -37,7 +37,6 @@ #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" #include "scene/resources/mesh.h" diff --git a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp index 512c3dd39a..78b526dda9 100644 --- a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp +++ b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "scene_paint_2d_editor_plugin.h" -#include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/docks/filesystem_dock.h" @@ -39,22 +38,12 @@ #include "editor/editor_main_screen.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/gui/editor_file_dialog.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_layer.h" #include "scene/gui/box_container.h" -#include "scene/gui/check_box.h" -#include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" -#include "scene/gui/label.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/separator.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/split_container.h" -#include "scene/gui/subviewport_container.h" -#include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" void ScenePaint2DEditor::_can_handle(bool p_is_node_2d, bool p_edit) { diff --git a/editor/scene/2d/tiles/tile_atlas_view.cpp b/editor/scene/2d/tiles/tile_atlas_view.cpp index 0a653795a0..859fcd636c 100644 --- a/editor/scene/2d/tiles/tile_atlas_view.cpp +++ b/editor/scene/2d/tiles/tile_atlas_view.cpp @@ -31,7 +31,7 @@ #include "tile_atlas_view.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/2d/tile_map_layer.h" diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.cpp b/editor/scene/2d/tiles/tiles_editor_plugin.cpp index 18d2e04ed9..507b5d9b15 100644 --- a/editor/scene/2d/tiles/tiles_editor_plugin.cpp +++ b/editor/scene/2d/tiles/tiles_editor_plugin.cpp @@ -41,12 +41,10 @@ #include "editor/editor_string_names.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" -#include "scene/gui/button.h" #include "scene/gui/control.h" #include "scene/main/scene_tree.h" #include "scene/resources/2d/tile_set.h" diff --git a/editor/scene/3d/bone_map_editor_plugin.cpp b/editor/scene/3d/bone_map_editor_plugin.cpp index 7779098c87..f955d4ae75 100644 --- a/editor/scene/3d/bone_map_editor_plugin.cpp +++ b/editor/scene/3d/bone_map_editor_plugin.cpp @@ -42,6 +42,7 @@ #include "scene/gui/aspect_ratio_container.h" #include "scene/gui/separator.h" #include "scene/gui/texture_rect.h" +#include "scene/resources/texture.h" #include "modules/regex/regex.h" diff --git a/editor/scene/3d/bone_map_editor_plugin.h b/editor/scene/3d/bone_map_editor_plugin.h index 790d7d72bb..4a217be9e6 100644 --- a/editor/scene/3d/bone_map_editor_plugin.h +++ b/editor/scene/3d/bone_map_editor_plugin.h @@ -39,7 +39,6 @@ #include "scene/gui/dialogs.h" #include "scene/gui/texture_button.h" #include "scene/resources/bone_map.h" -#include "scene/resources/texture.h" class AspectRatioContainer; diff --git a/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp index bbdc674fcd..d464b978c3 100644 --- a/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp @@ -31,6 +31,8 @@ #include "chain_ik_3d_gizmo_plugin.h" #include "editor/settings/editor_settings.h" +#include "scene/3d/iterate_ik_3d.h" +#include "scene/resources/surface_tool.h" ChainIK3DGizmoPlugin::SelectionMaterials ChainIK3DGizmoPlugin::selection_materials; diff --git a/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h index d29d109cb2..cd99bb4a16 100644 --- a/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h @@ -30,11 +30,10 @@ #pragma once -#include "editor/plugins/editor_plugin.h" -#include "editor/scene/3d/node_3d_editor_plugin.h" -#include "scene/3d/iterate_ik_3d.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" -#include "scene/resources/surface_tool.h" +class ChainIK3D; +class SurfaceTool; class ChainIK3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(ChainIK3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp index 5183115ceb..8012bfb4c4 100644 --- a/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp @@ -30,10 +30,6 @@ #include "particles_3d_emission_shape_gizmo_plugin.h" -#include "editor/editor_node.h" -#include "editor/editor_string_names.h" -#include "editor/editor_undo_redo_manager.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" diff --git a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp index f4d06c80a2..e1fd5446df 100644 --- a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp @@ -31,9 +31,12 @@ #include "spring_bone_3d_gizmo_plugin.h" #include "editor/settings/editor_settings.h" +#include "scene/3d/spring_bone_collision_3d.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" +#include "scene/3d/spring_bone_simulator_3d.h" +#include "scene/resources/surface_tool.h" // SpringBoneSimulator3D diff --git a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h index f38b998cbd..69c519092e 100644 --- a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h @@ -30,11 +30,11 @@ #pragma once -#include "editor/plugins/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" +#include "editor/scene/3d/node_3d_editor_gizmos.h" + +class SpringBoneCollision3D; +class SpringBoneSimulator3D; +class SurfaceTool; class SpringBoneSimulator3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(SpringBoneSimulator3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp index 9ae8e053b5..0cb3aab1e3 100644 --- a/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp +++ b/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp @@ -31,6 +31,8 @@ #include "two_bone_ik_3d_gizmo_plugin.h" #include "editor/settings/editor_settings.h" +#include "scene/3d/two_bone_ik_3d.h" +#include "scene/resources/surface_tool.h" TwoBoneIK3DGizmoPlugin::SelectionMaterials TwoBoneIK3DGizmoPlugin::selection_materials; diff --git a/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h index bec19b39dc..a6ab435500 100644 --- a/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h +++ b/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h @@ -30,11 +30,10 @@ #pragma once -#include "editor/plugins/editor_plugin.h" -#include "editor/scene/3d/node_3d_editor_plugin.h" -#include "scene/3d/two_bone_ik_3d.h" +#include "editor/scene/3d/node_3d_editor_gizmos.h" -#include "scene/resources/surface_tool.h" +class TwoBoneIK3D; +class SurfaceTool; class TwoBoneIK3DGizmoPlugin : public EditorNode3DGizmoPlugin { GDCLASS(TwoBoneIK3DGizmoPlugin, EditorNode3DGizmoPlugin); diff --git a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp index 5b8a49ab8c..b71c673829 100644 --- a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp +++ b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp @@ -30,11 +30,13 @@ #include "gpu_particles_collision_sdf_editor_plugin.h" +#include "core/io/resource_loader.h" #include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/gpu_particles_collision_3d.h" #include "scene/main/scene_tree.h" void GPUParticlesCollisionSDF3DEditorPlugin::_bake() { diff --git a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h index 0740a6b06d..244b17e909 100644 --- a/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h +++ b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h @@ -31,11 +31,10 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "scene/3d/gpu_particles_collision_3d.h" -#include "scene/resources/material.h" struct EditorProgress; class EditorFileDialog; +class GPUParticlesCollisionSDF3D; class HBoxContainer; class GPUParticlesCollisionSDF3DEditorPlugin : public EditorPlugin { diff --git a/editor/scene/3d/lightmap_gi_editor_plugin.cpp b/editor/scene/3d/lightmap_gi_editor_plugin.cpp index 373a31c50a..5ff451538a 100644 --- a/editor/scene/3d/lightmap_gi_editor_plugin.cpp +++ b/editor/scene/3d/lightmap_gi_editor_plugin.cpp @@ -30,12 +30,14 @@ #include "lightmap_gi_editor_plugin.h" +#include "core/io/resource_loader.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/lightmap_gi.h" #include "scene/main/scene_tree.h" #include "servers/display/display_server.h" #include "servers/rendering/rendering_server.h" diff --git a/editor/scene/3d/lightmap_gi_editor_plugin.h b/editor/scene/3d/lightmap_gi_editor_plugin.h index c528c6c604..91c27d4cd3 100644 --- a/editor/scene/3d/lightmap_gi_editor_plugin.h +++ b/editor/scene/3d/lightmap_gi_editor_plugin.h @@ -31,11 +31,10 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "scene/3d/lightmap_gi.h" -#include "scene/resources/material.h" struct EditorProgress; class EditorFileDialog; +class LightmapGI; class LightmapGIEditorPlugin : public EditorPlugin { GDCLASS(LightmapGIEditorPlugin, EditorPlugin); diff --git a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp index ce6c44c37a..4117b2e2a3 100644 --- a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp @@ -35,6 +35,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_file_dialog.h" +#include "scene/3d/occluder_instance_3d.h" #include "scene/main/scene_tree.h" void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) { diff --git a/editor/scene/3d/occluder_instance_3d_editor_plugin.h b/editor/scene/3d/occluder_instance_3d_editor_plugin.h index 9c6d4096d2..3251a4b120 100644 --- a/editor/scene/3d/occluder_instance_3d_editor_plugin.h +++ b/editor/scene/3d/occluder_instance_3d_editor_plugin.h @@ -31,10 +31,9 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "scene/3d/occluder_instance_3d.h" -#include "scene/resources/material.h" class EditorFileDialog; +class OccluderInstance3D; class OccluderInstance3DEditorPlugin : public EditorPlugin { GDCLASS(OccluderInstance3DEditorPlugin, EditorPlugin); diff --git a/editor/scene/3d/polygon_3d_editor_plugin.cpp b/editor/scene/3d/polygon_3d_editor_plugin.cpp index a503e1bec6..5e719c5353 100644 --- a/editor/scene/3d/polygon_3d_editor_plugin.cpp +++ b/editor/scene/3d/polygon_3d_editor_plugin.cpp @@ -42,7 +42,11 @@ #include "editor/scene/canvas_item_editor_plugin.h" #include "editor/settings/editor_settings.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/mesh_instance_3d.h" #include "scene/main/scene_tree.h" +#include "scene/resources/immediate_mesh.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" void Polygon3DEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/scene/3d/polygon_3d_editor_plugin.h b/editor/scene/3d/polygon_3d_editor_plugin.h index ce3f96a648..86e1b93f14 100644 --- a/editor/scene/3d/polygon_3d_editor_plugin.h +++ b/editor/scene/3d/polygon_3d_editor_plugin.h @@ -31,13 +31,14 @@ #pragma once #include "editor/plugins/editor_plugin.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/physics/collision_polygon_3d.h" #include "scene/gui/box_container.h" -#include "scene/resources/immediate_mesh.h" +class ArrayMesh; class CanvasItemEditor; +class ImmediateMesh; class MenuButton; +class MeshInstance3D; +class StandardMaterial3D; class Polygon3DEditor : public HBoxContainer { GDCLASS(Polygon3DEditor, HBoxContainer); diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index 5ed4c66e56..241d8ba54d 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -67,6 +67,7 @@ #include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/subviewport_container.h" +#include "scene/gui/texture_button.h" #include "scene/gui/view_panner.h" #include "scene/main/canvas_layer.h" #include "scene/main/scene_tree.h" diff --git a/editor/scene/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp index cc712258a6..fb2b981f34 100644 --- a/editor/scene/editor_scene_tabs.cpp +++ b/editor/scene/editor_scene_tabs.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/resource_loader.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "editor/docks/inspector_dock.h" #include "editor/editor_main_screen.h" diff --git a/editor/scene/gui/control_editor_plugin.cpp b/editor/scene/gui/control_editor_plugin.cpp index 03b64fbf6c..cef6bc8451 100644 --- a/editor/scene/gui/control_editor_plugin.cpp +++ b/editor/scene/gui/control_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "control_editor_plugin.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" #include "editor/scene/canvas_item_editor_plugin.h" diff --git a/editor/scene/gui/font_config_plugin.cpp b/editor/scene/gui/font_config_plugin.cpp index ccb02f474d..dc290fd484 100644 --- a/editor/scene/gui/font_config_plugin.cpp +++ b/editor/scene/gui/font_config_plugin.cpp @@ -31,7 +31,6 @@ #include "font_config_plugin.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" #include "core/os/os.h" #include "core/string/translation_server.h" #include "editor/import/dynamic_font_import_settings.h" @@ -949,8 +948,6 @@ void FontPreview::_notification(int p_what) { } } -void FontPreview::_bind_methods() {} - Size2 FontPreview::get_minimum_size() const { return Vector2(64, 64) * EDSCALE; } diff --git a/editor/scene/gui/font_config_plugin.h b/editor/scene/gui/font_config_plugin.h index baf7d2e037..f85fc8279f 100644 --- a/editor/scene/gui/font_config_plugin.h +++ b/editor/scene/gui/font_config_plugin.h @@ -128,8 +128,6 @@ class EditorPropertyOTVariation : public EditorProperty { EditorPaginator *paginator = nullptr; protected: - static void _bind_methods() {} - void _edit_pressed(); void _page_changed(int p_page); void _property_changed(const String &p_property, const Variant &p_value, const String &p_name = "", bool p_changing = false); @@ -206,7 +204,6 @@ class FontPreview : public Control { protected: void _notification(int p_what); - static void _bind_methods(); Ref prev_font; @@ -240,7 +237,6 @@ protected: virtual void _add_element() override; void _add_font(int p_option); - static void _bind_methods() {} public: EditorPropertyFontNamesArray(); diff --git a/editor/scene/gui/theme_editor_preview.cpp b/editor/scene/gui/theme_editor_preview.cpp index d4392f124a..1a1f4b2f42 100644 --- a/editor/scene/gui/theme_editor_preview.cpp +++ b/editor/scene/gui/theme_editor_preview.cpp @@ -32,7 +32,7 @@ #include "core/config/project_settings.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/texture/color_channel_selector.cpp b/editor/scene/texture/color_channel_selector.cpp index 82ac2ee38a..1f966821bd 100644 --- a/editor/scene/texture/color_channel_selector.cpp +++ b/editor/scene/texture/color_channel_selector.cpp @@ -31,12 +31,12 @@ #include "color_channel_selector.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/panel_container.h" -#include "scene/resources/style_box_flat.h" +#include "scene/resources/style_box.h" ColorChannelSelector::ColorChannelSelector() { toggle_button = memnew(Button); diff --git a/editor/scene/texture/texture_editor_plugin.cpp b/editor/scene/texture/texture_editor_plugin.cpp index 701ba37812..ee375ca6ba 100644 --- a/editor/scene/texture/texture_editor_plugin.cpp +++ b/editor/scene/texture/texture_editor_plugin.cpp @@ -47,7 +47,6 @@ #include "scene/resources/image_texture.h" #include "scene/resources/material.h" #include "scene/resources/portable_compressed_texture.h" -#include "scene/resources/style_box_flat.h" #include "scene/resources/texture_rd.h" #include "servers/rendering/rendering_device.h" diff --git a/editor/script/editor_script.cpp b/editor/script/editor_script.cpp index 2cac3fa338..2f2a1cb2b0 100644 --- a/editor/script/editor_script.cpp +++ b/editor/script/editor_script.cpp @@ -33,10 +33,7 @@ #include "core/object/class_db.h" #include "editor/editor_interface.h" #include "editor/editor_node.h" -#include "editor/editor_undo_redo_manager.h" -#include "editor/scene/editor_scene_tabs.h" #include "scene/main/node.h" -#include "scene/resources/packed_scene.h" #ifndef DISABLE_DEPRECATED void EditorScript::add_root_node(Node *p_node) { diff --git a/editor/script/script_create_dialog.h b/editor/script/script_create_dialog.h index 92c143a2ca..61d6b47291 100644 --- a/editor/script/script_create_dialog.h +++ b/editor/script/script_create_dialog.h @@ -34,7 +34,6 @@ #include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" class CreateDialog; class EditorFileDialog; diff --git a/editor/settings/action_map_editor.cpp b/editor/settings/action_map_editor.cpp index 205ec43766..c720acbd7a 100644 --- a/editor/settings/action_map_editor.cpp +++ b/editor/settings/action_map_editor.cpp @@ -31,7 +31,7 @@ #include "action_map_editor.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/editor_string_names.h" #include "editor/settings/editor_event_search_bar.h" #include "editor/settings/editor_settings.h" diff --git a/editor/settings/editor_autoload_settings.cpp b/editor/settings/editor_autoload_settings.cpp index 863b3c0c72..a80c394f01 100644 --- a/editor/settings/editor_autoload_settings.cpp +++ b/editor/settings/editor_autoload_settings.cpp @@ -36,7 +36,6 @@ #include "core/object/class_db.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/gui/editor_file_dialog.h" #include "editor/scene/scene_create_dialog.h" diff --git a/editor/settings/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp index 07b48c450d..22bb32ef03 100644 --- a/editor/settings/editor_build_profile.cpp +++ b/editor/settings/editor_build_profile.cpp @@ -45,7 +45,7 @@ #include "scene/gui/margin_container.h" #include "scene/gui/separator.h" -#include "modules/modules_enabled.gen.h" // For mono. +#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono. const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = { // This maps to SCons build options. diff --git a/editor/settings/editor_event_search_bar.cpp b/editor/settings/editor_event_search_bar.cpp index 8c3faba6cc..80f29c4604 100644 --- a/editor/settings/editor_event_search_bar.cpp +++ b/editor/settings/editor_event_search_bar.cpp @@ -31,7 +31,7 @@ #include "editor_event_search_bar.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/settings/event_listener_line_edit.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" diff --git a/editor/settings/editor_layouts_dialog.cpp b/editor/settings/editor_layouts_dialog.cpp index 2eedeef59d..622e656c79 100644 --- a/editor/settings/editor_layouts_dialog.cpp +++ b/editor/settings/editor_layouts_dialog.cpp @@ -32,7 +32,7 @@ #include "core/io/config_file.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" diff --git a/editor/settings/event_listener_line_edit.cpp b/editor/settings/event_listener_line_edit.cpp index 5ec41c3ebf..8cac787328 100644 --- a/editor/settings/event_listener_line_edit.cpp +++ b/editor/settings/event_listener_line_edit.cpp @@ -32,7 +32,7 @@ #include "core/input/input_map.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/os/os.h" #include "scene/gui/dialogs.h" #include "servers/display/accessibility_server.h" diff --git a/editor/shader/shader_create_dialog.cpp b/editor/shader/shader_create_dialog.cpp index df031576e6..45fd991182 100644 --- a/editor/shader/shader_create_dialog.cpp +++ b/editor/shader/shader_create_dialog.cpp @@ -37,6 +37,7 @@ #include "editor/editor_node.h" #include "editor/gui/editor_file_dialog.h" #include "editor/gui/editor_validation_panel.h" +#include "editor/settings/editor_settings.h" #include "editor/shader/editor_shader_language_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/main/scene_tree.h" diff --git a/editor/shader/shader_create_dialog.h b/editor/shader/shader_create_dialog.h index cc59b48f10..064116d880 100644 --- a/editor/shader/shader_create_dialog.h +++ b/editor/shader/shader_create_dialog.h @@ -30,13 +30,11 @@ #pragma once -#include "editor/settings/editor_settings.h" #include "scene/gui/check_box.h" #include "scene/gui/dialogs.h" #include "scene/gui/grid_container.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" class EditorFileDialog; class EditorValidationPanel; diff --git a/editor/shader/shader_editor_plugin.cpp b/editor/shader/shader_editor_plugin.cpp index cc72f9708e..cad7770e33 100644 --- a/editor/shader/shader_editor_plugin.cpp +++ b/editor/shader/shader_editor_plugin.cpp @@ -39,6 +39,7 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/window_wrapper.h" #include "editor/settings/editor_command_palette.h" +#include "editor/settings/editor_settings.h" #include "editor/shader/shader_create_dialog.h" #include "editor/shader/text_shader_editor.h" #include "editor/shader/text_shader_language_plugin.h" diff --git a/editor/themes/editor_icons.cpp b/editor/themes/editor_icons.cpp index a58ad3a7e7..66e406aae4 100644 --- a/editor/themes/editor_icons.cpp +++ b/editor/themes/editor_icons.cpp @@ -35,7 +35,6 @@ #include "editor/themes/editor_icons.gen.h" #include "editor/themes/editor_scale.h" #include "scene/resources/dpi_texture.h" -#include "scene/resources/image_texture.h" #include "modules/svg/image_loader_svg.h" diff --git a/editor/themes/theme_classic.cpp b/editor/themes/theme_classic.cpp index e5dfe07549..e6e97d6d68 100644 --- a/editor/themes/theme_classic.cpp +++ b/editor/themes/theme_classic.cpp @@ -40,7 +40,7 @@ #include "scene/resources/image_texture.h" #include "scene/resources/style_box_flat.h" #include "scene/resources/style_box_line.h" -#include "scene/resources/style_box_texture.h" +#include "scene/resources/style_box_texture.h" // IWYU pragma: keep. Used by `EditorThemeManager::make_stylebox`. void ThemeClassic::populate_shared_styles(const Ref &p_theme, EditorThemeManager::ThemeConfiguration &p_config) { // Colors. diff --git a/editor/translations/editor_locale_dialog.cpp b/editor/translations/editor_locale_dialog.cpp index 464b23494c..34b7e380c4 100644 --- a/editor/translations/editor_locale_dialog.cpp +++ b/editor/translations/editor_locale_dialog.cpp @@ -32,7 +32,7 @@ #include "core/config/project_settings.h" #include "core/object/callable_mp.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro. #include "core/string/translation_server.h" #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" diff --git a/editor/translations/editor_translation_parser.cpp b/editor/translations/editor_translation_parser.cpp index eb59d80ad7..5c5b0164da 100644 --- a/editor/translations/editor_translation_parser.cpp +++ b/editor/translations/editor_translation_parser.cpp @@ -31,7 +31,7 @@ #include "editor_translation_parser.h" #include "core/error/error_macros.h" -#include "core/object/class_db.h" +#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro. #include "core/object/script_language.h" #include "core/templates/hash_set.h" diff --git a/main/main.cpp b/main/main.cpp index 3c99ae8504..0f1bf70fbd 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -46,7 +46,6 @@ #include "core/io/file_access_zip.h" #include "core/io/image.h" #include "core/io/image_loader.h" -#include "core/io/ip.h" #include "core/io/resource_loader.h" #include "core/object/class_db.h" #include "core/object/message_queue.h" @@ -88,7 +87,6 @@ // 2D #ifndef NAVIGATION_2D_DISABLED #include "servers/navigation_2d/navigation_server_2d.h" -#include "servers/navigation_2d/navigation_server_2d_dummy.h" #endif // NAVIGATION_2D_DISABLED #ifndef PHYSICS_2D_DISABLED @@ -99,7 +97,6 @@ // 3D #ifndef NAVIGATION_3D_DISABLED #include "servers/navigation_3d/navigation_server_3d.h" -#include "servers/navigation_3d/navigation_server_3d_dummy.h" #endif // NAVIGATION_3D_DISABLED #ifndef PHYSICS_3D_DISABLED diff --git a/main/main_builders.py b/main/main_builders.py index a184dafddc..78041ce4f1 100644 --- a/main/main_builders.py +++ b/main/main_builders.py @@ -9,6 +9,8 @@ def make_splash(target, source, env): with methods.generated_wrapper(str(target[0])) as file: # Use a neutral gray color to better fit various kinds of projects. file.write(f"""\ +#include "core/math/color.h" + static const Color boot_splash_bg_color = Color(0.14, 0.14, 0.14); inline constexpr const unsigned char boot_splash_png[] = {{ {methods.format_buffer(buffer, 1)} @@ -23,6 +25,8 @@ def make_splash_editor(target, source, env): # The editor splash background color is taken from the default editor theme's background color. # This helps achieve a visually "smoother" transition between the splash screen and the editor. file.write(f"""\ +#include "core/math/color.h" + static const Color boot_splash_editor_bg_color = Color(0.125, 0.145, 0.192); inline constexpr const unsigned char boot_splash_editor_png[] = {{ {methods.format_buffer(buffer, 1)} diff --git a/main/main_timer_sync.cpp b/main/main_timer_sync.cpp index 776de70276..b4c5ab07ee 100644 --- a/main/main_timer_sync.cpp +++ b/main/main_timer_sync.cpp @@ -33,6 +33,13 @@ #include "core/os/os.h" #include "servers/display/display_server.h" +// Uncomment this define to get more debugging logs for the delta smoothing. +// #define GODOT_DEBUG_DELTA_SMOOTHER +#ifdef GODOT_DEBUG_DELTA_SMOOTHER +#include "core/string/print_string.h" +#include "core/string/string.h" +#endif + void MainFrameTime::clamp_process_step(double min_process_step, double max_process_step) { if (process_step < min_process_step) { process_step = min_process_step; @@ -43,6 +50,20 @@ void MainFrameTime::clamp_process_step(double min_process_step, double max_proce ///////////////////////////////// +void MainTimerSync::DeltaSmoother::made_new_estimate() { + _hits_above_estimated = 0; + _hits_at_estimated = 0; + _hits_below_estimated = 0; + _hits_one_above_estimated = 0; + _hits_one_below_estimated = 0; + + _estimate_complete = false; + +#ifdef GODOT_DEBUG_DELTA_SMOOTHER + print_line("estimated fps " + itos(_estimated_fps)); +#endif +} + void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta) { // the calling code should prevent 0 or negative values of delta // (preventing divide by zero) @@ -212,8 +233,6 @@ bool MainTimerSync::DeltaSmoother::fps_allows_smoothing(int64_t p_delta) { double fps = 1000000.0 / time_passed; double ratio = fps / (double)_estimated_fps; - //print_line("ratio : " + String(Variant(ratio))); - if ((ratio > 0.95) && (ratio < 1.05)) { _measurement_allows_smoothing = true; } else { @@ -288,7 +307,6 @@ int64_t MainTimerSync::DeltaSmoother::smooth_delta(int64_t p_delta) { units = MAX(units, 1); _leftover_time -= units * _vsync_delta; - // print_line("units " + itos(units) + ", leftover " + itos(_leftover_time/1000) + " ms"); return units * _vsync_delta; } diff --git a/main/main_timer_sync.h b/main/main_timer_sync.h index 59dac84b78..0e7bc2b085 100644 --- a/main/main_timer_sync.h +++ b/main/main_timer_sync.h @@ -30,10 +30,7 @@ #pragma once -#include "core/config/engine.h" - -// Uncomment this define to get more debugging logs for the delta smoothing. -// #define GODOT_DEBUG_DELTA_SMOOTHER +#include struct MainFrameTime { double process_step; // delta time to advance during process() @@ -50,6 +47,7 @@ class MainTimerSync { int64_t smooth_delta(int64_t p_delta); private: + void made_new_estimate(); void update_refresh_rate_estimator(int64_t p_delta); bool fps_allows_smoothing(int64_t p_delta); @@ -87,21 +85,6 @@ class MainTimerSync { // to prevent spurious values int64_t _estimator_total_delta = 0; int32_t _estimator_delta_readings = 0; - - void made_new_estimate() { - _hits_above_estimated = 0; - _hits_at_estimated = 0; - _hits_below_estimated = 0; - _hits_one_above_estimated = 0; - _hits_one_below_estimated = 0; - - _estimate_complete = false; - -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - print_line("estimated fps " + itos(_estimated_fps)); -#endif - } - } _delta_smoother; // wall clock time measured on the main thread diff --git a/platform/ios/export/export.cpp b/platform/ios/export/export.cpp index c2c6f196cb..5e5452bb1e 100644 --- a/platform/ios/export/export.cpp +++ b/platform/ios/export/export.cpp @@ -34,6 +34,7 @@ #include "core/object/class_db.h" #include "editor/export/editor_export.h" +#include "editor/settings/editor_settings.h" void register_ios_exporter_types() { GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformIOS); diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index d2d4195d53..fa5211f9dd 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -34,6 +34,7 @@ #include "run_icon_svg.gen.h" #include "editor/editor_node.h" +#include "main/splash.gen.h" Vector EditorExportPlatformIOS::device_types({ "iPhone", "iPad" }); diff --git a/platform/linuxbsd/export/export_plugin.cpp b/platform/linuxbsd/export/export_plugin.cpp index 5c2e31020a..9d00b55691 100644 --- a/platform/linuxbsd/export/export_plugin.cpp +++ b/platform/linuxbsd/export/export_plugin.cpp @@ -35,6 +35,7 @@ #include "core/io/dir_access.h" #include "core/io/file_access.h" +#include "core/io/zip_io.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/platform/macos/editor/embedded_game_view_plugin.mm b/platform/macos/editor/embedded_game_view_plugin.mm index b11f052454..611cf28fe1 100644 --- a/platform/macos/editor/embedded_game_view_plugin.mm +++ b/platform/macos/editor/embedded_game_view_plugin.mm @@ -36,6 +36,7 @@ #include "core/input/input.h" #include "editor/editor_node.h" #include "editor/gui/window_wrapper.h" +#include "scene/main/window.h" #include "servers/display/display_server.h" HashMap GameViewDebuggerMacOS::parse_message_handlers; diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index 4908be7e31..5c3866a2e3 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -35,6 +35,7 @@ #include "core/io/image_loader.h" #include "core/io/plist.h" +#include "core/io/zip_io.h" #include "core/object/class_db.h" #include "core/os/os.h" #include "core/string/translation_server.h" diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 6803758899..4a69bb44a1 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -37,6 +37,7 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" +#include "core/io/zip_io.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h"