diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index a0d39e0460d..51b4c772494 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -50,6 +50,7 @@ #ifdef TOOLS_ENABLED #include "core/config/engine.h" + #include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono. #endif // TOOLS_ENABLED diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp index bc1212cee29..cc25ff8f1a8 100644 --- a/core/extension/gdextension.cpp +++ b/core/extension/gdextension.cpp @@ -32,11 +32,11 @@ #include "gdextension.compat.inc" #include "core/config/project_settings.h" +#include "core/extension/gdextension_library_loader.h" +#include "core/extension/gdextension_manager.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/object/method_bind.h" -#include "gdextension_library_loader.h" -#include "gdextension_manager.h" extern void gdextension_setup_interface(); extern GDExtensionInterfaceFunctionPtr gdextension_get_proc_address(const char *p_name); diff --git a/core/extension/gdextension_interface_header_generator.cpp b/core/extension/gdextension_interface_header_generator.cpp index 31f1150cc3a..84d267739e4 100644 --- a/core/extension/gdextension_interface_header_generator.cpp +++ b/core/extension/gdextension_interface_header_generator.cpp @@ -32,8 +32,8 @@ #include "gdextension_interface_header_generator.h" +#include "core/extension/gdextension_interface_dump.gen.h" #include "core/io/json.h" -#include "gdextension_interface_dump.gen.h" static const char *FILE_HEADER = "/**************************************************************************/\n" diff --git a/core/extension/gdextension_library_loader.cpp b/core/extension/gdextension_library_loader.cpp index 3a37d175f01..b35567305bf 100644 --- a/core/extension/gdextension_library_loader.cpp +++ b/core/extension/gdextension_library_loader.cpp @@ -32,10 +32,10 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/extension/gdextension.h" #include "core/io/dir_access.h" #include "core/os/os.h" #include "core/version.h" -#include "gdextension.h" Vector GDExtensionLibraryLoader::find_extension_dependencies(const String &p_path, Ref p_config, std::function p_has_feature) { Vector dependencies_shared_objects; diff --git a/core/extension/gdextension_library_loader.h b/core/extension/gdextension_library_loader.h index d416c83da79..88aadf2a6f6 100644 --- a/core/extension/gdextension_library_loader.h +++ b/core/extension/gdextension_library_loader.h @@ -30,12 +30,12 @@ #pragma once -#include - #include "core/extension/gdextension_loader.h" #include "core/io/config_file.h" #include "core/os/shared_object.h" +#include + class GDExtensionLibraryLoader : public GDExtensionLoader { GDSOFTCLASS(GDExtensionLibraryLoader, GDExtensionLoader); diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index ecb664b41fd..63a0df4cd86 100644 --- a/core/io/packet_peer.h +++ b/core/io/packet_peer.h @@ -30,11 +30,10 @@ #pragma once -#include "core/io/stream_peer.h" -#include "core/templates/ring_buffer.h" - #include "core/extension/ext_wrappers.gen.h" +#include "core/io/stream_peer.h" #include "core/object/gdvirtual.gen.h" +#include "core/templates/ring_buffer.h" #include "core/variant/native_ptr.h" class PacketPeer : public RefCounted { diff --git a/core/io/stream_peer.h b/core/io/stream_peer.h index af503b7d0a6..017afbf529f 100644 --- a/core/io/stream_peer.h +++ b/core/io/stream_peer.h @@ -30,10 +30,9 @@ #pragma once -#include "core/object/ref_counted.h" - #include "core/extension/ext_wrappers.gen.h" #include "core/object/gdvirtual.gen.h" +#include "core/object/ref_counted.h" #include "core/variant/native_ptr.h" class StreamPeer : public RefCounted { diff --git a/core/io/stream_peer_gzip.h b/core/io/stream_peer_gzip.h index 4d5a84f8799..b9186bc9fef 100644 --- a/core/io/stream_peer_gzip.h +++ b/core/io/stream_peer_gzip.h @@ -31,7 +31,6 @@ #pragma once #include "core/io/stream_peer.h" - #include "core/templates/ring_buffer.h" class StreamPeerGZIP : public StreamPeer { diff --git a/core/math/color.cpp b/core/math/color.cpp index bda3e2f930f..57fa00ab634 100644 --- a/core/math/color.cpp +++ b/core/math/color.cpp @@ -30,7 +30,7 @@ #include "color.h" -#include "color_names.inc" +#include "core/math/color_names.inc" #include "core/math/math_funcs.h" #include "core/string/ustring.h" #include "core/templates/hash_map.h" diff --git a/core/object/method_bind.cpp b/core/object/method_bind.cpp index 42e76834f3b..18b25561a1e 100644 --- a/core/object/method_bind.cpp +++ b/core/object/method_bind.cpp @@ -28,11 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#include "core/object/object.h" // object.h needs to be the first include *before* method_bind.h // FIXME: Find out why and fix potential cyclical dependencies. -#include "core/object/object.h" - -#include "method_bind.h" +#include "core/object/method_bind.h" uint32_t MethodBind::get_hash() const { MethodInfo mi; diff --git a/core/object/method_info.cpp b/core/object/method_info.cpp index 9ebddf2c6e8..d6cb6331f15 100644 --- a/core/object/method_info.cpp +++ b/core/object/method_info.cpp @@ -33,7 +33,6 @@ #include "core/variant/array.h" #include "core/variant/dictionary.h" #include "core/variant/typed_array.h" -#include "property_info.h" MethodInfo::operator Dictionary() const { Dictionary d; diff --git a/core/object/method_info.h b/core/object/method_info.h index 91afd48e2d2..e8e30dee8ce 100644 --- a/core/object/method_info.h +++ b/core/object/method_info.h @@ -30,8 +30,8 @@ #pragma once +#include "core/object/property_info.h" #include "core/variant/variant.h" -#include "property_info.h" enum MethodFlags { METHOD_FLAG_NORMAL = 1, diff --git a/core/os/time.h b/core/os/time.h index f34c151a5c6..1d2708db8c8 100644 --- a/core/os/time.h +++ b/core/os/time.h @@ -31,8 +31,8 @@ #pragma once #include "core/object/object.h" +#include "core/os/time_enums.h" #include "core/variant/type_info.h" -#include "time_enums.h" // This Time class conforms with as many of the ISO 8601 standards as possible. // * As per ISO 8601:2004 4.3.2.1, all dates follow the Proleptic Gregorian diff --git a/core/profiling/profiling.h b/core/profiling/profiling.h index 9dea94043fa..00b4022ce56 100644 --- a/core/profiling/profiling.h +++ b/core/profiling/profiling.h @@ -96,10 +96,10 @@ void godot_cleanup_profiler(); #elif defined(GODOT_USE_PERFETTO) // Use the perfetto profiler. -#include - #include "core/typedefs.h" +#include + PERFETTO_DEFINE_CATEGORIES( perfetto::Category("godot") .SetDescription("All Godot Events"), ); diff --git a/core/templates/a_hash_map.cpp b/core/templates/a_hash_map.cpp index 04a14c261a2..ac21797387c 100644 --- a/core/templates/a_hash_map.cpp +++ b/core/templates/a_hash_map.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "a_hash_map.h" + #include "core/variant/variant.h" // Explicit instantiation. diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 56354107c09..111241a11fa 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -34,12 +34,12 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary); STATIC_ASSERT_INCOMPLETE_TYPE(class, Object); STATIC_ASSERT_INCOMPLETE_TYPE(class, String); -#include "container_type_validate.h" #include "core/math/math_funcs.h" #include "core/object/script_language.h" #include "core/templates/hashfuncs.h" #include "core/templates/vector.h" #include "core/variant/callable.h" +#include "core/variant/container_type_validate.h" #include "core/variant/dictionary.h" struct ArrayPrivate { diff --git a/drivers/apple/thread_apple.h b/drivers/apple/thread_apple.h index f8715bd0e38..729c56cc7cd 100644 --- a/drivers/apple/thread_apple.h +++ b/drivers/apple/thread_apple.h @@ -34,6 +34,7 @@ #include "core/typedefs.h" #include + #include // For hardware interference size class String; diff --git a/drivers/apple_embedded/apple_embedded.mm b/drivers/apple_embedded/apple_embedded.mm index c0a1f5d295a..368e879ac8f 100644 --- a/drivers/apple_embedded/apple_embedded.mm +++ b/drivers/apple_embedded/apple_embedded.mm @@ -33,12 +33,12 @@ #import "app_delegate_service.h" #import "godot_view_controller.h" +#include "core/object/class_db.h" + #import #import #include -#include "core/object/class_db.h" - void AppleEmbedded::_bind_methods() { ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &AppleEmbedded::get_rate_url); ClassDB::bind_method(D_METHOD("supports_haptic_engine"), &AppleEmbedded::supports_haptic_engine); diff --git a/drivers/apple_embedded/godot_app_delegate.mm b/drivers/apple_embedded/godot_app_delegate.mm index da658f36553..6dc3f3d9b0d 100644 --- a/drivers/apple_embedded/godot_app_delegate.mm +++ b/drivers/apple_embedded/godot_app_delegate.mm @@ -31,6 +31,7 @@ #import "godot_app_delegate.h" #import "app_delegate_service.h" + #include "core/typedefs.h" @implementation GDTApplicationDelegate diff --git a/drivers/apple_embedded/main_utilities.mm b/drivers/apple_embedded/main_utilities.mm index 31bb6ffd63d..a1b34108504 100644 --- a/drivers/apple_embedded/main_utilities.mm +++ b/drivers/apple_embedded/main_utilities.mm @@ -31,8 +31,8 @@ #include "core/string/ustring.h" #import - #include + #include void change_to_launch_dir(char **p_args) { diff --git a/drivers/apple_embedded/os_apple_embedded.mm b/drivers/apple_embedded/os_apple_embedded.mm index f637bcd5336..9ebd3a86c65 100644 --- a/drivers/apple_embedded/os_apple_embedded.mm +++ b/drivers/apple_embedded/os_apple_embedded.mm @@ -56,10 +56,12 @@ #import #import #include + #include #if defined(RD_ENABLED) #include "servers/rendering/renderer_rd/renderer_compositor_rd.h" + #import #if defined(VULKAN_ENABLED) diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index 82e7b15ff40..3ee1bd09611 100644 --- a/drivers/coremidi/midi_driver_coremidi.h +++ b/drivers/coremidi/midi_driver_coremidi.h @@ -37,6 +37,7 @@ #include "core/templates/vector.h" #import + #include class MIDIDriverCoreMidi : public MIDIDriver { diff --git a/drivers/d3d12/rendering_context_driver_d3d12.cpp b/drivers/d3d12/rendering_context_driver_d3d12.cpp index d1d94c9ed96..6a27f315a2e 100644 --- a/drivers/d3d12/rendering_context_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_context_driver_d3d12.cpp @@ -45,7 +45,6 @@ GODOT_CLANG_WARNING_POP #if !defined(_MSC_VER) #include - #include #endif diff --git a/drivers/d3d12/rendering_device_driver_d3d12.cpp b/drivers/d3d12/rendering_device_driver_d3d12.cpp index 4c2d430d001..ad1f7f9f44f 100644 --- a/drivers/d3d12/rendering_device_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_device_driver_d3d12.cpp @@ -36,14 +36,12 @@ #include "drivers/d3d12/d3d12_hooks.h" #include "drivers/d3d12/rendering_context_driver_d3d12.h" -#include - #include #include +#include #if !defined(_MSC_VER) #include - #include #endif diff --git a/drivers/d3d12/rendering_device_driver_d3d12.h b/drivers/d3d12/rendering_device_driver_d3d12.h index 7f4d1a962de..d6b2241d4e5 100644 --- a/drivers/d3d12/rendering_device_driver_d3d12.h +++ b/drivers/d3d12/rendering_device_driver_d3d12.h @@ -39,7 +39,6 @@ #include "servers/rendering/rendering_device_driver.h" #include - #include #ifdef DEV_ENABLED diff --git a/drivers/d3d12/rendering_shader_container_d3d12.cpp b/drivers/d3d12/rendering_shader_container_d3d12.cpp index ce9c8f968e4..6090ea86991 100644 --- a/drivers/d3d12/rendering_shader_container_d3d12.cpp +++ b/drivers/d3d12/rendering_shader_container_d3d12.cpp @@ -36,9 +36,7 @@ #include #include #include - #include - #include extern "C" { diff --git a/drivers/egl/egl_manager.h b/drivers/egl/egl_manager.h index 6c4721a8b3e..cbd664f02ca 100644 --- a/drivers/egl/egl_manager.h +++ b/drivers/egl/egl_manager.h @@ -32,12 +32,11 @@ #ifdef EGL_ENABLED -// These must come first to avoid windows.h mess. -#include "platform_gl.h" - #include "core/templates/local_vector.h" #include "servers/display/display_server_enums.h" +#include + class EGLManager { private: // An EGL-side representation of a display with its own rendering diff --git a/drivers/gles3/rasterizer_util_gles3.cpp b/drivers/gles3/rasterizer_util_gles3.cpp index e7822f8bde4..e285fe25cf9 100644 --- a/drivers/gles3/rasterizer_util_gles3.cpp +++ b/drivers/gles3/rasterizer_util_gles3.cpp @@ -30,7 +30,7 @@ #include "rasterizer_util_gles3.h" -#include "platform_gl.h" +#include bool RasterizerUtilGLES3::gles_over_gl = true; diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 24e843b8843..4ff35c1b08e 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -38,7 +38,7 @@ #include "core/templates/rid_owner.h" #include "servers/rendering/rendering_server_types.h" -#include "platform_gl.h" +#include class StringBuilder; diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index d2bcc59276a..c8d21763b53 100644 --- a/drivers/gles3/storage/config.h +++ b/drivers/gles3/storage/config.h @@ -34,11 +34,8 @@ #include "core/templates/hash_set.h" -// FIXME: platform_gl.h includes windows.h via egl.h, which defines ConnectFlags. -// This breaks include project_settings.h in config.cpp, so we include object.h first. -#include "core/object/object.h" // IWYU pragma: keep. - -#include "platform_gl.h" +#include +#undef ConnectFlags // Defined by windows.h through egl.h, breaks object.h. #ifdef ANDROID_ENABLED typedef void (*PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei); diff --git a/drivers/gles3/storage/light_storage.h b/drivers/gles3/storage/light_storage.h index 2321e93b011..905b52fa15a 100644 --- a/drivers/gles3/storage/light_storage.h +++ b/drivers/gles3/storage/light_storage.h @@ -38,7 +38,7 @@ #include "servers/rendering/storage/light_storage.h" #include "servers/rendering/storage/utilities.h" -#include "platform_gl.h" +#include class RenderSceneBuffersGLES3; diff --git a/drivers/gles3/storage/mesh_storage.h b/drivers/gles3/storage/mesh_storage.h index ad6d217d51b..d9ab1b77222 100644 --- a/drivers/gles3/storage/mesh_storage.h +++ b/drivers/gles3/storage/mesh_storage.h @@ -42,7 +42,7 @@ #include "servers/rendering/storage/mesh_storage.h" #include "servers/rendering/storage/utilities.h" -#include "platform_gl.h" +#include namespace GLES3 { diff --git a/drivers/gles3/storage/particles_storage.h b/drivers/gles3/storage/particles_storage.h index f97e968faf7..60b3b646dc3 100644 --- a/drivers/gles3/storage/particles_storage.h +++ b/drivers/gles3/storage/particles_storage.h @@ -38,7 +38,7 @@ #include "servers/rendering/storage/particles_storage.h" #include "servers/rendering/storage/utilities.h" -#include "platform_gl.h" +#include namespace GLES3 { diff --git a/drivers/gles3/storage/render_scene_buffers_gles3.h b/drivers/gles3/storage/render_scene_buffers_gles3.h index 65550752e41..68176986b39 100644 --- a/drivers/gles3/storage/render_scene_buffers_gles3.h +++ b/drivers/gles3/storage/render_scene_buffers_gles3.h @@ -35,7 +35,7 @@ #include "drivers/gles3/effects/glow.h" #include "servers/rendering/storage/render_scene_buffers.h" -#include "platform_gl.h" +#include class RenderSceneBuffersGLES3 : public RenderSceneBuffers { GDCLASS(RenderSceneBuffersGLES3, RenderSceneBuffers); diff --git a/drivers/gles3/storage/texture_storage.h b/drivers/gles3/storage/texture_storage.h index f02fc2ecd17..03be5ffe8c6 100644 --- a/drivers/gles3/storage/texture_storage.h +++ b/drivers/gles3/storage/texture_storage.h @@ -41,7 +41,7 @@ #include "servers/rendering/rendering_server_types.h" #include "servers/rendering/storage/texture_storage.h" -#include "platform_gl.h" +#include namespace GLES3 { diff --git a/drivers/gles3/storage/utilities.h b/drivers/gles3/storage/utilities.h index 06b92e61cfa..a0b953b5dc2 100644 --- a/drivers/gles3/storage/utilities.h +++ b/drivers/gles3/storage/utilities.h @@ -35,7 +35,7 @@ #include "core/templates/rid_owner.h" #include "servers/rendering/storage/utilities.h" -#include "platform_gl.h" +#include namespace GLES3 { diff --git a/drivers/metal/metal_device_properties.cpp b/drivers/metal/metal_device_properties.cpp index 7b62876d845..04e0857a84d 100644 --- a/drivers/metal/metal_device_properties.cpp +++ b/drivers/metal/metal_device_properties.cpp @@ -58,7 +58,6 @@ #include #include #include - #include // Common scaling multipliers. diff --git a/drivers/metal/metal_device_properties.h b/drivers/metal/metal_device_properties.h index 7372286aa31..093c05e5ed0 100644 --- a/drivers/metal/metal_device_properties.h +++ b/drivers/metal/metal_device_properties.h @@ -53,6 +53,7 @@ #include "servers/rendering/rendering_device_driver.h" #include + #include /** The buffer index to use for vertex content. */ diff --git a/drivers/metal/metal_objects_shared.cpp b/drivers/metal/metal_objects_shared.cpp index d66c6aae53d..2193d2af48a 100644 --- a/drivers/metal/metal_objects_shared.cpp +++ b/drivers/metal/metal_objects_shared.cpp @@ -34,6 +34,7 @@ #include #include + #include #include diff --git a/drivers/metal/metal_objects_shared.h b/drivers/metal/metal_objects_shared.h index a4ee31cd9f2..f929e7a125d 100644 --- a/drivers/metal/metal_objects_shared.h +++ b/drivers/metal/metal_objects_shared.h @@ -36,6 +36,7 @@ #include "sha256_digest.h" #include + #include #include diff --git a/drivers/metal/pixel_formats.h b/drivers/metal/pixel_formats.h index 52f75e11f68..bdb936db762 100644 --- a/drivers/metal/pixel_formats.h +++ b/drivers/metal/pixel_formats.h @@ -63,6 +63,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") #include #endif #include + #include #pragma mark - diff --git a/drivers/metal/rendering_context_driver_metal.cpp b/drivers/metal/rendering_context_driver_metal.cpp index 0ffd1d2e2ac..c25bec76c77 100644 --- a/drivers/metal/rendering_context_driver_metal.cpp +++ b/drivers/metal/rendering_context_driver_metal.cpp @@ -37,11 +37,10 @@ #include "core/os/os.h" #include "core/templates/sort_array.h" +#include #include #include -#include - #pragma mark - Logging os_log_t LOG_DRIVER; diff --git a/drivers/metal/rendering_device_driver_metal.cpp b/drivers/metal/rendering_device_driver_metal.cpp index bfa0f1af7e7..94677cab66f 100644 --- a/drivers/metal/rendering_device_driver_metal.cpp +++ b/drivers/metal/rendering_device_driver_metal.cpp @@ -62,9 +62,10 @@ #include "core/templates/hash_map.h" #include "drivers/apple/foundation_helpers.h" +#include #include #include -#include + #include #ifndef MTLGPUAddress diff --git a/drivers/metal/rendering_device_driver_metal.h b/drivers/metal/rendering_device_driver_metal.h index 6904b1d1249..3e17a5c23d4 100644 --- a/drivers/metal/rendering_device_driver_metal.h +++ b/drivers/metal/rendering_device_driver_metal.h @@ -36,6 +36,7 @@ #include "servers/rendering/rendering_device_driver.h" #include + #include class RenderingShaderContainerFormatMetal; diff --git a/drivers/metal/sha256_digest.h b/drivers/metal/sha256_digest.h index f54a7451391..f8c226cbc03 100644 --- a/drivers/metal/sha256_digest.h +++ b/drivers/metal/sha256_digest.h @@ -30,13 +30,13 @@ #pragma once +#include "core/templates/hashfuncs.h" +#include "core/templates/local_vector.h" + #include #include #include -#include "core/templates/hashfuncs.h" -#include "core/templates/local_vector.h" - struct SHA256Digest { unsigned char data[CC_SHA256_DIGEST_LENGTH]; diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index a20293fe07b..f1ee07ced08 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -43,6 +43,7 @@ #include #endif #include + #include #include #include diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index cc0facececf..6b241dc3a88 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -41,6 +41,7 @@ #include #endif #include + #include #if defined(TOOLS_ENABLED) diff --git a/drivers/unix/file_access_unix_pipe.cpp b/drivers/unix/file_access_unix_pipe.cpp index b74d94f6633..95b58518c43 100644 --- a/drivers/unix/file_access_unix_pipe.cpp +++ b/drivers/unix/file_access_unix_pipe.cpp @@ -39,6 +39,7 @@ #include #include #include + #include #include diff --git a/drivers/unix/net_socket_unix.cpp b/drivers/unix/net_socket_unix.cpp index f3ba558fc56..056ad77c182 100644 --- a/drivers/unix/net_socket_unix.cpp +++ b/drivers/unix/net_socket_unix.cpp @@ -44,6 +44,7 @@ #include #include #include + #include #include #include diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 65ad827d6a6..c6ce50d67f3 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -78,6 +78,7 @@ #include #include #include + #include #include #include diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index ab3b74eaad4..710e0457f76 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -36,8 +36,8 @@ #include "core/os/os.h" #include - #include + using Microsoft::WRL::ComPtr; // Define IAudioClient3 if not already defined by MinGW headers diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index c95ca3f2427..2f7ba8d3d50 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -37,9 +37,10 @@ #include "core/templates/safe_refcount.h" #include "servers/audio/audio_server.h" +#include + #include #include -#include class AudioDriverWASAPI : public AudioDriver { class AudioDeviceWASAPI { diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 74125478842..79fe27c2fe4 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -31,6 +31,7 @@ #if defined(WINDOWS_ENABLED) #include "dir_access_windows.h" + #include "file_access_windows.h" #include "core/os/memory.h" @@ -38,6 +39,7 @@ #include "core/string/print_string.h" #include + #include #include diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index 06b3aea9443..a2347af8375 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -36,13 +36,13 @@ #include "core/os/os.h" #include "core/string/print_string.h" +#include #include // _SH_DENYNO #include - -#include #include #include #include + #include #include diff --git a/drivers/windows/ip_windows.cpp b/drivers/windows/ip_windows.cpp index 5ab9d3f89d9..b23cb6553b3 100644 --- a/drivers/windows/ip_windows.cpp +++ b/drivers/windows/ip_windows.cpp @@ -34,7 +34,7 @@ #include #include - +// Include winsock2 before iphlpapi. #include static IPAddress _sockaddr2ip(struct sockaddr *p_addr) { diff --git a/drivers/windows/net_socket_winsock.cpp b/drivers/windows/net_socket_winsock.cpp index c5f0edd28b3..b761fae3f31 100644 --- a/drivers/windows/net_socket_winsock.cpp +++ b/drivers/windows/net_socket_winsock.cpp @@ -32,10 +32,10 @@ #include "net_socket_winsock.h" +#include #include #include -#include // Workaround missing flag in MinGW #if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET) #define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15) diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 271e25ccef6..e1da8e8be89 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -36,6 +36,7 @@ #include "servers/audio/audio_server.h" #include + #include #include diff --git a/editor/animation/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp index 8d1b31299af..f24a69f0135 100644 --- a/editor/animation/animation_track_editor.cpp +++ b/editor/animation/animation_track_editor.cpp @@ -30,7 +30,6 @@ #include "animation_track_editor.h" -#include "animation_track_editor_plugins.h" #include "core/config/project_settings.h" #include "core/error/error_macros.h" #include "core/input/input.h" @@ -39,6 +38,7 @@ #include "core/string/translation_server.h" #include "editor/animation/animation_bezier_editor.h" #include "editor/animation/animation_player_editor_plugin.h" +#include "editor/animation/animation_track_editor_plugins.h" #include "editor/docks/inspector_dock.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" diff --git a/editor/animation/animation_tree_editor_plugin.cpp b/editor/animation/animation_tree_editor_plugin.cpp index 6e64c0e6ae6..02af1757bff 100644 --- a/editor/animation/animation_tree_editor_plugin.cpp +++ b/editor/animation/animation_tree_editor_plugin.cpp @@ -30,12 +30,12 @@ #include "animation_tree_editor_plugin.h" -#include "animation_blend_space_1d_editor.h" -#include "animation_blend_space_2d_editor.h" -#include "animation_blend_tree_editor_plugin.h" -#include "animation_state_machine_editor.h" #include "core/object/callable_mp.h" #include "core/string/string_buffer.h" +#include "editor/animation/animation_blend_space_1d_editor.h" +#include "editor/animation/animation_blend_space_2d_editor.h" +#include "editor/animation/animation_blend_tree_editor_plugin.h" +#include "editor/animation/animation_state_machine_editor.h" #include "editor/docks/editor_dock_manager.h" #include "editor/editor_node.h" #include "editor/gui/editor_bottom_panel.h" diff --git a/editor/export/codesign.cpp b/editor/export/codesign.cpp index d2dc4d4453f..1e869f0a2f1 100644 --- a/editor/export/codesign.cpp +++ b/editor/export/codesign.cpp @@ -33,9 +33,9 @@ #include "core/crypto/crypto_core.h" #include "core/io/dir_access.h" #include "core/io/plist.h" +#include "editor/export/lipo.h" +#include "editor/export/macho.h" #include "editor/file_system/editor_paths.h" -#include "lipo.h" -#include "macho.h" #include "modules/regex/regex.h" diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index e3316380b61..63dfc6a4755 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -51,12 +51,12 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" +#include "editor/export/editor_export_plugin.h" #include "editor/file_system/editor_file_system.h" #include "editor/file_system/editor_paths.h" #include "editor/script/script_editor_plugin.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "editor_export_plugin.h" #include "scene/gui/rich_text_label.h" #include "scene/main/node.h" #include "scene/resources/packed_scene.h" diff --git a/editor/export/editor_export_plugin.h b/editor/export/editor_export_plugin.h index 69c13d6d41e..ad97a41add7 100644 --- a/editor/export/editor_export_plugin.h +++ b/editor/export/editor_export_plugin.h @@ -32,8 +32,8 @@ #include "core/os/shared_object.h" #include "core/variant/typed_array.h" -#include "editor_export_platform.h" -#include "editor_export_preset.h" +#include "editor/export/editor_export_platform.h" +#include "editor/export/editor_export_preset.h" #include "scene/main/node.h" class EditorExportPlugin : public RefCounted { diff --git a/editor/export/shader_baker_export_plugin.h b/editor/export/shader_baker_export_plugin.h index f0feca96312..a6637566992 100644 --- a/editor/export/shader_baker_export_plugin.h +++ b/editor/export/shader_baker_export_plugin.h @@ -34,7 +34,6 @@ #include "core/object/worker_thread_pool.h" #include "core/os/condition_variable.h" #include "core/templates/rb_set.h" - #include "editor/export/editor_export_plugin.h" class ShaderRD; diff --git a/editor/import/dynamic_font_import_settings.h b/editor/import/dynamic_font_import_settings.h index df4cbe29a31..9c36a8244f5 100644 --- a/editor/import/dynamic_font_import_settings.h +++ b/editor/import/dynamic_font_import_settings.h @@ -31,7 +31,6 @@ #pragma once #include "core/io/resource_importer.h" - #include "scene/gui/dialogs.h" #include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp index a439b1c6cbb..9b734bef366 100644 --- a/editor/import/resource_importer_texture_atlas.cpp +++ b/editor/import/resource_importer_texture_atlas.cpp @@ -30,11 +30,11 @@ #include "resource_importer_texture_atlas.h" -#include "atlas_import_failed.xpm" #include "core/config/project_settings.h" #include "core/io/image_loader.h" #include "core/io/resource_saver.h" #include "core/math/geometry_2d.h" +#include "editor/import/atlas_import_failed.xpm" #include "editor/import/editor_atlas_packer.h" #include "scene/resources/atlas_texture.h" #include "scene/resources/bit_map.h" diff --git a/editor/scene/2d/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp index 79e6507e6ea..54341668e8b 100644 --- a/editor/scene/2d/sprite_2d_editor_plugin.cpp +++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp @@ -51,6 +51,7 @@ #include "scene/main/scene_tree.h" #include "scene/resources/bit_map.h" #include "scene/resources/mesh.h" + #include "thirdparty/clipper2/include/clipper2/clipper.h" #define PRECISION 1 diff --git a/editor/scene/2d/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp index fe0075731e2..1acecfb2145 100644 --- a/editor/scene/2d/tiles/tile_data_editors.cpp +++ b/editor/scene/2d/tiles/tile_data_editors.cpp @@ -37,22 +37,19 @@ #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/os/keyboard.h" -#include "scene/main/scene_tree.h" - #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/inspector/editor_properties.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/control.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" - +#include "scene/main/scene_tree.h" #include "servers/navigation_2d/navigation_server_2d.h" #include "servers/rendering/rendering_server.h" diff --git a/editor/scene/2d/tiles/tile_map_layer_editor.h b/editor/scene/2d/tiles/tile_map_layer_editor.h index 972e6cc7ade..13b5f049916 100644 --- a/editor/scene/2d/tiles/tile_map_layer_editor.h +++ b/editor/scene/2d/tiles/tile_map_layer_editor.h @@ -30,15 +30,14 @@ #pragma once -#include "scene/gui/margin_container.h" -#include "tile_atlas_view.h" - #include "core/os/thread.h" #include "editor/docks/editor_dock.h" +#include "editor/scene/2d/tiles/tile_atlas_view.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" #include "scene/gui/item_list.h" +#include "scene/gui/margin_container.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp index 2684b1d5e80..8860f63e414 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp @@ -30,27 +30,23 @@ #include "tile_set_atlas_source_editor.h" -#include "tiles_editor_plugin.h" - +#include "core/input/input.h" +#include "core/math/geometry_2d.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" +#include "core/os/keyboard.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_toaster.h" #include "editor/inspector/editor_inspector.h" #include "editor/scene/2d/tiles/tile_set_editor.h" +#include "editor/scene/2d/tiles/tiles_editor_plugin.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/control.h" - -#include "core/input/input.h" -#include "core/math/geometry_2d.h" -#include "core/os/keyboard.h" - #include "servers/navigation_2d/navigation_server_2d.h" void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) { diff --git a/editor/scene/2d/tiles/tile_set_editor.cpp b/editor/scene/2d/tiles/tile_set_editor.cpp index 4909ac5c7c2..d30b653f087 100644 --- a/editor/scene/2d/tiles/tile_set_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_editor.cpp @@ -43,7 +43,6 @@ #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" diff --git a/editor/scene/2d/tiles/tile_set_editor.h b/editor/scene/2d/tiles/tile_set_editor.h index 4ea9bcda00b..e819b80a78a 100644 --- a/editor/scene/2d/tiles/tile_set_editor.h +++ b/editor/scene/2d/tiles/tile_set_editor.h @@ -30,13 +30,13 @@ #pragma once -#include "atlas_merging_dialog.h" #include "editor/docks/editor_dock.h" +#include "editor/scene/2d/tiles/atlas_merging_dialog.h" +#include "editor/scene/2d/tiles/tile_proxies_manager_dialog.h" +#include "editor/scene/2d/tiles/tile_set_atlas_source_editor.h" +#include "editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h" #include "scene/gui/tab_bar.h" #include "scene/resources/2d/tile_set.h" -#include "tile_proxies_manager_dialog.h" -#include "tile_set_atlas_source_editor.h" -#include "tile_set_scenes_collection_source_editor.h" class AcceptDialog; class SpinBox; diff --git a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp index f3862a1387f..529935b3ab7 100644 --- a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp @@ -40,7 +40,6 @@ #include "editor/scene/2d/tiles/tile_set_editor.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" - #include "scene/gui/button.h" #include "scene/gui/item_list.h" #include "scene/gui/label.h" diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.h b/editor/scene/2d/tiles/tiles_editor_plugin.h index ebd438b0905..53ffd078390 100644 --- a/editor/scene/2d/tiles/tiles_editor_plugin.h +++ b/editor/scene/2d/tiles/tiles_editor_plugin.h @@ -31,9 +31,8 @@ #pragma once #include "editor/plugins/editor_plugin.h" - -#include "tile_map_layer_editor.h" -#include "tile_set_editor.h" +#include "editor/scene/2d/tiles/tile_map_layer_editor.h" +#include "editor/scene/2d/tiles/tile_set_editor.h" class TilesEditorUtils : public Object { GDCLASS(TilesEditorUtils, Object); diff --git a/editor/scene/3d/camera_3d_editor_plugin.cpp b/editor/scene/3d/camera_3d_editor_plugin.cpp index d5b10fdb27a..43144ea7ef2 100644 --- a/editor/scene/3d/camera_3d_editor_plugin.cpp +++ b/editor/scene/3d/camera_3d_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "editor/editor_node.h" -#include "node_3d_editor_plugin.h" +#include "editor/scene/3d/node_3d_editor_plugin.h" #include "scene/gui/aspect_ratio_container.h" #include "scene/gui/foldable_container.h" #include "scene/gui/subviewport_container.h" diff --git a/editor/scene/curve_editor_plugin.cpp b/editor/scene/curve_editor_plugin.cpp index 7d689e6e8aa..7d67db33803 100644 --- a/editor/scene/curve_editor_plugin.cpp +++ b/editor/scene/curve_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "curve_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/input/input.h" #include "core/math/geometry_2d.h" #include "core/object/callable_mp.h" @@ -41,6 +40,7 @@ #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_spin_slider.h" +#include "editor/scene/canvas_item_editor_plugin.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/flow_container.h" diff --git a/editor/script/script_text_editor.h b/editor/script/script_text_editor.h index b764a636bfa..ed3eec895e0 100644 --- a/editor/script/script_text_editor.h +++ b/editor/script/script_text_editor.h @@ -30,10 +30,9 @@ #pragma once -#include "editor/script/script_editor_base.h" -#include "script_editor_plugin.h" - #include "editor/gui/code_editor.h" +#include "editor/script/script_editor_base.h" +#include "editor/script/script_editor_plugin.h" #include "scene/gui/color_picker.h" #include "scene/gui/dialogs.h" #include "scene/gui/option_button.h" diff --git a/editor/settings/editor_settings.cpp b/editor/settings/editor_settings.cpp index edad41e7aaf..f0d500b7ced 100644 --- a/editor/settings/editor_settings.cpp +++ b/editor/settings/editor_settings.cpp @@ -55,7 +55,6 @@ #include "editor/themes/editor_theme_manager.h" #include "editor/translations/editor_translation.h" #include "main/main.h" -#include "modules/regex/regex.h" #include "scene/gui/color_picker.h" #include "scene/gui/file_dialog.h" #include "scene/main/node.h" @@ -64,6 +63,8 @@ #include "scene/resources/animation.h" #include "servers/display/display_server.h" +#include "modules/regex/regex.h" + // PRIVATE METHODS Ref EditorSettings::singleton = nullptr; diff --git a/main/main.cpp b/main/main.cpp index 0f1bf70fbd3..090ef20196a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -63,8 +63,6 @@ #include "main/main_timer_sync.h" #include "main/performance.h" #include "main/splash.gen.h" -#include "modules/register_module_types.h" -#include "platform/register_platform_apis.h" #include "scene/main/scene_tree.h" #include "scene/main/window.h" #include "scene/property_list_helper.h" @@ -84,6 +82,9 @@ #include "servers/text/text_server.h" #include "servers/text/text_server_dummy.h" +#include "modules/register_module_types.h" +#include "platform/register_platform_apis.h" + // 2D #ifndef NAVIGATION_2D_DISABLED #include "servers/navigation_2d/navigation_server_2d.h" diff --git a/modules/betsy/image_compress_betsy.cpp b/modules/betsy/image_compress_betsy.cpp index 63d6c59b03a..7a620c4e1fa 100644 --- a/modules/betsy/image_compress_betsy.cpp +++ b/modules/betsy/image_compress_betsy.cpp @@ -30,12 +30,11 @@ #include "image_compress_betsy.h" -#include "betsy_bc1.h" - #include "alpha_stitch.glsl.gen.h" #include "bc1.glsl.gen.h" #include "bc4.glsl.gen.h" #include "bc6h.glsl.gen.h" +#include "betsy_bc1.h" #include "rgb_to_rgba.glsl.gen.h" #include "core/config/project_settings.h" diff --git a/modules/camera/camera_android.cpp b/modules/camera/camera_android.cpp index a06c240be31..f1ef9941fa2 100644 --- a/modules/camera/camera_android.cpp +++ b/modules/camera/camera_android.cpp @@ -31,6 +31,7 @@ #include "camera_android.h" #include "core/os/os.h" + #include "platform/android/display_server_android.h" #include "platform/android/java_godot_io_wrapper.h" #include "platform/android/os_android.h" diff --git a/modules/camera/camera_android.h b/modules/camera/camera_android.h index 7cdc1248dfa..ebd392a6468 100644 --- a/modules/camera/camera_android.h +++ b/modules/camera/camera_android.h @@ -40,6 +40,7 @@ #include #include #include + #include enum class CameraFacing { diff --git a/modules/csg/tests/test_csg.h b/modules/csg/tests/test_csg.h index c7d797c5b85..4476947e158 100644 --- a/modules/csg/tests/test_csg.h +++ b/modules/csg/tests/test_csg.h @@ -34,7 +34,6 @@ #include "scene/main/scene_tree.h" #include "scene/main/window.h" - #include "tests/test_macros.h" namespace TestCSG { diff --git a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp index 8aabc216cf9..bc9c6a93e8a 100644 --- a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp +++ b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp @@ -30,10 +30,11 @@ #include "editor_scene_importer_fbx2gltf.h" +#include "editor_scene_importer_ufbx.h" + #include "core/config/project_settings.h" #include "core/os/os.h" #include "editor/settings/editor_settings.h" -#include "editor_scene_importer_ufbx.h" #include "modules/gltf/gltf_document.h" diff --git a/modules/fbx/register_types.cpp b/modules/fbx/register_types.cpp index e2465519138..4bb19752ef2 100644 --- a/modules/fbx/register_types.cpp +++ b/modules/fbx/register_types.cpp @@ -30,17 +30,17 @@ #include "register_types.h" -#include "../gltf/extensions/gltf_document_extension_convert_importer_mesh.h" #include "fbx_document.h" #include "core/config/engine.h" #include "core/object/class_db.h" +#include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h" + #ifdef TOOLS_ENABLED #include "editor/editor_scene_importer_fbx2gltf.h" #include "editor/editor_scene_importer_ufbx.h" - -#include "core/config/engine.h" +// #include "core/config/project_settings.h" #include "editor/editor_node.h" diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index ab4d08f9e48..e132c0c8c4b 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -30,8 +30,6 @@ #include "gdscript.h" -#include "core/object/callable_mp.h" -#include "core/object/class_db.h" #include "gdscript_analyzer.h" #include "gdscript_cache.h" #include "gdscript_compiler.h" @@ -40,6 +38,9 @@ #include "gdscript_tokenizer_buffer.h" #include "gdscript_warning.h" +#include "core/object/callable_mp.h" +#include "core/object/class_db.h" + #ifdef TOOLS_ENABLED #include "editor/gdscript_docgen.h" #endif @@ -52,7 +53,6 @@ #include "core/config/project_settings.h" #include "core/core_constants.h" #include "core/io/file_access.h" - #include "scene/resources/packed_scene.h" #include "scene/scene_string_names.h" diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 809b801a1a6..72f4371b242 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -29,7 +29,6 @@ /**************************************************************************/ #include "gdscript.h" - #include "gdscript_analyzer.h" #include "gdscript_parser.h" #include "gdscript_tokenizer.h" diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp index 6beb4285e30..9d6333d4e79 100644 --- a/modules/gdscript/language_server/gdscript_extend_parser.cpp +++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp @@ -32,10 +32,11 @@ #include "../gdscript.h" #include "../gdscript_analyzer.h" -#include "editor/settings/editor_settings.h" #include "gdscript_language_protocol.h" #include "gdscript_workspace.h" +#include "editor/settings/editor_settings.h" + int get_indent_size() { if (EditorSettings::get_singleton()) { return EditorSettings::get_singleton()->get_setting("text_editor/behavior/indent/size"); diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index dfbdb3cd4a1..fda5f0539ff 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -30,6 +30,8 @@ #include "gdscript_language_protocol.h" +#include "godot_lsp.h" + #include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" @@ -39,7 +41,6 @@ #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/settings/editor_settings.h" -#include "modules/gdscript/language_server/godot_lsp.h" #define LSP_CLIENT_V(m_ret_val) \ ERR_FAIL_COND_V(latest_client_id == LSP_NO_CLIENT, m_ret_val); \ diff --git a/modules/gdscript/language_server/gdscript_workspace.h b/modules/gdscript/language_server/gdscript_workspace.h index 8a2b2c5a627..823e14850f2 100644 --- a/modules/gdscript/language_server/gdscript_workspace.h +++ b/modules/gdscript/language_server/gdscript_workspace.h @@ -30,10 +30,10 @@ #pragma once -#include "core/error/error_macros.h" #include "gdscript_extend_parser.h" #include "godot_lsp.h" +#include "core/error/error_macros.h" #include "core/variant/variant.h" class GDScriptWorkspace : public RefCounted { diff --git a/modules/gdscript/tests/gdscript_test_runner.cpp b/modules/gdscript/tests/gdscript_test_runner.cpp index 8d3d193cf42..27bea5db34b 100644 --- a/modules/gdscript/tests/gdscript_test_runner.cpp +++ b/modules/gdscript/tests/gdscript_test_runner.cpp @@ -44,7 +44,6 @@ #include "core/os/os.h" #include "core/string/string_builder.h" #include "scene/resources/packed_scene.h" - #include "tests/test_macros.h" namespace GDScriptTests { diff --git a/modules/gdscript/tests/gdscript_test_runner_suite.h b/modules/gdscript/tests/gdscript_test_runner_suite.h index 1d14b184e4f..df3f0d84cfc 100644 --- a/modules/gdscript/tests/gdscript_test_runner_suite.h +++ b/modules/gdscript/tests/gdscript_test_runner_suite.h @@ -30,9 +30,8 @@ #pragma once -#include "gdscript_test_runner.h" - #include "../gdscript_cache.h" +#include "gdscript_test_runner.h" #include "core/io/file_access.h" #include "tests/test_macros.h" diff --git a/modules/gdscript/tests/test_completion.h b/modules/gdscript/tests/test_completion.h index dccf609bf87..7b053f695c2 100644 --- a/modules/gdscript/tests/test_completion.h +++ b/modules/gdscript/tests/test_completion.h @@ -32,8 +32,6 @@ #ifdef TOOLS_ENABLED -#include "tests/test_macros.h" - #include "../gdscript.h" #include "gdscript_test_runner.h" @@ -47,6 +45,7 @@ #include "editor/settings/editor_settings.h" #include "scene/resources/packed_scene.h" #include "scene/theme/theme_db.h" +#include "tests/test_macros.h" #include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono. diff --git a/modules/gdscript/tests/test_lsp.h b/modules/gdscript/tests/test_lsp.h index 866eef717a7..62338e85c33 100644 --- a/modules/gdscript/tests/test_lsp.h +++ b/modules/gdscript/tests/test_lsp.h @@ -34,8 +34,7 @@ #ifndef GDSCRIPT_NO_LSP -#include "tests/test_macros.h" - +#include "../gdscript_analyzer.h" #include "../language_server/gdscript_extend_parser.h" #include "../language_server/gdscript_language_protocol.h" #include "../language_server/gdscript_workspace.h" @@ -44,8 +43,8 @@ #include "core/io/dir_access.h" #include "editor/file_system/editor_file_system.h" +#include "tests/test_macros.h" -#include "modules/gdscript/gdscript_analyzer.h" #include "modules/regex/regex.h" #include "thirdparty/doctest/doctest.h" diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp index ee2524cb713..b8c4c458228 100644 --- a/modules/gltf/register_types.cpp +++ b/modules/gltf/register_types.cpp @@ -52,8 +52,7 @@ #include "editor/editor_scene_exporter_gltf_plugin.h" #include "editor/editor_scene_importer_blend.h" #include "editor/editor_scene_importer_gltf.h" - -#include "core/config/engine.h" +// #include "core/config/project_settings.h" #include "editor/editor_node.h" #include "editor/settings/editor_settings.h" diff --git a/modules/gltf/skin_tool.h b/modules/gltf/skin_tool.h index 2e9d96fa4a2..a95c8b99949 100644 --- a/modules/gltf/skin_tool.h +++ b/modules/gltf/skin_tool.h @@ -31,7 +31,6 @@ #pragma once #include "gltf_defines.h" - #include "structures/gltf_node.h" #include "structures/gltf_skeleton.h" #include "structures/gltf_skin.h" diff --git a/modules/gltf/structures/gltf_accessor.h b/modules/gltf/structures/gltf_accessor.h index c20e13343d8..9dcb7e60853 100644 --- a/modules/gltf/structures/gltf_accessor.h +++ b/modules/gltf/structures/gltf_accessor.h @@ -31,7 +31,6 @@ #pragma once #include "../gltf_defines.h" - #include "gltf_buffer_view.h" class GLTFAccessor : public Resource { diff --git a/modules/gltf/structures/gltf_object_model_property.h b/modules/gltf/structures/gltf_object_model_property.h index 04162650f68..da6aa45064d 100644 --- a/modules/gltf/structures/gltf_object_model_property.h +++ b/modules/gltf/structures/gltf_object_model_property.h @@ -30,9 +30,10 @@ #pragma once +#include "gltf_accessor.h" + #include "core/math/expression.h" #include "core/variant/typed_array.h" -#include "gltf_accessor.h" // Object model: https://github.com/KhronosGroup/glTF/blob/main/specification/2.0/ObjectModel.adoc // KHR_animation_pointer: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_animation_pointer diff --git a/modules/gltf/tests/test_gltf.h b/modules/gltf/tests/test_gltf.h index e89a4a7a53b..9b28f9f30e0 100644 --- a/modules/gltf/tests/test_gltf.h +++ b/modules/gltf/tests/test_gltf.h @@ -34,6 +34,10 @@ #ifdef TOOLS_ENABLED +#include "../editor/editor_scene_importer_gltf.h" +#include "../gltf_document.h" +#include "../gltf_state.h" + #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/object/class_db.h" @@ -43,10 +47,6 @@ #include "scene/resources/packed_scene.h" #include "tests/test_utils.h" -#include "modules/gltf/editor/editor_scene_importer_gltf.h" -#include "modules/gltf/gltf_document.h" -#include "modules/gltf/gltf_state.h" - namespace TestGltf { static Node *gltf_import(const String &p_file) { diff --git a/modules/godot_physics_2d/godot_area_2d.cpp b/modules/godot_physics_2d/godot_area_2d.cpp index d6c786706c2..bd67a8e99ee 100644 --- a/modules/godot_physics_2d/godot_area_2d.cpp +++ b/modules/godot_physics_2d/godot_area_2d.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "godot_area_2d.h" + #include "godot_body_2d.h" #include "godot_space_2d.h" diff --git a/modules/godot_physics_2d/godot_area_pair_2d.cpp b/modules/godot_physics_2d/godot_area_pair_2d.cpp index ca12e30c292..d04842f79fd 100644 --- a/modules/godot_physics_2d/godot_area_pair_2d.cpp +++ b/modules/godot_physics_2d/godot_area_pair_2d.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "godot_area_pair_2d.h" + #include "godot_collision_solver_2d.h" bool GodotAreaPair2D::setup(real_t p_step) { diff --git a/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp index 59623a26673..02d23482cab 100644 --- a/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp +++ b/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "godot_broad_phase_2d_bvh.h" + #include "godot_collision_object_2d.h" GodotBroadPhase2D::ID GodotBroadPhase2DBVH::create(GodotCollisionObject2D *p_object, int p_subindex, const Rect2 &p_aabb, bool p_static) { diff --git a/modules/godot_physics_2d/godot_collision_solver_2d.cpp b/modules/godot_physics_2d/godot_collision_solver_2d.cpp index a1acbe9cf0e..637a0679aef 100644 --- a/modules/godot_physics_2d/godot_collision_solver_2d.cpp +++ b/modules/godot_physics_2d/godot_collision_solver_2d.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "godot_collision_solver_2d.h" + #include "godot_collision_solver_2d_sat.h" #define collision_solver sat_2d_calculate_penetration diff --git a/modules/godot_physics_2d/godot_space_2d.cpp b/modules/godot_physics_2d/godot_space_2d.cpp index dcd934fa4c4..1d7ce01cb09 100644 --- a/modules/godot_physics_2d/godot_space_2d.cpp +++ b/modules/godot_physics_2d/godot_space_2d.cpp @@ -30,12 +30,12 @@ #include "godot_space_2d.h" +#include "godot_area_pair_2d.h" +#include "godot_body_pair_2d.h" #include "godot_collision_solver_2d.h" #include "godot_physics_server_2d.h" #include "core/config/project_settings.h" -#include "godot_area_pair_2d.h" -#include "godot_body_pair_2d.h" #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05 diff --git a/modules/godot_physics_2d/godot_step_2d.cpp b/modules/godot_physics_2d/godot_step_2d.cpp index 8bdaed386f5..d68f81a1a0b 100644 --- a/modules/godot_physics_2d/godot_step_2d.cpp +++ b/modules/godot_physics_2d/godot_step_2d.cpp @@ -30,9 +30,10 @@ #include "godot_step_2d.h" +#include "godot_constraint_2d.h" + #include "core/object/worker_thread_pool.h" #include "core/os/os.h" -#include "godot_constraint_2d.h" #define BODY_ISLAND_COUNT_RESERVE 128 #define BODY_ISLAND_SIZE_RESERVE 512 diff --git a/modules/godot_physics_2d/register_types.cpp b/modules/godot_physics_2d/register_types.cpp index 80094fdb7b7..830f0d5c26d 100644 --- a/modules/godot_physics_2d/register_types.cpp +++ b/modules/godot_physics_2d/register_types.cpp @@ -30,9 +30,10 @@ #include "register_types.h" +#include "godot_physics_server_2d.h" + #include "core/config/project_settings.h" #include "core/object/callable_mp.h" -#include "godot_physics_server_2d.h" #include "servers/physics_2d/physics_server_2d.h" #include "servers/physics_2d/physics_server_2d_wrap_mt.h" diff --git a/modules/godot_physics_3d/godot_collision_solver_3d.cpp b/modules/godot_physics_3d/godot_collision_solver_3d.cpp index 071ae66a8a5..fd62f6188d3 100644 --- a/modules/godot_physics_3d/godot_collision_solver_3d.cpp +++ b/modules/godot_physics_3d/godot_collision_solver_3d.cpp @@ -30,11 +30,10 @@ #include "godot_collision_solver_3d.h" +#include "gjk_epa.h" #include "godot_collision_solver_3d_sat.h" #include "godot_soft_body_3d.h" -#include "gjk_epa.h" - #define collision_solver sat_calculate_penetration //#define collision_solver gjk_epa_calculate_penetration diff --git a/modules/godot_physics_3d/godot_space_3d.cpp b/modules/godot_physics_3d/godot_space_3d.cpp index 9f7bd5c35f4..04c27626cee 100644 --- a/modules/godot_physics_3d/godot_space_3d.cpp +++ b/modules/godot_physics_3d/godot_space_3d.cpp @@ -30,12 +30,12 @@ #include "godot_space_3d.h" +#include "godot_area_pair_3d.h" +#include "godot_body_pair_3d.h" #include "godot_collision_solver_3d.h" #include "godot_physics_server_3d.h" #include "core/config/project_settings.h" -#include "godot_area_pair_3d.h" -#include "godot_body_pair_3d.h" #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05 diff --git a/modules/interactive_music/register_types.cpp b/modules/interactive_music/register_types.cpp index 6175ea6493f..91dbd2fb8f7 100644 --- a/modules/interactive_music/register_types.cpp +++ b/modules/interactive_music/register_types.cpp @@ -33,6 +33,7 @@ #include "audio_stream_interactive.h" #include "audio_stream_playlist.h" #include "audio_stream_synchronized.h" + #include "core/object/class_db.h" #ifdef TOOLS_ENABLED diff --git a/modules/jpg/movie_writer_mjpeg.cpp b/modules/jpg/movie_writer_mjpeg.cpp index 0114c13455f..fdd90c03571 100644 --- a/modules/jpg/movie_writer_mjpeg.cpp +++ b/modules/jpg/movie_writer_mjpeg.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "movie_writer_mjpeg.h" + #include "core/config/project_settings.h" #include "core/io/file_access.h" diff --git a/modules/jsonrpc/tests/test_jsonrpc.h b/modules/jsonrpc/tests/test_jsonrpc.h index 3732596bee9..b334d19423b 100644 --- a/modules/jsonrpc/tests/test_jsonrpc.h +++ b/modules/jsonrpc/tests/test_jsonrpc.h @@ -30,12 +30,12 @@ #pragma once +#include "../jsonrpc.h" + #include "core/object/callable_mp.h" #include "tests/test_macros.h" #include "tests/test_utils.h" -#include "../jsonrpc.h" - namespace TestJSONRPC { void check_invalid(const Dictionary &p_dict); diff --git a/modules/mbedtls/tests/test_crypto_mbedtls.h b/modules/mbedtls/tests/test_crypto_mbedtls.h index 7d9e7949e52..ec0acefc234 100644 --- a/modules/mbedtls/tests/test_crypto_mbedtls.h +++ b/modules/mbedtls/tests/test_crypto_mbedtls.h @@ -31,7 +31,6 @@ #pragma once #include "core/crypto/hashing_context.h" - #include "tests/test_macros.h" #include "tests/test_utils.h" diff --git a/modules/mp3/register_types.cpp b/modules/mp3/register_types.cpp index fc84fb46dbc..a1593a697fe 100644 --- a/modules/mp3/register_types.cpp +++ b/modules/mp3/register_types.cpp @@ -35,9 +35,10 @@ #include "core/object/class_db.h" #ifdef TOOLS_ENABLED -#include "editor/editor_node.h" #include "resource_importer_mp3.h" +#include "editor/editor_node.h" + static void _editor_init() { Ref mp3_import; mp3_import.instantiate(); diff --git a/modules/multiplayer/tests/test_multiplayer_spawner.h b/modules/multiplayer/tests/test_multiplayer_spawner.h index 0692a8677e0..d1303a0c9fd 100644 --- a/modules/multiplayer/tests/test_multiplayer_spawner.h +++ b/modules/multiplayer/tests/test_multiplayer_spawner.h @@ -30,14 +30,14 @@ #pragma once +#include "../multiplayer_spawner.h" + #include "core/object/class_db.h" #include "scene/main/scene_tree.h" #include "scene/main/window.h" #include "tests/test_macros.h" #include "tests/test_utils.h" -#include "../multiplayer_spawner.h" - namespace TestMultiplayerSpawner { class Wasp : public Node { GDCLASS(Wasp, Node); diff --git a/modules/multiplayer/tests/test_scene_multiplayer.h b/modules/multiplayer/tests/test_scene_multiplayer.h index 06617b349f2..c4d4a2e1315 100644 --- a/modules/multiplayer/tests/test_scene_multiplayer.h +++ b/modules/multiplayer/tests/test_scene_multiplayer.h @@ -30,6 +30,8 @@ #pragma once +#include "../scene_multiplayer.h" + #include "core/object/callable_mp.h" #include "core/os/os.h" #include "scene/2d/node_2d.h" @@ -38,8 +40,6 @@ #include "tests/test_macros.h" #include "tests/test_utils.h" -#include "../scene_multiplayer.h" - namespace TestSceneMultiplayer { TEST_CASE("[Multiplayer][SceneMultiplayer] Defaults") { Ref scene_multiplayer; diff --git a/modules/navigation_2d/2d/godot_navigation_server_2d.cpp b/modules/navigation_2d/2d/godot_navigation_server_2d.cpp index 830bba66b1f..8ab4bfba201 100644 --- a/modules/navigation_2d/2d/godot_navigation_server_2d.cpp +++ b/modules/navigation_2d/2d/godot_navigation_server_2d.cpp @@ -32,6 +32,7 @@ #include "core/os/mutex.h" #include "scene/main/node.h" + #include #ifdef CLIPPER2_ENABLED diff --git a/modules/navigation_2d/2d/nav_mesh_queries_2d.h b/modules/navigation_2d/2d/nav_mesh_queries_2d.h index 22fc6e9baec..3de361cd5b2 100644 --- a/modules/navigation_2d/2d/nav_mesh_queries_2d.h +++ b/modules/navigation_2d/2d/nav_mesh_queries_2d.h @@ -33,7 +33,6 @@ #include "../nav_utils_2d.h" #include "core/templates/a_hash_map.h" - #include "servers/nav_heap.h" #include "servers/navigation_2d/navigation_constants_2d.h" #include "servers/navigation_2d/navigation_path_query_parameters_2d.h" diff --git a/modules/navigation_2d/nav_link_2d.h b/modules/navigation_2d/nav_link_2d.h index ea1bf0bed64..27292a9a7ac 100644 --- a/modules/navigation_2d/nav_link_2d.h +++ b/modules/navigation_2d/nav_link_2d.h @@ -31,10 +31,11 @@ #pragma once #include "2d/nav_base_iteration_2d.h" -#include "core/os/rw_lock.h" #include "nav_base_2d.h" #include "nav_utils_2d.h" +#include "core/os/rw_lock.h" + class NavLinkIteration2D : public NavBaseIteration2D { GDCLASS(NavLinkIteration2D, NavBaseIteration2D); diff --git a/modules/navigation_2d/nav_region_2d.cpp b/modules/navigation_2d/nav_region_2d.cpp index e5c61426934..3b59082c5a4 100644 --- a/modules/navigation_2d/nav_region_2d.cpp +++ b/modules/navigation_2d/nav_region_2d.cpp @@ -30,11 +30,11 @@ #include "nav_region_2d.h" -#include "nav_map_2d.h" - #include "2d/nav_mesh_queries_2d.h" #include "2d/nav_region_builder_2d.h" #include "2d/nav_region_iteration_2d.h" +#include "nav_map_2d.h" + #include "core/config/project_settings.h" using namespace Nav2D; diff --git a/modules/navigation_2d/nav_region_2d.h b/modules/navigation_2d/nav_region_2d.h index f30b9756a69..88a93a3754e 100644 --- a/modules/navigation_2d/nav_region_2d.h +++ b/modules/navigation_2d/nav_region_2d.h @@ -30,14 +30,13 @@ #pragma once +#include "2d/nav_region_iteration_2d.h" #include "nav_base_2d.h" #include "nav_utils_2d.h" #include "core/os/rw_lock.h" #include "scene/resources/2d/navigation_polygon.h" -#include "2d/nav_region_iteration_2d.h" - class NavRegion2D : public NavBase2D { RWLock region_rwlock; diff --git a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp index b675db7a02d..c2186d89f8c 100644 --- a/modules/navigation_3d/3d/godot_navigation_server_3d.cpp +++ b/modules/navigation_3d/3d/godot_navigation_server_3d.cpp @@ -30,11 +30,11 @@ #include "godot_navigation_server_3d.h" +#include "nav_mesh_generator_3d.h" + #include "core/os/mutex.h" #include "scene/main/node.h" -#include "nav_mesh_generator_3d.h" - using namespace NavigationDefaults3D; /// Creates a struct for each function and a function that once called creates diff --git a/modules/navigation_3d/3d/nav_mesh_queries_3d.h b/modules/navigation_3d/3d/nav_mesh_queries_3d.h index af18db86a80..20d3898e871 100644 --- a/modules/navigation_3d/3d/nav_mesh_queries_3d.h +++ b/modules/navigation_3d/3d/nav_mesh_queries_3d.h @@ -33,7 +33,6 @@ #include "../nav_utils_3d.h" #include "core/templates/a_hash_map.h" - #include "servers/nav_heap.h" #include "servers/navigation_3d/navigation_constants_3d.h" #include "servers/navigation_3d/navigation_path_query_parameters_3d.h" diff --git a/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h b/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h index d1a38a38308..da912c78ace 100644 --- a/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h +++ b/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h @@ -30,10 +30,10 @@ #pragma once -#include "editor/plugins/editor_plugin.h" - #include "navigation_link_3d_gizmo_plugin.h" +#include "editor/plugins/editor_plugin.h" + class NavigationLink3DEditorPlugin : public EditorPlugin { GDCLASS(NavigationLink3DEditorPlugin, EditorPlugin); diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h index e6f6f581844..78a2661106e 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h @@ -30,10 +30,10 @@ #pragma once -#include "editor/plugins/editor_plugin.h" - #include "navigation_region_3d_gizmo_plugin.h" +#include "editor/plugins/editor_plugin.h" + class AcceptDialog; class Button; class ConfirmationDialog; diff --git a/modules/navigation_3d/nav_link_3d.h b/modules/navigation_3d/nav_link_3d.h index 27c654322c8..67544c1627e 100644 --- a/modules/navigation_3d/nav_link_3d.h +++ b/modules/navigation_3d/nav_link_3d.h @@ -31,10 +31,11 @@ #pragma once #include "3d/nav_base_iteration_3d.h" -#include "core/os/rw_lock.h" #include "nav_base_3d.h" #include "nav_utils_3d.h" +#include "core/os/rw_lock.h" + class NavLinkIteration3D : public NavBaseIteration3D { GDCLASS(NavLinkIteration3D, NavBaseIteration3D); diff --git a/modules/navigation_3d/nav_region_3d.cpp b/modules/navigation_3d/nav_region_3d.cpp index f4c2a46eb9b..60edc7d358c 100644 --- a/modules/navigation_3d/nav_region_3d.cpp +++ b/modules/navigation_3d/nav_region_3d.cpp @@ -30,11 +30,11 @@ #include "nav_region_3d.h" -#include "nav_map_3d.h" - #include "3d/nav_mesh_queries_3d.h" #include "3d/nav_region_builder_3d.h" #include "3d/nav_region_iteration_3d.h" +#include "nav_map_3d.h" + #include "core/config/project_settings.h" using namespace Nav3D; diff --git a/modules/navigation_3d/nav_region_3d.h b/modules/navigation_3d/nav_region_3d.h index 756aefc4b3f..1490f30230b 100644 --- a/modules/navigation_3d/nav_region_3d.h +++ b/modules/navigation_3d/nav_region_3d.h @@ -30,14 +30,13 @@ #pragma once +#include "3d/nav_region_iteration_3d.h" #include "nav_base_3d.h" #include "nav_utils_3d.h" #include "core/os/rw_lock.h" #include "scene/resources/navigation_mesh.h" -#include "3d/nav_region_iteration_3d.h" - class NavRegion3D : public NavBase3D { RWLock region_rwlock; diff --git a/modules/openxr/action_map/openxr_action.cpp b/modules/openxr/action_map/openxr_action.cpp index 313113ec337..64ab7f1e818 100644 --- a/modules/openxr/action_map/openxr_action.cpp +++ b/modules/openxr/action_map/openxr_action.cpp @@ -30,9 +30,10 @@ #include "openxr_action.h" -#include "core/object/class_db.h" #include "openxr_action_set.h" +#include "core/object/class_db.h" + void OpenXRAction::_bind_methods() { ClassDB::bind_method(D_METHOD("set_localized_name", "localized_name"), &OpenXRAction::set_localized_name); ClassDB::bind_method(D_METHOD("get_localized_name"), &OpenXRAction::get_localized_name); diff --git a/modules/openxr/action_map/openxr_haptic_feedback.h b/modules/openxr/action_map/openxr_haptic_feedback.h index af5760b48c3..7e1db4b2667 100644 --- a/modules/openxr/action_map/openxr_haptic_feedback.h +++ b/modules/openxr/action_map/openxr_haptic_feedback.h @@ -31,6 +31,7 @@ #pragma once #include "core/io/resource.h" + #include class OpenXRHapticBase : public Resource { diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp index 1dec62d17f9..b7770ea9fe6 100644 --- a/modules/openxr/editor/openxr_action_set_editor.cpp +++ b/modules/openxr/editor/openxr_action_set_editor.cpp @@ -30,12 +30,13 @@ #include "openxr_action_set_editor.h" +#include "openxr_action_editor.h" + #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_string_names.h" #include "editor/gui/editor_spin_slider.h" #include "editor/themes/editor_scale.h" -#include "openxr_action_editor.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/line_edit.h" diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp index 28615e16180..8374a6d25be 100644 --- a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp +++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "openxr_binding_modifiers_dialog.h" + #include "../action_map/openxr_interaction_profile_metadata.h" #include "openxr_action_map_editor.h" diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.h b/modules/openxr/editor/openxr_binding_modifiers_dialog.h index b13bea2d19d..871920e99bd 100644 --- a/modules/openxr/editor/openxr_binding_modifiers_dialog.h +++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.h @@ -32,7 +32,8 @@ #include "../action_map/openxr_action_map.h" #include "../action_map/openxr_interaction_profile.h" -#include "../editor/openxr_binding_modifier_editor.h" +#include "openxr_binding_modifier_editor.h" + #include "editor/editor_undo_redo_manager.h" #include "editor/gui/create_dialog.h" #include "scene/gui/box_container.h" diff --git a/modules/openxr/editor/openxr_editor_plugin.cpp b/modules/openxr/editor/openxr_editor_plugin.cpp index 4fc9c733c4c..85444631b30 100644 --- a/modules/openxr/editor/openxr_editor_plugin.cpp +++ b/modules/openxr/editor/openxr_editor_plugin.cpp @@ -35,6 +35,7 @@ #include "editor/docks/editor_dock_manager.h" #include "editor/editor_node.h" + #include "platform/android/export/export_plugin.h" #include diff --git a/modules/openxr/editor/openxr_interaction_profile_editor.h b/modules/openxr/editor/openxr_interaction_profile_editor.h index e2b00add2ad..752dc8d2831 100644 --- a/modules/openxr/editor/openxr_interaction_profile_editor.h +++ b/modules/openxr/editor/openxr_interaction_profile_editor.h @@ -33,9 +33,10 @@ #include "../action_map/openxr_action_map.h" #include "../action_map/openxr_interaction_profile.h" #include "../action_map/openxr_interaction_profile_metadata.h" -#include "../editor/openxr_binding_modifiers_dialog.h" -#include "editor/editor_undo_redo_manager.h" +#include "openxr_binding_modifiers_dialog.h" #include "openxr_select_action_dialog.h" + +#include "editor/editor_undo_redo_manager.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp index df53c46826d..654027bf01f 100644 --- a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp +++ b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp @@ -37,6 +37,7 @@ #ifdef XR_USE_PLATFORM_ANDROID #include "../openxr_api.h" + #include #endif diff --git a/modules/openxr/extensions/openxr_android_thread_settings_extension.h b/modules/openxr/extensions/openxr_android_thread_settings_extension.h index e825bddcab2..f05c40d6b1f 100644 --- a/modules/openxr/extensions/openxr_android_thread_settings_extension.h +++ b/modules/openxr/extensions/openxr_android_thread_settings_extension.h @@ -30,12 +30,13 @@ #pragma once -#include "core/templates/hash_map.h" - #include "openxr_extension_wrapper.h" +#include "core/templates/hash_map.h" + #ifdef XR_USE_PLATFORM_ANDROID #include "../util.h" + #include #include #endif diff --git a/modules/openxr/extensions/openxr_composition_layer_extension.cpp b/modules/openxr/extensions/openxr_composition_layer_extension.cpp index 78cab821021..6bcff216be0 100644 --- a/modules/openxr/extensions/openxr_composition_layer_extension.cpp +++ b/modules/openxr/extensions/openxr_composition_layer_extension.cpp @@ -33,11 +33,12 @@ #include "openxr_fb_update_swapchain_extension.h" #include "core/object/callable_mp.h" -#include "platform/android/api/java_class_wrapper.h" #include "servers/rendering/rendering_server.h" #include "servers/rendering/rendering_server_globals.h" #include "servers/xr/xr_server.h" +#include "platform/android/api/java_class_wrapper.h" + #ifdef ANDROID_ENABLED #include #include diff --git a/modules/openxr/extensions/openxr_composition_layer_extension.h b/modules/openxr/extensions/openxr_composition_layer_extension.h index 1130baf298f..22b12ae7d79 100644 --- a/modules/openxr/extensions/openxr_composition_layer_extension.h +++ b/modules/openxr/extensions/openxr_composition_layer_extension.h @@ -30,9 +30,8 @@ #pragma once -#include "openxr_extension_wrapper.h" - #include "../openxr_api.h" +#include "openxr_extension_wrapper.h" #ifdef ANDROID_ENABLED #include diff --git a/modules/openxr/extensions/openxr_debug_utils_extension.cpp b/modules/openxr/extensions/openxr_debug_utils_extension.cpp index 9aeaa12d697..de2f6a7873e 100644 --- a/modules/openxr/extensions/openxr_debug_utils_extension.cpp +++ b/modules/openxr/extensions/openxr_debug_utils_extension.cpp @@ -31,6 +31,7 @@ #include "openxr_debug_utils_extension.h" #include "../openxr_api.h" + #include "core/config/project_settings.h" #include "core/string/print_string.h" diff --git a/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp b/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp index 402ac95d551..151e1989117 100644 --- a/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp +++ b/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp @@ -30,12 +30,12 @@ #include "openxr_eye_gaze_interaction.h" -#include "core/config/project_settings.h" -#include "core/os/os.h" - #include "../action_map/openxr_interaction_profile_metadata.h" #include "../openxr_api.h" +#include "core/config/project_settings.h" +#include "core/os/os.h" + OpenXREyeGazeInteractionExtension *OpenXREyeGazeInteractionExtension::singleton = nullptr; OpenXREyeGazeInteractionExtension *OpenXREyeGazeInteractionExtension::get_singleton() { diff --git a/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp b/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp index fc229cbe0bd..d1d8aa049da 100644 --- a/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp +++ b/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "openxr_fb_display_refresh_rate_extension.h" + #include "../openxr_interface.h" OpenXRDisplayRefreshRateExtension *OpenXRDisplayRefreshRateExtension::singleton = nullptr; diff --git a/modules/openxr/extensions/openxr_future_extension.h b/modules/openxr/extensions/openxr_future_extension.h index dfb434b830c..cbb47d31b70 100644 --- a/modules/openxr/extensions/openxr_future_extension.h +++ b/modules/openxr/extensions/openxr_future_extension.h @@ -46,9 +46,10 @@ */ #include "../util.h" -#include "core/object/ref_counted.h" #include "openxr_extension_wrapper.h" +#include "core/object/ref_counted.h" + #include class OpenXRFutureExtension; diff --git a/modules/openxr/extensions/openxr_hand_interaction_extension.cpp b/modules/openxr/extensions/openxr_hand_interaction_extension.cpp index a0d30097687..499c28b026f 100644 --- a/modules/openxr/extensions/openxr_hand_interaction_extension.cpp +++ b/modules/openxr/extensions/openxr_hand_interaction_extension.cpp @@ -32,6 +32,7 @@ #include "../action_map/openxr_interaction_profile_metadata.h" #include "../openxr_api.h" + #include "core/config/project_settings.h" #include diff --git a/modules/openxr/extensions/openxr_hand_tracking_extension.h b/modules/openxr/extensions/openxr_hand_tracking_extension.h index 7a301b384aa..3dd2e00f187 100644 --- a/modules/openxr/extensions/openxr_hand_tracking_extension.h +++ b/modules/openxr/extensions/openxr_hand_tracking_extension.h @@ -31,8 +31,9 @@ #pragma once #include "../util.h" -#include "core/math/quaternion.h" #include "openxr_extension_wrapper.h" + +#include "core/math/quaternion.h" #include "servers/xr/xr_hand_tracker.h" class OpenXRHandTrackingExtension : public OpenXRExtensionWrapper { diff --git a/modules/openxr/extensions/openxr_render_model_extension.h b/modules/openxr/extensions/openxr_render_model_extension.h index c164ae12d74..35b147361c1 100644 --- a/modules/openxr/extensions/openxr_render_model_extension.h +++ b/modules/openxr/extensions/openxr_render_model_extension.h @@ -35,12 +35,14 @@ #ifdef MODULE_GLTF_ENABLED #include "../openxr_uuid.h" #include "../util.h" -#include "core/templates/rid_owner.h" -#include "modules/gltf/gltf_document.h" #include "openxr_extension_wrapper.h" + +#include "core/templates/rid_owner.h" #include "scene/3d/node_3d.h" #include "servers/xr/xr_pose.h" +#include "modules/gltf/gltf_document.h" + #include class OpenXRRenderModelData : public RefCounted { diff --git a/modules/openxr/extensions/openxr_user_presence_extension.cpp b/modules/openxr/extensions/openxr_user_presence_extension.cpp index 6b7097e6171..226ff0f31fe 100644 --- a/modules/openxr/extensions/openxr_user_presence_extension.cpp +++ b/modules/openxr/extensions/openxr_user_presence_extension.cpp @@ -31,6 +31,7 @@ #include "openxr_user_presence_extension.h" #include "../openxr_interface.h" + #include "core/config/project_settings.h" OpenXRUserPresenceExtension *OpenXRUserPresenceExtension::singleton = nullptr; diff --git a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp index 8f921ef7452..ac3e4673f4e 100644 --- a/modules/openxr/extensions/openxr_visibility_mask_extension.cpp +++ b/modules/openxr/extensions/openxr_visibility_mask_extension.cpp @@ -31,6 +31,7 @@ #include "openxr_visibility_mask_extension.h" #include "../openxr_api.h" + #include "core/string/print_string.h" #include "core/variant/array.h" #include "core/variant/variant.h" diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp index 357453adb58..8b7765a680c 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp @@ -32,9 +32,9 @@ #include "../../openxr_api.h" #include "../../openxr_util.h" +#include "openxr_spatial_entity_extension.h" #include "core/object/class_db.h" -#include "openxr_spatial_entity_extension.h" #include diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp index c881eadc823..9c87a683d7c 100644 --- a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp +++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp @@ -31,11 +31,11 @@ #include "openxr_spatial_marker_tracking.h" #include "../../openxr_api.h" +#include "openxr_spatial_entity_extension.h" #include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" -#include "openxr_spatial_entity_extension.h" #include "servers/xr/xr_server.h" //////////////////////////////////////////////////////////////////////////// diff --git a/modules/openxr/openxr_api_extension.compat.inc b/modules/openxr/openxr_api_extension.compat.inc index 129f53a9c69..3ebbda64461 100644 --- a/modules/openxr/openxr_api_extension.compat.inc +++ b/modules/openxr/openxr_api_extension.compat.inc @@ -30,10 +30,10 @@ #ifndef DISABLE_DEPRECATED +#include "extensions/openxr_extension_wrapper_extension.h" #include "openxr_api_extension.h" #include "core/object/class_db.h" -#include "extensions/openxr_extension_wrapper_extension.h" void OpenXRAPIExtension::_register_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) { register_composition_layer_provider(p_extension); diff --git a/modules/openxr/register_types.cpp b/modules/openxr/register_types.cpp index 22d2809803f..068bb236ca2 100644 --- a/modules/openxr/register_types.cpp +++ b/modules/openxr/register_types.cpp @@ -30,33 +30,28 @@ #include "register_types.h" -#include "modules/modules_enabled.gen.h" - #include "action_map/openxr_action.h" #include "action_map/openxr_action_map.h" #include "action_map/openxr_action_set.h" #include "action_map/openxr_haptic_feedback.h" #include "action_map/openxr_interaction_profile.h" #include "action_map/openxr_interaction_profile_metadata.h" -#include "core/object/class_db.h" #include "openxr_api_extension.h" #include "openxr_interface.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" +#include "core/object/class_db.h" +#include "core/os/os.h" + +#include "modules/modules_enabled.gen.h" + #ifndef DISABLE_DEPRECATED #include "extensions/openxr_extension_wrapper_extension.h" + #include "scene/openxr_hand.h" #endif // DISABLE_DEPRECATED -#include "scene/openxr_composition_layer.h" -#include "scene/openxr_composition_layer_cylinder.h" -#include "scene/openxr_composition_layer_equirect.h" -#include "scene/openxr_composition_layer_quad.h" -#ifdef MODULE_GLTF_ENABLED -#include "scene/openxr_render_model.h" -#include "scene/openxr_render_model_manager.h" -#endif -#include "scene/openxr_visibility_mask.h" - #include "extensions/openxr_android_thread_settings_extension.h" #include "extensions/openxr_composition_layer_depth_extension.h" #include "extensions/openxr_composition_layer_extension.h" @@ -79,20 +74,29 @@ #include "extensions/openxr_palm_pose_extension.h" #include "extensions/openxr_performance_settings_extension.h" #include "extensions/openxr_pico_controller_extension.h" -#ifdef MODULE_GLTF_ENABLED -#include "extensions/openxr_render_model_extension.h" -#endif #include "extensions/openxr_user_presence_extension.h" #include "extensions/openxr_valve_analog_threshold_extension.h" #include "extensions/openxr_valve_controller_extension.h" #include "extensions/openxr_visibility_mask_extension.h" #include "extensions/openxr_wmr_controller_extension.h" -#include "extensions/spatial_entities/openxr_spatial_entity_extension.h" - #include "extensions/spatial_entities/openxr_spatial_anchor.h" +#include "extensions/spatial_entities/openxr_spatial_entity_extension.h" #include "extensions/spatial_entities/openxr_spatial_marker_tracking.h" #include "extensions/spatial_entities/openxr_spatial_plane_tracking.h" +#include "scene/openxr_composition_layer.h" +#include "scene/openxr_composition_layer_cylinder.h" +#include "scene/openxr_composition_layer_equirect.h" +#include "scene/openxr_composition_layer_quad.h" +#include "scene/openxr_visibility_mask.h" + +#ifdef MODULE_GLTF_ENABLED +#include "extensions/openxr_render_model_extension.h" + +#include "scene/openxr_render_model.h" +#include "scene/openxr_render_model_manager.h" +#endif + #ifdef TOOLS_ENABLED #include "editor/openxr_editor_plugin.h" #endif @@ -101,16 +105,11 @@ #include "extensions/platform/openxr_android_extension.h" #endif -#include "core/config/engine.h" -#include "core/config/project_settings.h" -#include "core/os/os.h" - #ifdef TOOLS_ENABLED -#include "editor/editor_node.h" - #include "editor/openxr_binding_modifier_editor.h" #include "editor/openxr_interaction_profile_editor.h" - +// +#include "editor/editor_node.h" #endif static OpenXRAPI *openxr_api = nullptr; diff --git a/modules/openxr/scene/openxr_composition_layer.h b/modules/openxr/scene/openxr_composition_layer.h index f0f9628be3d..b4ea026d791 100644 --- a/modules/openxr/scene/openxr_composition_layer.h +++ b/modules/openxr/scene/openxr_composition_layer.h @@ -30,10 +30,10 @@ #pragma once -#include - #include "scene/3d/node_3d.h" +#include + class JavaObject; class MeshInstance3D; class Mesh; diff --git a/modules/openxr/scene/openxr_composition_layer_cylinder.h b/modules/openxr/scene/openxr_composition_layer_cylinder.h index a0d8c94add6..c8b256ba81a 100644 --- a/modules/openxr/scene/openxr_composition_layer_cylinder.h +++ b/modules/openxr/scene/openxr_composition_layer_cylinder.h @@ -30,10 +30,10 @@ #pragma once -#include - #include "openxr_composition_layer.h" +#include + class OpenXRCompositionLayerCylinder : public OpenXRCompositionLayer { GDCLASS(OpenXRCompositionLayerCylinder, OpenXRCompositionLayer); diff --git a/modules/openxr/scene/openxr_composition_layer_equirect.h b/modules/openxr/scene/openxr_composition_layer_equirect.h index 059ff457c79..93171046e0d 100644 --- a/modules/openxr/scene/openxr_composition_layer_equirect.h +++ b/modules/openxr/scene/openxr_composition_layer_equirect.h @@ -30,10 +30,10 @@ #pragma once -#include - #include "openxr_composition_layer.h" +#include + class OpenXRCompositionLayerEquirect : public OpenXRCompositionLayer { GDCLASS(OpenXRCompositionLayerEquirect, OpenXRCompositionLayer); diff --git a/modules/openxr/scene/openxr_composition_layer_quad.h b/modules/openxr/scene/openxr_composition_layer_quad.h index aebddae383b..ffebeea87fb 100644 --- a/modules/openxr/scene/openxr_composition_layer_quad.h +++ b/modules/openxr/scene/openxr_composition_layer_quad.h @@ -30,10 +30,10 @@ #pragma once -#include - #include "openxr_composition_layer.h" +#include + class OpenXRCompositionLayerQuad : public OpenXRCompositionLayer { GDCLASS(OpenXRCompositionLayerQuad, OpenXRCompositionLayer); diff --git a/modules/regex/tests/test_regex.h b/modules/regex/tests/test_regex.h index eb08eab9d45..dfd530c66ec 100644 --- a/modules/regex/tests/test_regex.h +++ b/modules/regex/tests/test_regex.h @@ -33,7 +33,6 @@ #include "../regex.h" #include "core/string/ustring.h" - #include "tests/test_macros.h" namespace TestRegEx { diff --git a/modules/text_server_adv/script_iterator.h b/modules/text_server_adv/script_iterator.h index 8c334a2b6a6..7528b407089 100644 --- a/modules/text_server_adv/script_iterator.h +++ b/modules/text_server_adv/script_iterator.h @@ -33,15 +33,14 @@ #include "core/string/ustring.h" #include "core/templates/vector.h" +#include +#include #include #include #include #include #include -#include -#include - class ScriptIterator { static const int PAREN_STACK_DEPTH = 128; static const int EMOJI_STACK_DEPTH = 32; diff --git a/modules/theora/editor/movie_writer_ogv.cpp b/modules/theora/editor/movie_writer_ogv.cpp index cbba4a88c93..a062c619f36 100644 --- a/modules/theora/editor/movie_writer_ogv.cpp +++ b/modules/theora/editor/movie_writer_ogv.cpp @@ -30,9 +30,10 @@ #include "movie_writer_ogv.h" +#include "rgb2yuv.h" + #include "core/config/project_settings.h" #include "core/io/file_access.h" -#include "rgb2yuv.h" void MovieWriterOGV::push_audio(const int32_t *p_audio_data) { // Read and process more audio. diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 7ba54e5cf10..43aa48b8b85 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -30,12 +30,12 @@ #include "image_loader_tinyexr.h" -#include // Should come before including tinyexr. - -#include "thirdparty/tinyexr/tinyexr.h" - #include "core/io/file_access_memory.h" +#include +// zlib should come before including tinyexr. +#include + Error ImageLoaderTinyEXR::load_image(Ref p_image, Ref f, BitField p_flags, float p_scale) { Vector src_image; uint64_t src_image_len = f->get_length(); diff --git a/modules/tinyexr/image_saver_tinyexr.cpp b/modules/tinyexr/image_saver_tinyexr.cpp index c5c18409943..4c2c21a7bdc 100644 --- a/modules/tinyexr/image_saver_tinyexr.cpp +++ b/modules/tinyexr/image_saver_tinyexr.cpp @@ -33,10 +33,11 @@ #include "core/io/file_access.h" #include "core/math/math_funcs.h" -#include // Should come before including tinyexr. -#include +#include +// zlib should come before including tinyexr. +#include -#include "thirdparty/tinyexr/tinyexr.h" +#include static bool is_supported_format(Image::Format p_format) { // This is checked before anything else. diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index c85f89f2a1e..5355484c4b7 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -29,8 +29,8 @@ /**************************************************************************/ #include "audio_stream_ogg_vorbis.h" -#include "core/io/file_access.h" +#include "core/io/file_access.h" #include "core/object/class_db.h" #include "core/templates/rb_map.h" diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp index 5a8cbfe2604..12025b9a4da 100644 --- a/modules/vorbis/register_types.cpp +++ b/modules/vorbis/register_types.cpp @@ -35,9 +35,10 @@ #include "core/object/class_db.h" #ifdef TOOLS_ENABLED -#include "editor/editor_node.h" #include "resource_importer_ogg_vorbis.h" +#include "editor/editor_node.h" + static void _editor_init() { Ref ogg_vorbis_importer; ogg_vorbis_importer.instantiate(); diff --git a/modules/webxr/webxr_interface_js.cpp b/modules/webxr/webxr_interface_js.cpp index bc483e57319..11e89ebc220 100644 --- a/modules/webxr/webxr_interface_js.cpp +++ b/modules/webxr/webxr_interface_js.cpp @@ -44,6 +44,7 @@ #include "servers/xr/xr_hand_tracker.h" #include + #include void _emwebxr_on_session_supported(char *p_session_mode, int p_supported) { diff --git a/modules/zip/tests/test_zip.h b/modules/zip/tests/test_zip.h index 7f8376e6f81..8ae7139d036 100644 --- a/modules/zip/tests/test_zip.h +++ b/modules/zip/tests/test_zip.h @@ -30,12 +30,12 @@ #pragma once -#include "tests/test_macros.h" -#include "tests/test_utils.h" - #include "../zip_packer.h" #include "../zip_reader.h" +#include "tests/test_macros.h" +#include "tests/test_utils.h" + namespace TestZip { void check_file_size(const String &p_path, int p_expected_size); diff --git a/platform/android/android_input_handler.cpp b/platform/android/android_input_handler.cpp index 96b77e9eeb9..4c8b6bd60e1 100644 --- a/platform/android/android_input_handler.cpp +++ b/platform/android/android_input_handler.cpp @@ -30,11 +30,11 @@ #include "android_input_handler.h" -#include "core/input/input.h" - #include "android_keys_utils.h" #include "display_server_android.h" +#include "core/input/input.h" + void AndroidInputHandler::process_joy_event(AndroidInputHandler::JoypadEvent p_event) { switch (p_event.type) { case JOY_EVENT_BUTTON: diff --git a/platform/android/api/api.cpp b/platform/android/api/api.cpp index a5c7a2d272e..24d67bdbe63 100644 --- a/platform/android/api/api.cpp +++ b/platform/android/api/api.cpp @@ -30,7 +30,6 @@ #include "api.h" -#include "core/object/class_db.h" #include "java_class_wrapper.h" #include "jni_singleton.h" diff --git a/platform/android/export/android_editor_gradle_runner.cpp b/platform/android/export/android_editor_gradle_runner.cpp index 4f07f4c4729..965023c1bd4 100644 --- a/platform/android/export/android_editor_gradle_runner.cpp +++ b/platform/android/export/android_editor_gradle_runner.cpp @@ -31,15 +31,15 @@ #ifdef ANDROID_ENABLED #include "android_editor_gradle_runner.h" +#include "../java_godot_wrapper.h" +#include "../os_android.h" + #include "core/object/callable_mp.h" #include "editor/editor_interface.h" #include "editor/settings/editor_settings.h" #include "scene/gui/dialogs.h" #include "scene/gui/rich_text_label.h" -#include "../java_godot_wrapper.h" -#include "../os_android.h" - void AndroidEditorGradleRunner::run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const String &p_export_format, const List &p_gradle_build_args, const List &p_gradle_copy_args) { project_path = p_project_path; build_path = p_build_path; diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp index 42bfe6dd554..a953c1a6a12 100644 --- a/platform/android/export/gradle_export_util.cpp +++ b/platform/android/export/gradle_export_util.cpp @@ -36,6 +36,7 @@ #include "core/string/translation_server.h" #include "editor/export/editor_export.h" #include "editor/export/editor_export_plugin.h" + #include "modules/regex/regex.h" int _get_android_orientation_value(DisplayServerEnums::ScreenOrientation screen_orientation) { diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index c57206ce8c5..23afb52c1b1 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -30,9 +30,10 @@ #include "file_access_android.h" -#include "core/string/print_string.h" #include "thread_jandroid.h" +#include "core/string/print_string.h" + #include AAssetManager *FileAccessAndroid::asset_manager = nullptr; diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index e15f89c2038..f46c3dabdf4 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -52,9 +52,8 @@ #include "core/os/os.h" #include "core/profiling/profiling.h" #include "main/main.h" -#include "servers/rendering/rendering_server.h" - #include "servers/camera/camera_server.h" +#include "servers/rendering/rendering_server.h" #ifndef XR_DISABLED #include "servers/xr/xr_server.h" diff --git a/platform/ios/main_ios.mm b/platform/ios/main_ios.mm index dab9e8804bb..7d61b8a375d 100644 --- a/platform/ios/main_ios.mm +++ b/platform/ios/main_ios.mm @@ -36,6 +36,7 @@ #include "main/main.h" #import + #include static OS_IOS *os = nullptr; diff --git a/platform/linuxbsd/crash_handler_linuxbsd.cpp b/platform/linuxbsd/crash_handler_linuxbsd.cpp index 6a81926765c..610225cfa44 100644 --- a/platform/linuxbsd/crash_handler_linuxbsd.cpp +++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp @@ -48,6 +48,7 @@ #include #include #include + #include #include #include diff --git a/platform/linuxbsd/godot_linuxbsd.cpp b/platform/linuxbsd/godot_linuxbsd.cpp index 84d8387012b..d96c940e8b8 100644 --- a/platform/linuxbsd/godot_linuxbsd.cpp +++ b/platform/linuxbsd/godot_linuxbsd.cpp @@ -34,6 +34,7 @@ #include "main/main.h" #include + #include #include #include diff --git a/platform/linuxbsd/libgodot_linuxbsd.cpp b/platform/linuxbsd/libgodot_linuxbsd.cpp index 6ae9d4c5c71..a5434a652a6 100644 --- a/platform/linuxbsd/libgodot_linuxbsd.cpp +++ b/platform/linuxbsd/libgodot_linuxbsd.cpp @@ -28,13 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "core/extension/libgodot.h" +#include "os_linuxbsd.h" #include "core/extension/godot_instance.h" +#include "core/extension/libgodot.h" #include "main/main.h" -#include "os_linuxbsd.h" - static OS_LinuxBSD *os = nullptr; static GodotInstance *instance = nullptr; diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 6c3f7b31dfb..43d7129579d 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -80,6 +80,7 @@ #include #include #include + #include #include diff --git a/platform/linuxbsd/wayland/detect_prime_egl.cpp b/platform/linuxbsd/wayland/detect_prime_egl.cpp index 78101c403a9..1169e3645a3 100644 --- a/platform/linuxbsd/wayland/detect_prime_egl.cpp +++ b/platform/linuxbsd/wayland/detect_prime_egl.cpp @@ -41,6 +41,7 @@ #include #include #include + #include // To prevent shadowing warnings. diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index ca68aa8414e..434cf8ff269 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -59,12 +59,12 @@ #ifdef GLES3_ENABLED #include "detect_prime_egl.h" +#include "wayland/egl_manager_wayland.h" +#include "wayland/egl_manager_wayland_gles.h" #include "core/io/file_access.h" #include "drivers/egl/egl_manager.h" #include "drivers/gles3/rasterizer_gles3.h" -#include "wayland/egl_manager_wayland.h" -#include "wayland/egl_manager_wayland_gles.h" #endif #ifdef DBUS_ENABLED diff --git a/platform/linuxbsd/wayland/wayland_embedder.h b/platform/linuxbsd/wayland/wayland_embedder.h index f22bc833a66..57a5f748fe2 100644 --- a/platform/linuxbsd/wayland/wayland_embedder.h +++ b/platform/linuxbsd/wayland/wayland_embedder.h @@ -34,13 +34,9 @@ #ifdef TOOLS_ENABLED -#include "core/templates/a_hash_map.h" -#include "core/templates/pooled_list.h" - #include "protocol/wayland.gen.h" -#include "protocol/linux_dmabuf_v1.gen.h" -#include "protocol/xdg_shell.gen.h" +// Keep wayland protocol included first. #include "protocol/color_management.gen.h" #include "protocol/commit_timing_v1.gen.h" @@ -49,6 +45,7 @@ #include "protocol/fractional_scale.gen.h" #include "protocol/godot_embedding_compositor.gen.h" #include "protocol/idle_inhibit.gen.h" +#include "protocol/linux_dmabuf_v1.gen.h" #include "protocol/linux_drm_syncobj_v1.gen.h" #include "protocol/linux_explicit_synchronization_unstable_v1.gen.h" #include "protocol/pointer_constraints.gen.h" @@ -56,11 +53,11 @@ #include "protocol/pointer_warp.gen.h" #include "protocol/primary_selection.gen.h" #include "protocol/relative_pointer.gen.h" -// #include "protocol/tablet.gen.h" // TODO: Needs some extra work #include "protocol/tearing_control_v1.gen.h" #include "protocol/text_input.gen.h" #include "protocol/viewporter.gen.h" #include "protocol/wayland-drm.gen.h" +#include "protocol/wayland.gen.h" #include "protocol/xdg_activation.gen.h" #include "protocol/xdg_decoration.gen.h" #include "protocol/xdg_foreign_v1.gen.h" @@ -69,18 +66,22 @@ #include "protocol/xdg_system_bell.gen.h" #include "protocol/xdg_toplevel_icon.gen.h" +// #include "protocol/tablet.gen.h" // TODO: Needs some extra work + +#include "core/io/dir_access.h" +#include "core/os/thread.h" +#include "core/templates/a_hash_map.h" +#include "core/templates/pooled_list.h" + +#include #include #include + #include #include #include #include -#include - -#include "core/io/dir_access.h" -#include "core/os/thread.h" - // TODO: Consider resizing the ancillary buffer dynamically. #define EMBED_ANCILLARY_BUF_SIZE 4096 diff --git a/platform/linuxbsd/wayland/wayland_thread.h b/platform/linuxbsd/wayland/wayland_thread.h index 11bc88dcc4c..3fcd27d0a29 100644 --- a/platform/linuxbsd/wayland/wayland_thread.h +++ b/platform/linuxbsd/wayland/wayland_thread.h @@ -52,7 +52,8 @@ // These must go after the Wayland client include to work properly. #include "wayland/protocol/idle_inhibit.gen.h" #include "wayland/protocol/primary_selection.gen.h" -// These four protocol headers name wl_pointer method arguments as `pointer`, + +// These protocol headers name wl_pointer method arguments as `pointer`, // which is the same name as X11's pointer typedef. This trips some very // annoying shadowing warnings. A `#define` works around this issue. #define pointer wl_pointer @@ -62,6 +63,7 @@ #include "wayland/protocol/pointer_warp.gen.h" #include "wayland/protocol/relative_pointer.gen.h" #undef pointer + #include "wayland/protocol/color_management.gen.h" #include "wayland/protocol/fractional_scale.gen.h" #include "wayland/protocol/tablet.gen.h" @@ -75,11 +77,12 @@ #include "wayland/protocol/xdg_system_bell.gen.h" #include "wayland/protocol/xdg_toplevel_icon.gen.h" -#include "wayland/protocol/godot_embedding_compositor.gen.h" - // NOTE: Deprecated. #include "wayland/protocol/xdg_foreign_v1.gen.h" +// Custom internal protocol. +#include "wayland/protocol/godot_embedding_compositor.gen.h" + #ifdef LIBDECOR_ENABLED #ifdef SOWRAP_ENABLED #include "dynwrappers/libdecor-so_wrap.h" @@ -88,13 +91,13 @@ #endif // SOWRAP_ENABLED #endif // LIBDECOR_ENABLED +#include "wayland_embedder.h" + #include "core/input/input_event.h" #include "core/os/process_id.h" #include "core/os/thread.h" #include "servers/display/display_server_enums.h" -#include "wayland_embedder.h" - class Image; class WaylandThread { diff --git a/platform/linuxbsd/x11/detect_prime_x11.cpp b/platform/linuxbsd/x11/detect_prime_x11.cpp index d50be984654..83032d13998 100644 --- a/platform/linuxbsd/x11/detect_prime_x11.cpp +++ b/platform/linuxbsd/x11/detect_prime_x11.cpp @@ -50,6 +50,7 @@ #include #include #include + #include #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 3c545397aa3..fc13f029c98 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -59,7 +59,6 @@ #else // !SOWRAP_ENABLED #include #include - #include #include #include diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h index 38b4a7a7204..a6e06d17e5e 100644 --- a/platform/linuxbsd/x11/display_server_x11.h +++ b/platform/linuxbsd/x11/display_server_x11.h @@ -41,19 +41,17 @@ #include "servers/display/display_server.h" #ifdef SOWRAP_ENABLED -#include "x11/dynwrappers/xlib-so_wrap.h" - #include "x11/dynwrappers/xcursor-so_wrap.h" #include "x11/dynwrappers/xinput2-so_wrap.h" +#include "x11/dynwrappers/xlib-so_wrap.h" #include "x11/dynwrappers/xrandr-so_wrap.h" #ifdef XKB_ENABLED #include "xkbcommon-so_wrap.h" #endif #else // !SOWRAP_ENABLED -#include - #include +#include #include #include diff --git a/platform/macos/crash_handler_macos.mm b/platform/macos/crash_handler_macos.mm index 0bef01a6a9e..837edd783f3 100644 --- a/platform/macos/crash_handler_macos.mm +++ b/platform/macos/crash_handler_macos.mm @@ -39,6 +39,7 @@ #include "main/main.h" #include + #include #if defined(DEBUG_ENABLED) @@ -49,12 +50,12 @@ #include #include #include -#include -#include - #import #import +#include +#include + static uint64_t load_address() { char full_path[1024]; uint32_t size = sizeof(full_path); diff --git a/platform/macos/dir_access_macos.mm b/platform/macos/dir_access_macos.mm index b9aa4d9c66d..4d69102598b 100644 --- a/platform/macos/dir_access_macos.mm +++ b/platform/macos/dir_access_macos.mm @@ -34,11 +34,11 @@ #include "core/config/project_settings.h" -#include -#include - #import #import +#include + +#include String DirAccessMacOS::get_filesystem_type() const { struct statfs fs; diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index e99b7004fab..4b9629fbd02 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -67,6 +67,7 @@ #ifdef TOOLS_ENABLED #import "display_server_macos_embedded.h" + #import "editor/embedded_process_macos.h" #endif diff --git a/platform/macos/display_server_macos_base.mm b/platform/macos/display_server_macos_base.mm index 26864fcf81b..d45a78cabd9 100644 --- a/platform/macos/display_server_macos_base.mm +++ b/platform/macos/display_server_macos_base.mm @@ -29,6 +29,7 @@ /**************************************************************************/ #import "display_server_macos_base.h" + #import "godot_application_delegate.h" #import "key_mapping_macos.h" #import "tts_macos.h" diff --git a/platform/macos/editor/embedded_process_macos.mm b/platform/macos/editor/embedded_process_macos.mm index f83087e6a89..ec61a2fdd7c 100644 --- a/platform/macos/editor/embedded_process_macos.mm +++ b/platform/macos/editor/embedded_process_macos.mm @@ -30,8 +30,8 @@ #include "embedded_process_macos.h" -#include "platform/macos/display_server_macos.h" -#include "platform/macos/display_server_macos_embedded.h" +#include "../display_server_macos.h" +#include "../display_server_macos_embedded.h" #include "core/input/input_event_codec.h" #include "core/os/main_loop.h" diff --git a/platform/macos/embedded_gl_manager.mm b/platform/macos/embedded_gl_manager.mm index 521720bfb88..50300547128 100644 --- a/platform/macos/embedded_gl_manager.mm +++ b/platform/macos/embedded_gl_manager.mm @@ -33,7 +33,8 @@ #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED) #import "drivers/gles3/storage/texture_storage.h" -#import "platform_gl.h" + +#import #import #include diff --git a/platform/macos/gl_manager_macos_angle.mm b/platform/macos/gl_manager_macos_angle.mm index 8579cd0e58c..c1cbde218a7 100644 --- a/platform/macos/gl_manager_macos_angle.mm +++ b/platform/macos/gl_manager_macos_angle.mm @@ -32,11 +32,11 @@ #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED) +#import + #include #include -#import - const char *GLManagerANGLE_MacOS::_get_platform_extension_name() const { return "EGL_ANGLE_platform_angle"; } diff --git a/platform/macos/gl_manager_macos_legacy.mm b/platform/macos/gl_manager_macos_legacy.mm index 7e209a1c8bc..90b6bd6afb4 100644 --- a/platform/macos/gl_manager_macos_legacy.mm +++ b/platform/macos/gl_manager_macos_legacy.mm @@ -35,6 +35,7 @@ #include "core/os/os.h" #include + #include #include diff --git a/platform/macos/godot_main_macos.mm b/platform/macos/godot_main_macos.mm index 6fed2cb3a66..27fb50f7124 100644 --- a/platform/macos/godot_main_macos.mm +++ b/platform/macos/godot_main_macos.mm @@ -28,9 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#import "os_macos.h" - #import "godot_application.h" +#import "os_macos.h" #include "core/profiling/profiling.h" #include "main/main.h" diff --git a/platform/macos/godot_open_save_delegate.h b/platform/macos/godot_open_save_delegate.h index 558ab23be32..b2f9c4c5604 100644 --- a/platform/macos/godot_open_save_delegate.h +++ b/platform/macos/godot_open_save_delegate.h @@ -30,14 +30,14 @@ #pragma once -#import -#import -#import - #include "core/templates/hash_map.h" #include "core/variant/typed_array.h" #include "core/variant/variant.h" +#import +#import +#import + @interface GodotOpenSaveDelegate : NSObject { NSSavePanel *dialog; NSMutableArray *allowed_types; diff --git a/platform/macos/libgodot_macos.mm b/platform/macos/libgodot_macos.mm index d410d730c0b..280f3376a9b 100644 --- a/platform/macos/libgodot_macos.mm +++ b/platform/macos/libgodot_macos.mm @@ -28,13 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "core/extension/libgodot.h" +#include "os_macos.h" #include "core/extension/godot_instance.h" +#include "core/extension/libgodot.h" #include "main/main.h" -#include "os_macos.h" - static OS_MacOS *os = nullptr; static GodotInstance *instance = nullptr; diff --git a/platform/visionos/main_visionos.mm b/platform/visionos/main_visionos.mm index f3ff5893972..d0d2cfc8a13 100644 --- a/platform/visionos/main_visionos.mm +++ b/platform/visionos/main_visionos.mm @@ -36,6 +36,7 @@ #include "main/main.h" #import + #include static OS_VisionOS *os = nullptr; diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h index 6d77c4c99af..9b3901c3b75 100644 --- a/platform/web/display_server_web.h +++ b/platform/web/display_server_web.h @@ -30,12 +30,12 @@ #pragma once +#include "godot_js.h" + #include "core/input/input_enums.h" #include "core/os/keyboard.h" #include "servers/display/display_server.h" -#include "godot_js.h" - #include #include diff --git a/platform/web/os_web.h b/platform/web/os_web.h index 7a4f27422a8..2862b259b1a 100644 --- a/platform/web/os_web.h +++ b/platform/web/os_web.h @@ -31,9 +31,8 @@ #pragma once #include "audio_driver_web.h" -#include "webmidi_driver.h" - #include "godot_js.h" +#include "webmidi_driver.h" #include "core/input/input_event.h" #include "drivers/unix/os_unix.h" diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp index a19840d76f4..ee76b89383b 100644 --- a/platform/web/web_main.cpp +++ b/platform/web/web_main.cpp @@ -47,6 +47,7 @@ #endif #include + #include static OS_Web *os = nullptr; diff --git a/platform/web/webmidi_driver.h b/platform/web/webmidi_driver.h index 2e4026a295e..56af88a3ae8 100644 --- a/platform/web/webmidi_driver.h +++ b/platform/web/webmidi_driver.h @@ -30,10 +30,10 @@ #pragma once -#include "core/os/midi_driver.h" - #include "godot_js.h" +#include "core/os/midi_driver.h" + class MIDIDriverWebMidi : public MIDIDriver { private: static const int MAX_EVENT_BUFFER_LENGTH = 2; diff --git a/platform/windows/console_wrapper_windows.cpp b/platform/windows/console_wrapper_windows.cpp index 070a3e045f2..68641d9fb64 100644 --- a/platform/windows/console_wrapper_windows.cpp +++ b/platform/windows/console_wrapper_windows.cpp @@ -31,6 +31,7 @@ #include #include + #include #include diff --git a/platform/windows/crash_handler_windows_seh.cpp b/platform/windows/crash_handler_windows_seh.cpp index 0ca7da3cad9..e44e7a1807b 100644 --- a/platform/windows/crash_handler_windows_seh.cpp +++ b/platform/windows/crash_handler_windows_seh.cpp @@ -41,14 +41,14 @@ // Backtrace code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app +#include + #include #include #include #include #include -#include - // Some versions of imagehlp.dll lack the proper packing directives themselves // so we need to do it. #pragma pack(push, before_imagehlp, 8) diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp index 612589a23e9..6660e6352c1 100644 --- a/platform/windows/crash_handler_windows_signal.cpp +++ b/platform/windows/crash_handler_windows_signal.cpp @@ -40,13 +40,13 @@ #ifdef CRASH_HANDLER_EXCEPTION -#include -#include -#include +#include "thirdparty/libbacktrace/backtrace.h" +#include #include -#include "thirdparty/libbacktrace/backtrace.h" +#include +#include struct CrashHandlerData { int64_t index = 0; diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 252c8ba9b86..a71beacc6ae 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -64,6 +64,7 @@ #endif #if defined(D3D12_ENABLED) #include "drivers/d3d12/rendering_context_driver_d3d12.h" + #include #endif #if defined(GLES3_ENABLED) diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index b82037e8f4b..55c6c264a34 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -52,10 +52,10 @@ #include "gl_manager_windows_native.h" #endif // GLES3_ENABLED -#include - -#include #include + +#include +#include #include // WinTab API diff --git a/platform/windows/gl_manager_windows_native.cpp b/platform/windows/gl_manager_windows_native.cpp index 2824c1605b5..5c7a18887fa 100644 --- a/platform/windows/gl_manager_windows_native.cpp +++ b/platform/windows/gl_manager_windows_native.cpp @@ -39,6 +39,7 @@ #include "thirdparty/misc/nvapi_minimal.h" #include + #include #include diff --git a/platform/windows/key_mapping_windows.h b/platform/windows/key_mapping_windows.h index 7df988ea29c..08446c1f0f3 100644 --- a/platform/windows/key_mapping_windows.h +++ b/platform/windows/key_mapping_windows.h @@ -33,6 +33,7 @@ #include "core/os/keyboard.h" #include + #include class KeyMappingWindows { diff --git a/platform/windows/libgodot_windows.cpp b/platform/windows/libgodot_windows.cpp index 28466fe187c..2b75e1144ab 100644 --- a/platform/windows/libgodot_windows.cpp +++ b/platform/windows/libgodot_windows.cpp @@ -28,13 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "core/extension/libgodot.h" +#include "os_windows.h" #include "core/extension/godot_instance.h" +#include "core/extension/libgodot.h" #include "main/main.h" -#include "os_windows.h" - static OS_Windows *os = nullptr; static GodotInstance *instance = nullptr; diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 79c6a708dc4..ebf3dbb7458 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -41,12 +41,12 @@ #include "drivers/xaudio2/audio_driver_xaudio2.h" #endif -#include -#include +#include #include #include -#include +#include +#include #include #ifdef DEBUG_ENABLED diff --git a/platform/windows/rendering_context_driver_vulkan_windows.cpp b/platform/windows/rendering_context_driver_vulkan_windows.cpp index a70d0ddf29e..5eca85cb4f7 100644 --- a/platform/windows/rendering_context_driver_vulkan_windows.cpp +++ b/platform/windows/rendering_context_driver_vulkan_windows.cpp @@ -30,10 +30,10 @@ #if defined(WINDOWS_ENABLED) && defined(VULKAN_ENABLED) -#include "core/os/os.h" - #include "rendering_context_driver_vulkan_windows.h" +#include "core/os/os.h" + #include const char *RenderingContextDriverVulkanWindows::_get_platform_surface_extension() const { diff --git a/platform/windows/tts_windows.h b/platform/windows/tts_windows.h index 7900ad76fec..5efef4c6e89 100644 --- a/platform/windows/tts_windows.h +++ b/platform/windows/tts_windows.h @@ -35,9 +35,10 @@ #include "core/templates/list.h" #include "core/variant/array.h" +#include + #include #include -#include #include struct TTSUtterance; diff --git a/platform/windows/wgl_detect_version.cpp b/platform/windows/wgl_detect_version.cpp index 7028042218c..154f123b903 100644 --- a/platform/windows/wgl_detect_version.cpp +++ b/platform/windows/wgl_detect_version.cpp @@ -42,6 +42,7 @@ #include #include + #include #include diff --git a/platform/windows/windows_terminal_logger.cpp b/platform/windows/windows_terminal_logger.cpp index 9a58e69b457..effaf6ae9a7 100644 --- a/platform/windows/windows_terminal_logger.cpp +++ b/platform/windows/windows_terminal_logger.cpp @@ -35,10 +35,10 @@ #include "core/object/script_backtrace.h" #include "core/os/os.h" -#include - #include +#include + void WindowsTerminalLogger::logv(const char *p_format, va_list p_list, bool p_err) { if (!should_log(p_err)) { return; diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index da6de18a8aa..3215e24879c 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -33,7 +33,7 @@ #include "core/math/geometry_2d.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" -#include "line_builder.h" +#include "scene/2d/line_builder.h" #include "servers/rendering/rendering_server.h" Line2D::Line2D() { diff --git a/scene/3d/aim_modifier_3d.cpp b/scene/3d/aim_modifier_3d.cpp index 8ca1f31990b..548a61b6040 100644 --- a/scene/3d/aim_modifier_3d.cpp +++ b/scene/3d/aim_modifier_3d.cpp @@ -29,9 +29,9 @@ /**************************************************************************/ #include "aim_modifier_3d.h" -#include "scene/3d/look_at_modifier_3d.h" #include "core/object/class_db.h" +#include "scene/3d/look_at_modifier_3d.h" bool AimModifier3D::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/3d/iterate_ik_3d.h b/scene/3d/iterate_ik_3d.h index 50c075cfec5..fba418c3eeb 100644 --- a/scene/3d/iterate_ik_3d.h +++ b/scene/3d/iterate_ik_3d.h @@ -31,7 +31,6 @@ #pragma once #include "scene/3d/chain_ik_3d.h" - #include "scene/resources/3d/joint_limitation_3d.h" class IterateIK3D : public ChainIK3D { diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h index 408819714f5..340ffb75e6e 100644 --- a/scene/3d/label_3d.h +++ b/scene/3d/label_3d.h @@ -33,7 +33,6 @@ #include "scene/3d/visual_instance_3d.h" #include "scene/resources/font.h" #include "scene/resources/material.h" - #include "servers/text/text_server.h" class Label3D : public GeometryInstance3D { diff --git a/scene/3d/skeleton_modifier_3d.h b/scene/3d/skeleton_modifier_3d.h index f50a0e201a7..dde4257793b 100644 --- a/scene/3d/skeleton_modifier_3d.h +++ b/scene/3d/skeleton_modifier_3d.h @@ -31,7 +31,6 @@ #pragma once #include "scene/3d/node_3d.h" - #include "scene/3d/skeleton_3d.h" class SkeletonModifier3D : public Node3D { diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index 691c2f11457..db0deab0e6b 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -30,7 +30,7 @@ #pragma once -#include "animation_mixer.h" +#include "scene/animation/animation_mixer.h" #include "scene/resources/animation.h" class AnimationPlayer : public AnimationMixer { diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 4468b646a4c..6e46adc454d 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -30,7 +30,7 @@ #pragma once -#include "animation_mixer.h" +#include "scene/animation/animation_mixer.h" #include "scene/resources/animation.h" #define HUGE_LENGTH 31540000 // 31540000 seconds mean 1 year... is it too long? It must be longer than any Animation length and Transition xfade time to prevent time inversion for AnimationNodeStateMachine. diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h index 218cf4ebe53..5a5a1573318 100644 --- a/scene/gui/dialogs.h +++ b/scene/gui/dialogs.h @@ -30,7 +30,7 @@ #pragma once -#include "box_container.h" +#include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/panel.h" diff --git a/scene/gui/popup.h b/scene/gui/popup.h index 1afc9a74586..df2a97928c3 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -30,9 +30,8 @@ #pragma once -#include "scene/main/window.h" - #include "core/templates/local_vector.h" +#include "scene/main/window.h" class Panel; diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index f84498a9457..a5f908d81f5 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -33,6 +33,7 @@ #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "servers/display/accessibility_server.h" + #include "thirdparty/misc/r128.h" double Range::_snapped_r128(double p_value, double p_step) { diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index 6ef12617e21..3dbe555f108 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -30,9 +30,8 @@ #pragma once -#include "container.h" - -#include "scroll_bar.h" +#include "scene/gui/container.h" +#include "scene/gui/scroll_bar.h" class PanelContainer; class TextureRect; diff --git a/scene/resources/label_settings.h b/scene/resources/label_settings.h index 82b8966d5d0..8e1b42850dd 100644 --- a/scene/resources/label_settings.h +++ b/scene/resources/label_settings.h @@ -31,8 +31,8 @@ #pragma once #include "core/io/resource.h" -#include "font.h" #include "scene/property_list_helper.h" +#include "scene/resources/font.h" /*************************************************************************/ diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index fddc1311afd..01a7a85a1fd 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -36,10 +36,10 @@ #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "scene/main/scene_tree.h" +#include "scene/resources/texture.h" #include "servers/rendering/rendering_server.h" #include "servers/rendering/shader_language.h" #include "servers/rendering/shader_preprocessor.h" -#include "texture.h" #ifdef TOOLS_ENABLED #include "editor/doc/editor_help.h" diff --git a/scene/resources/shader.h b/scene/resources/shader.h index 5d2395114e7..7863003b77f 100644 --- a/scene/resources/shader.h +++ b/scene/resources/shader.h @@ -31,7 +31,7 @@ #pragma once #include "core/io/resource.h" -#include "shader_include.h" +#include "scene/resources/shader_include.h" class Texture; class Texture2D; diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index 405cd18c04b..b69283db4b8 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -33,6 +33,7 @@ #include "core/templates/local_vector.h" #include "scene/resources/mesh.h" #include "servers/rendering/rendering_server_enums.h" + #include "thirdparty/misc/mikktspace.h" class SurfaceTool : public RefCounted { diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index a3fdbe7d425..fe292c8d0f3 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -30,11 +30,10 @@ #pragma once -#include "servers/audio/audio_server.h" - #include "core/os/mutex.h" #include "core/os/thread.h" #include "core/templates/safe_refcount.h" +#include "servers/audio/audio_server.h" class AudioDriverDummy : public AudioDriver { Thread thread; diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h index 8bb5dbaf6ff..502f6005133 100644 --- a/servers/audio/audio_stream.h +++ b/servers/audio/audio_stream.h @@ -31,12 +31,11 @@ #pragma once #include "core/io/resource.h" -#include "scene/property_list_helper.h" -#include "servers/audio/audio_server.h" - #include "core/object/gdvirtual.gen.h" #include "core/variant/native_ptr.h" #include "core/variant/typed_array.h" +#include "scene/property_list_helper.h" +#include "servers/audio/audio_server.h" class AudioStream; diff --git a/servers/movie_writer/movie_writer_pngwav.cpp b/servers/movie_writer/movie_writer_pngwav.cpp index d39d3f7a679..3b6c81ccf2f 100644 --- a/servers/movie_writer/movie_writer_pngwav.cpp +++ b/servers/movie_writer/movie_writer_pngwav.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "movie_writer_pngwav.h" + #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" diff --git a/servers/navigation_3d/navigation_server_3d.h b/servers/navigation_3d/navigation_server_3d.h index c77af6de93c..f886c5638ac 100644 --- a/servers/navigation_3d/navigation_server_3d.h +++ b/servers/navigation_3d/navigation_server_3d.h @@ -31,7 +31,6 @@ #pragma once #include "core/templates/rid_owner.h" - #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation_mesh.h" #include "servers/navigation_3d/navigation_path_query_parameters_3d.h" diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index d9073fe7b64..0ec7dafbee9 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -34,54 +34,54 @@ #include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "core/os/os.h" - -#include "audio/audio_effect.h" -#include "audio/audio_server.h" -#include "audio/audio_stream.h" -#include "audio/effects/audio_effect_amplify.h" -#include "audio/effects/audio_effect_capture.h" -#include "audio/effects/audio_effect_chorus.h" -#include "audio/effects/audio_effect_compressor.h" -#include "audio/effects/audio_effect_delay.h" -#include "audio/effects/audio_effect_distortion.h" -#include "audio/effects/audio_effect_eq.h" -#include "audio/effects/audio_effect_filter.h" -#include "audio/effects/audio_effect_hard_limiter.h" -#include "audio/effects/audio_effect_panner.h" -#include "audio/effects/audio_effect_phaser.h" -#include "audio/effects/audio_effect_pitch_shift.h" -#include "audio/effects/audio_effect_record.h" -#include "audio/effects/audio_effect_reverb.h" -#include "audio/effects/audio_effect_spectrum_analyzer.h" -#include "audio/effects/audio_effect_stereo_enhance.h" -#include "audio/effects/audio_stream_generator.h" -#include "camera/camera_feed.h" -#include "camera/camera_server.h" -#include "debugger/servers_debugger.h" -#include "display/accessibility_server.h" -#include "display/display_server.h" -#include "display/native_menu.h" -#include "movie_writer/movie_writer.h" -#include "movie_writer/movie_writer_pngwav.h" -#include "rendering/renderer_rd/framebuffer_cache_rd.h" -#include "rendering/renderer_rd/storage_rd/render_data_rd.h" -#include "rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h" -#include "rendering/renderer_rd/storage_rd/render_scene_data_rd.h" -#include "rendering/renderer_rd/uniform_set_cache_rd.h" -#include "rendering/rendering_device.h" -#include "rendering/rendering_device_binds.h" -#include "rendering/rendering_server.h" -#include "rendering/shader_include_db.h" -#include "rendering/storage/render_data.h" -#include "rendering/storage/render_data_extension.h" -#include "rendering/storage/render_scene_buffers.h" -#include "rendering/storage/render_scene_data.h" +#include "servers/audio/audio_effect.h" +#include "servers/audio/audio_server.h" +#include "servers/audio/audio_stream.h" +#include "servers/audio/effects/audio_effect_amplify.h" +#include "servers/audio/effects/audio_effect_capture.h" +#include "servers/audio/effects/audio_effect_chorus.h" +#include "servers/audio/effects/audio_effect_compressor.h" +#include "servers/audio/effects/audio_effect_delay.h" +#include "servers/audio/effects/audio_effect_distortion.h" +#include "servers/audio/effects/audio_effect_eq.h" +#include "servers/audio/effects/audio_effect_filter.h" +#include "servers/audio/effects/audio_effect_hard_limiter.h" +#include "servers/audio/effects/audio_effect_panner.h" +#include "servers/audio/effects/audio_effect_phaser.h" +#include "servers/audio/effects/audio_effect_pitch_shift.h" +#include "servers/audio/effects/audio_effect_record.h" +#include "servers/audio/effects/audio_effect_reverb.h" +#include "servers/audio/effects/audio_effect_spectrum_analyzer.h" +#include "servers/audio/effects/audio_effect_stereo_enhance.h" +#include "servers/audio/effects/audio_stream_generator.h" +#include "servers/camera/camera_feed.h" +#include "servers/camera/camera_server.h" +#include "servers/debugger/servers_debugger.h" +#include "servers/display/accessibility_server.h" +#include "servers/display/display_server.h" +#include "servers/display/native_menu.h" +#include "servers/movie_writer/movie_writer.h" +#include "servers/movie_writer/movie_writer_pngwav.h" +#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/render_data_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" +#include "servers/rendering/rendering_device.h" +#include "servers/rendering/rendering_device_binds.h" +#include "servers/rendering/rendering_server.h" +#include "servers/rendering/shader_include_db.h" #include "servers/rendering/shader_types.h" -#include "text/text_server.h" -#include "text/text_server_dummy.h" -#include "text/text_server_extension.h" +#include "servers/rendering/storage/render_data.h" +#include "servers/rendering/storage/render_data_extension.h" +#include "servers/rendering/storage/render_scene_buffers.h" +#include "servers/rendering/storage/render_scene_data.h" +#include "servers/text/text_server.h" +#include "servers/text/text_server_dummy.h" +#include "servers/text/text_server_extension.h" + #ifndef DISABLE_DEPRECATED -#include "audio/effects/audio_effect_limiter.h" +#include "servers/audio/effects/audio_effect_limiter.h" #endif // 2D physics and navigation. @@ -106,15 +106,15 @@ // XR #ifndef XR_DISABLED -#include "xr/xr_body_tracker.h" -#include "xr/xr_controller_tracker.h" -#include "xr/xr_face_tracker.h" -#include "xr/xr_hand_tracker.h" -#include "xr/xr_interface.h" -#include "xr/xr_interface_extension.h" -#include "xr/xr_positional_tracker.h" -#include "xr/xr_server.h" -#include "xr/xr_vrs.h" +#include "servers/xr/xr_body_tracker.h" +#include "servers/xr/xr_controller_tracker.h" +#include "servers/xr/xr_face_tracker.h" +#include "servers/xr/xr_hand_tracker.h" +#include "servers/xr/xr_interface.h" +#include "servers/xr/xr_interface_extension.h" +#include "servers/xr/xr_positional_tracker.h" +#include "servers/xr/xr_server.h" +#include "servers/xr/xr_vrs.h" #endif // XR_DISABLED ShaderTypes *shader_types = nullptr; diff --git a/servers/rendering/dummy/storage/light_storage.h b/servers/rendering/dummy/storage/light_storage.h index 205b008eb00..5213c3f576e 100644 --- a/servers/rendering/dummy/storage/light_storage.h +++ b/servers/rendering/dummy/storage/light_storage.h @@ -31,7 +31,6 @@ #pragma once #include "core/templates/rid_owner.h" - #include "servers/rendering/storage/light_storage.h" namespace RendererDummy { diff --git a/servers/rendering/renderer_geometry_instance.h b/servers/rendering/renderer_geometry_instance.h index d7fe14a9b95..7c7991e19f3 100644 --- a/servers/rendering/renderer_geometry_instance.h +++ b/servers/rendering/renderer_geometry_instance.h @@ -34,7 +34,7 @@ #include "core/math/rect2.h" #include "core/math/transform_3d.h" #include "core/templates/rid.h" -#include "storage/utilities.h" +#include "servers/rendering/storage/utilities.h" // API definition for our RenderGeometryInstance class so we can expose this through GDExtension in the near future class RenderGeometryInstance { diff --git a/servers/rendering/renderer_rd/effects/copy_effects.cpp b/servers/rendering/renderer_rd/effects/copy_effects.cpp index 6d8c76e704f..533b190d951 100644 --- a/servers/rendering/renderer_rd/effects/copy_effects.cpp +++ b/servers/rendering/renderer_rd/effects/copy_effects.cpp @@ -29,10 +29,12 @@ /**************************************************************************/ #include "copy_effects.h" + #include "core/config/project_settings.h" #include "servers/rendering/renderer_rd/renderer_compositor_rd.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" + #include "thirdparty/misc/cubemap_coeffs.h" using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/effects/fsr.cpp b/servers/rendering/renderer_rd/effects/fsr.cpp index 50d86764568..10796cad67a 100644 --- a/servers/rendering/renderer_rd/effects/fsr.cpp +++ b/servers/rendering/renderer_rd/effects/fsr.cpp @@ -29,8 +29,9 @@ /**************************************************************************/ #include "fsr.h" -#include "../storage_rd/material_storage.h" -#include "../uniform_set_cache_rd.h" + +#include "servers/rendering/renderer_rd/storage_rd/material_storage.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/effects/fsr.h b/servers/rendering/renderer_rd/effects/fsr.h index 48816936a83..e1766cb136e 100644 --- a/servers/rendering/renderer_rd/effects/fsr.h +++ b/servers/rendering/renderer_rd/effects/fsr.h @@ -30,11 +30,10 @@ #pragma once -#include "spatial_upscaler.h" - -#include "../storage_rd/render_scene_buffers_rd.h" +#include "servers/rendering/renderer_rd/effects/spatial_upscaler.h" #include "servers/rendering/renderer_rd/pipeline_deferred_rd.h" #include "servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl.gen.h" +#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h" namespace RendererRD { diff --git a/servers/rendering/renderer_rd/effects/fsr2.cpp b/servers/rendering/renderer_rd/effects/fsr2.cpp index dbcf589e626..207bb29a12a 100644 --- a/servers/rendering/renderer_rd/effects/fsr2.cpp +++ b/servers/rendering/renderer_rd/effects/fsr2.cpp @@ -30,8 +30,8 @@ #include "fsr2.h" -#include "../storage_rd/material_storage.h" -#include "../uniform_set_cache_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/material_storage.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/effects/luminance.cpp b/servers/rendering/renderer_rd/effects/luminance.cpp index d9a2ed8ca90..7d83aa1b3d7 100644 --- a/servers/rendering/renderer_rd/effects/luminance.cpp +++ b/servers/rendering/renderer_rd/effects/luminance.cpp @@ -29,9 +29,10 @@ /**************************************************************************/ #include "luminance.h" -#include "../framebuffer_cache_rd.h" -#include "../uniform_set_cache_rd.h" + +#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/effects/metal_fx.cpp b/servers/rendering/renderer_rd/effects/metal_fx.cpp index 11d23a77912..e596ae91bec 100644 --- a/servers/rendering/renderer_rd/effects/metal_fx.cpp +++ b/servers/rendering/renderer_rd/effects/metal_fx.cpp @@ -32,9 +32,9 @@ #include "metal_fx.h" -#include "../storage_rd/render_scene_buffers_rd.h" #include "drivers/metal/pixel_formats.h" #include "drivers/metal/rendering_device_driver_metal3.h" +#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h" #include diff --git a/servers/rendering/renderer_rd/effects/metal_fx.h b/servers/rendering/renderer_rd/effects/metal_fx.h index 82b8b2f917d..c4886973ed3 100644 --- a/servers/rendering/renderer_rd/effects/metal_fx.h +++ b/servers/rendering/renderer_rd/effects/metal_fx.h @@ -36,9 +36,8 @@ #ifdef METAL_ENABLED -#include "spatial_upscaler.h" - #include "core/templates/paged_allocator.h" +#include "servers/rendering/renderer_rd/effects/spatial_upscaler.h" #include "servers/rendering/renderer_scene_render.h" #include "servers/rendering/rendering_device_driver.h" diff --git a/servers/rendering/renderer_rd/effects/resolve.cpp b/servers/rendering/renderer_rd/effects/resolve.cpp index 8480ffd60a1..1c218b10dde 100644 --- a/servers/rendering/renderer_rd/effects/resolve.cpp +++ b/servers/rendering/renderer_rd/effects/resolve.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "resolve.h" + #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" diff --git a/servers/rendering/renderer_rd/effects/roughness_limiter.cpp b/servers/rendering/renderer_rd/effects/roughness_limiter.cpp index 6c6efd905b9..337dc1310fa 100644 --- a/servers/rendering/renderer_rd/effects/roughness_limiter.cpp +++ b/servers/rendering/renderer_rd/effects/roughness_limiter.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "roughness_limiter.h" + #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" diff --git a/servers/rendering/renderer_rd/effects/taa.cpp b/servers/rendering/renderer_rd/effects/taa.cpp index b0f46db8c29..9125301c431 100644 --- a/servers/rendering/renderer_rd/effects/taa.cpp +++ b/servers/rendering/renderer_rd/effects/taa.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "taa.h" + #include "servers/rendering/renderer_rd/effects/copy_effects.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" diff --git a/servers/rendering/renderer_rd/effects/tone_mapper.cpp b/servers/rendering/renderer_rd/effects/tone_mapper.cpp index cf039996d27..02a3da4b1b7 100644 --- a/servers/rendering/renderer_rd/effects/tone_mapper.cpp +++ b/servers/rendering/renderer_rd/effects/tone_mapper.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "tone_mapper.h" + #include "servers/rendering/renderer_rd/renderer_compositor_rd.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" diff --git a/servers/rendering/renderer_rd/effects/vrs.cpp b/servers/rendering/renderer_rd/effects/vrs.cpp index 8581e353f12..573199a58c2 100644 --- a/servers/rendering/renderer_rd/effects/vrs.cpp +++ b/servers/rendering/renderer_rd/effects/vrs.cpp @@ -30,9 +30,9 @@ #include "vrs.h" -#include "../renderer_compositor_rd.h" -#include "../storage_rd/texture_storage.h" -#include "../uniform_set_cache_rd.h" +#include "servers/rendering/renderer_rd/renderer_compositor_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" #ifndef XR_DISABLED #include "servers/xr/xr_interface.h" diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.h b/servers/rendering/renderer_rd/storage_rd/material_storage.h index 7f3083bdc0d..6cfd169e386 100644 --- a/servers/rendering/renderer_rd/storage_rd/material_storage.h +++ b/servers/rendering/renderer_rd/storage_rd/material_storage.h @@ -30,11 +30,10 @@ #pragma once -#include "texture_storage.h" - #include "core/templates/rid_owner.h" #include "core/templates/self_list.h" #include "servers/rendering/renderer_rd/pipeline_cache_rd.h" +#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h" #include "servers/rendering/rendering_server_types.h" #include "servers/rendering/shader_compiler.h" #include "servers/rendering/shader_language.h" diff --git a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h index 86b9b3e0d8c..b31e8fd9f66 100644 --- a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h +++ b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h @@ -30,17 +30,17 @@ #pragma once -#include "../effects/vrs.h" -#ifdef METAL_ENABLED -#include "../effects/metal_fx.h" -#endif - #include "core/templates/hash_map.h" +#include "servers/rendering/renderer_rd/effects/vrs.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h" #include "servers/rendering/rendering_device.h" #include "servers/rendering/storage/render_scene_buffers.h" +#ifdef METAL_ENABLED +#include "servers/rendering/renderer_rd/effects/metal_fx.h" +#endif + #define RB_SCOPE_BUFFERS SNAME("render_buffers") #define RB_SCOPE_VRS SNAME("VRS") diff --git a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp index afe82730871..c11f3eb1451 100644 --- a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp @@ -30,13 +30,12 @@ #include "texture_storage.h" -#include "../effects/copy_effects.h" -#include "../framebuffer_cache_rd.h" -#include "../uniform_set_cache_rd.h" - #include "core/config/engine.h" +#include "servers/rendering/renderer_rd/effects/copy_effects.h" +#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h" #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h" #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" +#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" #include "servers/rendering/rendering_server_globals.h" using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/storage_rd/utilities.cpp b/servers/rendering/renderer_rd/storage_rd/utilities.cpp index 916f757cfee..c6475e508cf 100644 --- a/servers/rendering/renderer_rd/storage_rd/utilities.cpp +++ b/servers/rendering/renderer_rd/storage_rd/utilities.cpp @@ -29,12 +29,13 @@ /**************************************************************************/ #include "utilities.h" -#include "../environment/fog.h" -#include "../environment/gi.h" -#include "light_storage.h" -#include "mesh_storage.h" -#include "particles_storage.h" -#include "texture_storage.h" + +#include "servers/rendering/renderer_rd/environment/fog.h" +#include "servers/rendering/renderer_rd/environment/gi.h" +#include "servers/rendering/renderer_rd/storage_rd/light_storage.h" +#include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h" +#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h" +#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h" using namespace RendererRD; diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp index ac1d02e9dd2..03b782c1958 100644 --- a/servers/rendering/rendering_device.cpp +++ b/servers/rendering/rendering_device.cpp @@ -31,9 +31,6 @@ #include "rendering_device.h" #include "rendering_device.compat.inc" -#include "rendering_device_binds.h" -#include "shader_include_db.h" - #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" @@ -42,8 +39,11 @@ #include "core/os/os.h" #include "core/profiling/profiling.h" #include "core/templates/fixed_vector.h" -#include "modules/modules_enabled.gen.h" +#include "servers/rendering/rendering_device_binds.h" #include "servers/rendering/rendering_shader_container.h" +#include "servers/rendering/shader_include_db.h" + +#include "modules/modules_enabled.gen.h" #ifdef MODULE_GLSLANG_ENABLED #include "modules/glslang/shader_compile.h" diff --git a/servers/rendering/rendering_device_graph.h b/servers/rendering/rendering_device_graph.h index de59f7a0b7b..ce1be7eefa6 100644 --- a/servers/rendering/rendering_device_graph.h +++ b/servers/rendering/rendering_device_graph.h @@ -31,8 +31,8 @@ #pragma once #include "core/object/worker_thread_pool.h" -#include "rendering_device_commons.h" -#include "rendering_device_driver.h" +#include "servers/rendering/rendering_device_commons.h" +#include "servers/rendering/rendering_device_driver.h" #ifdef DEV_ENABLED #include "core/templates/rb_map.h" diff --git a/servers/rendering/rendering_light_culler.cpp b/servers/rendering/rendering_light_culler.cpp index 4024819a1e6..74c9289198b 100644 --- a/servers/rendering/rendering_light_culler.cpp +++ b/servers/rendering/rendering_light_culler.cpp @@ -32,7 +32,7 @@ #include "core/math/plane.h" #include "core/math/projection.h" -#include "rendering_server_globals.h" +#include "servers/rendering/rendering_server_globals.h" #ifdef LIGHT_CULLER_DEBUG_FLASH #include "core/config/engine.h" diff --git a/servers/rendering/rendering_light_culler.h b/servers/rendering/rendering_light_culler.h index d849572c0ba..4a40b34ed68 100644 --- a/servers/rendering/rendering_light_culler.h +++ b/servers/rendering/rendering_light_culler.h @@ -32,7 +32,7 @@ #include "core/math/plane.h" #include "core/math/vector3.h" -#include "renderer_scene_cull.h" +#include "servers/rendering/renderer_scene_cull.h" struct Projection; struct Transform3D; diff --git a/servers/rendering/rendering_shader_container.cpp b/servers/rendering/rendering_shader_container.cpp index fcd0056a1ee..90e5d41451d 100644 --- a/servers/rendering/rendering_shader_container.cpp +++ b/servers/rendering/rendering_shader_container.cpp @@ -31,8 +31,8 @@ #include "rendering_shader_container.h" #include "core/io/compression.h" - #include "servers/rendering/renderer_rd/shader_rd.h" + #include "thirdparty/spirv-reflect/spirv_reflect.h" static inline uint32_t aligned_to(uint32_t p_size, uint32_t p_alignment) { diff --git a/servers/rendering/shader_preprocessor.cpp b/servers/rendering/shader_preprocessor.cpp index 995f860ecaa..2fc44cb8108 100644 --- a/servers/rendering/shader_preprocessor.cpp +++ b/servers/rendering/shader_preprocessor.cpp @@ -29,8 +29,10 @@ /**************************************************************************/ #include "shader_preprocessor.h" + +#include "core/math/expression.h" #include "core/os/os.h" -#include "shader_expression.h" +#include "servers/rendering/shader_expression.h" const char32_t CURSOR = 0xFFFF; diff --git a/servers/rendering/shader_preprocessor.h b/servers/rendering/shader_preprocessor.h index f30b8cccf3a..b3440fe4c58 100644 --- a/servers/rendering/shader_preprocessor.h +++ b/servers/rendering/shader_preprocessor.h @@ -30,13 +30,12 @@ #pragma once +#include "core/object/script_language.h" #include "core/string/ustring.h" #include "core/templates/list.h" #include "core/templates/local_vector.h" #include "core/templates/rb_map.h" #include "core/templates/rb_set.h" - -#include "core/object/script_language.h" #include "scene/resources/shader_include.h" class ShaderPreprocessor { diff --git a/servers/rendering/shader_types.h b/servers/rendering/shader_types.h index 3c3734ddaf0..d3fd1241cd7 100644 --- a/servers/rendering/shader_types.h +++ b/servers/rendering/shader_types.h @@ -31,7 +31,7 @@ #pragma once #include "servers/rendering/rendering_server_enums.h" -#include "shader_language.h" +#include "servers/rendering/shader_language.h" class ShaderTypes { struct Type { diff --git a/servers/rendering/shader_warnings.cpp b/servers/rendering/shader_warnings.cpp index 1da61cf73df..0115b64e0b2 100644 --- a/servers/rendering/shader_warnings.cpp +++ b/servers/rendering/shader_warnings.cpp @@ -29,6 +29,7 @@ /**************************************************************************/ #include "shader_warnings.h" + #include "core/variant/variant.h" #ifdef DEBUG_ENABLED diff --git a/tests/compatibility_test/src/compat_checker.c b/tests/compatibility_test/src/compat_checker.c index 20e9087d4d5..1a18d6e9ac6 100644 --- a/tests/compatibility_test/src/compat_checker.c +++ b/tests/compatibility_test/src/compat_checker.c @@ -29,6 +29,7 @@ /**************************************************************************/ #include "compat_checker.h" + #include #include #include diff --git a/tests/scene/test_fontfile.cpp b/tests/scene/test_fontfile.cpp index 843f97d61cd..7bd7b34a1a8 100644 --- a/tests/scene/test_fontfile.cpp +++ b/tests/scene/test_fontfile.cpp @@ -32,9 +32,10 @@ TEST_FORCE_LINK(test_fontfile) -#include "modules/modules_enabled.gen.h" // For freetype. #include "scene/resources/font.h" +#include "modules/modules_enabled.gen.h" // For freetype. + namespace TestFontFile { TEST_CASE("[FontFile] Load Dynamic Font - getters") { diff --git a/tests/scene/test_gltf_document.cpp b/tests/scene/test_gltf_document.cpp index 13fe773d672..237a9bd673c 100644 --- a/tests/scene/test_gltf_document.cpp +++ b/tests/scene/test_gltf_document.cpp @@ -38,9 +38,10 @@ TEST_FORCE_LINK(test_gltf_document) #ifdef MODULE_GLTF_ENABLED +#include "tests/test_utils.h" + #include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h" #include "modules/gltf/gltf_document.h" -#include "tests/test_utils.h" namespace TestGLTFDocument {