diff --git a/core/SCsub b/core/SCsub index 42cccf734..600686225 100644 --- a/core/SCsub +++ b/core/SCsub @@ -38,7 +38,7 @@ if "SCRIPT_AES256_ENCRYPTION_KEY" in os.environ: # NOTE: It is safe to generate this file here, since this is still executed serially with open("script_encryption_key.gen.cpp", "w") as f: - f.write('#include "core/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n") + f.write('#include "core/config/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n") # Add required thirdparty code. @@ -185,6 +185,7 @@ SConscript("string/SCsub") SConscript("containers/SCsub") SConscript("variant/SCsub") SConscript("error/SCsub") +SConscript("config/SCsub") SConscript("crypto/SCsub") SConscript("io/SCsub") SConscript("log/SCsub") diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 99685850e..4cf0c58cd 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -39,7 +39,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" /** * Time constants borrowed from loc_time.h diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp index 969f1b2e2..6f1b20efe 100644 --- a/core/command_queue_mt.cpp +++ b/core/command_queue_mt.cpp @@ -31,7 +31,7 @@ #include "command_queue_mt.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" void CommandQueueMT::lock() { mutex.lock(); diff --git a/core/config/SCsub b/core/config/SCsub new file mode 100644 index 000000000..bf7028549 --- /dev/null +++ b/core/config/SCsub @@ -0,0 +1,7 @@ +#!/usr/bin/env python + +Import("env") + +env_config = env.Clone() + +env_config.add_source_files(env.core_sources, "*.cpp") diff --git a/core/engine.cpp b/core/config/engine.cpp similarity index 100% rename from core/engine.cpp rename to core/config/engine.cpp diff --git a/core/engine.h b/core/config/engine.h similarity index 100% rename from core/engine.h rename to core/config/engine.h diff --git a/core/project_settings.cpp b/core/config/project_settings.cpp similarity index 100% rename from core/project_settings.cpp rename to core/config/project_settings.cpp diff --git a/core/project_settings.h b/core/config/project_settings.h similarity index 100% rename from core/project_settings.h rename to core/config/project_settings.h diff --git a/core/crypto/crypto.cpp b/core/crypto/crypto.cpp index ca1cb5f71..7340eddf8 100644 --- a/core/crypto/crypto.cpp +++ b/core/crypto/crypto.cpp @@ -30,7 +30,7 @@ #include "crypto.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/certs_compressed.gen.h" #include "core/io/compression.h" diff --git a/core/input_map.cpp b/core/input_map.cpp index 6dd852337..754d8a21a 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -32,7 +32,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" InputMap *InputMap::singleton = nullptr; diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 6ea66e3c6..8103fec73 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -31,7 +31,7 @@ #include "compression.h" #include "core/io/zip_io.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "thirdparty/misc/fastlz.h" diff --git a/core/io/dtls_server.cpp b/core/io/dtls_server.cpp index 4e43aea91..3b6202ffe 100644 --- a/core/io/dtls_server.cpp +++ b/core/io/dtls_server.cpp @@ -30,7 +30,7 @@ #include "dtls_server.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" DTLSServer *(*DTLSServer::_create)() = nullptr; bool DTLSServer::available = false; diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp index 7cb2ea3e4..7a9fcaf07 100644 --- a/core/io/file_access_memory.cpp +++ b/core/io/file_access_memory.cpp @@ -32,7 +32,7 @@ #include "core/containers/map.h" #include "core/os/dir_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" static Map> *files = nullptr; diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp index 62e6059a2..43a3ccc7c 100644 --- a/core/io/file_access_network.cpp +++ b/core/io/file_access_network.cpp @@ -33,7 +33,7 @@ #include "core/io/ip.h" #include "core/io/marshalls.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" //#define DEBUG_PRINT(m_p) print_line(m_p) //#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec()); diff --git a/core/io/logger.cpp b/core/io/logger.cpp index 311136024..f8b70c86c 100644 --- a/core/io/logger.cpp +++ b/core/io/logger.cpp @@ -33,7 +33,7 @@ #include "core/os/dir_access.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" // va_copy was defined in the C99, but not in C++ standards before C++11. // When you compile C++ without --std=c++ option, compilers still define diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index e951d557b..c00ecdff2 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -31,7 +31,7 @@ #include "packet_peer.h" #include "core/io/marshalls.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" /* helpers / binders */ diff --git a/core/io/packet_peer_dtls.cpp b/core/io/packet_peer_dtls.cpp index 712c72059..e4ea774ea 100644 --- a/core/io/packet_peer_dtls.cpp +++ b/core/io/packet_peer_dtls.cpp @@ -30,7 +30,7 @@ #include "packet_peer_dtls.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" PacketPeerDTLS *(*PacketPeerDTLS::_create)() = nullptr; bool PacketPeerDTLS::available = false; diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 6d8fef13e..04e7d3cb3 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -34,7 +34,7 @@ #include "core/io/file_access_compressed.h" #include "core/io/marshalls.h" #include "core/os/dir_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" //#define print_bl(m_what) print_line(m_what) diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index 8d44e3a82..ff544edca 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -31,7 +31,7 @@ #include "resource_importer.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/variant/variant_parser.h" bool ResourceFormatImporter::SortImporterByName::operator()(const Ref &p_a, const Ref &p_b) const { diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index c8f0ce9c7..c625b2921 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -34,7 +34,7 @@ #include "core/os/file_access.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" #include "core/variant/variant_parser.h" diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index 2c5e8522d..cffce7775 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -31,7 +31,7 @@ #include "resource_saver.h" #include "core/io/resource_loader.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" Ref ResourceSaver::saver[MAX_SAVERS]; diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp index 774f83dc6..6c52eb29d 100644 --- a/core/io/stream_peer_ssl.cpp +++ b/core/io/stream_peer_ssl.cpp @@ -30,7 +30,7 @@ #include "stream_peer_ssl.h" -#include "core/engine.h" +#include "core/config/engine.h" StreamPeerSSL *(*StreamPeerSSL::_create)() = nullptr; diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index dfee9e6f2..c0867f471 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -30,7 +30,7 @@ #include "stream_peer_tcp.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" Error StreamPeerTCP::_poll_connection() { ERR_FAIL_COND_V(status != STATUS_CONNECTING || !_sock.is_valid() || !_sock->is_open(), FAILED); diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp index a90b72139..bcb1a9f0f 100644 --- a/core/object/class_db.cpp +++ b/core/object/class_db.cpp @@ -30,7 +30,7 @@ #include "class_db.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/os/mutex.h" #include "core/version.h" diff --git a/core/object/message_queue.cpp b/core/object/message_queue.cpp index e90bff3d8..dd6b0032f 100644 --- a/core/object/message_queue.cpp +++ b/core/object/message_queue.cpp @@ -30,7 +30,7 @@ #include "message_queue.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" MessageQueue *MessageQueue::singleton = nullptr; diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp index 24f530364..6cadffe6e 100644 --- a/core/object/script_language.cpp +++ b/core/object/script_language.cpp @@ -31,7 +31,7 @@ #include "script_language.h" #include "core/core_string_names.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES]; int ScriptServer::_language_count = 0; diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index d21f85952..30aef3834 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -33,7 +33,7 @@ #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" String DirAccess::_get_root_path() const { switch (_access_type) { diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 709266dd2..ac98bb042 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -34,7 +34,7 @@ #include "core/io/file_access_pack.h" #include "core/io/marshalls.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX] = { nullptr, nullptr }; diff --git a/core/os/input.cpp b/core/os/input.cpp index 187a7400c..2603ca740 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -32,7 +32,7 @@ #include "core/input_map.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/core/os/os.cpp b/core/os/os.cpp index 7b926d78d..3bf67d469 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -34,7 +34,7 @@ #include "core/os/file_access.h" #include "core/os/input.h" #include "core/os/midi_driver.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version_generated.gen.h" #include "servers/audio_server.h" diff --git a/core/os/os.h b/core/os/os.h index 25bf3dfea..386428a0e 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/image.h" #include "core/io/logger.h" #include "core/containers/list.h" diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 9438ce988..a1e9d4ed3 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -37,7 +37,7 @@ #include "core/crypto/aes_context.h" #include "core/crypto/crypto.h" #include "core/crypto/hashing_context.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/func_ref.h" #include "core/input_map.h" #include "core/io/config_file.h" @@ -69,7 +69,7 @@ #include "core/os/main_loop.h" #include "core/os/time.h" #include "core/containers/packed_data_container.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" #include "core/object/undo_redo.h" diff --git a/core/string/translation.cpp b/core/string/translation.cpp index 2d0cb230f..60a4604c5 100644 --- a/core/string/translation.cpp +++ b/core/string/translation.cpp @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" // ISO 639-1 language codes (and a couple of three-letter ISO 639-2 codes), // with the addition of glibc locales with their regional identifiers. diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index 876aa08e3..ddbb84f9f 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -33,7 +33,7 @@ #ifdef ALSA_ENABLED #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include diff --git a/drivers/coreaudio/audio_driver_coreaudio.cpp b/drivers/coreaudio/audio_driver_coreaudio.cpp index 06e32c901..ac5954f0c 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.cpp +++ b/drivers/coreaudio/audio_driver_coreaudio.cpp @@ -33,7 +33,7 @@ #include "audio_driver_coreaudio.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #define kOutputBus 0 #define kInputBus 1 diff --git a/drivers/gles2/rasterizer_canvas_base_gles2.cpp b/drivers/gles2/rasterizer_canvas_base_gles2.cpp index a7fbe8a3d..94a754b27 100644 --- a/drivers/gles2/rasterizer_canvas_base_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_base_gles2.cpp @@ -31,7 +31,7 @@ #include "rasterizer_canvas_base_gles2.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/gles_common/rasterizer_asserts.h" #include "rasterizer_scene_gles2.h" #include "servers/visual/visual_server_raster.h" diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 4abe74a24..d935c0857 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -31,7 +31,7 @@ #include "rasterizer_canvas_gles2.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles_common/rasterizer_asserts.h" #include "rasterizer_scene_gles2.h" diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 0645d6b26..81a16a9b3 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -31,7 +31,7 @@ #include "rasterizer_gles2.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #define _EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 #define _EXT_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp index 43922f530..de4a60357 100644 --- a/drivers/gles2/rasterizer_scene_gles2.cpp +++ b/drivers/gles2/rasterizer_scene_gles2.cpp @@ -33,7 +33,7 @@ #include "core/math/math_funcs.h" #include "core/math/transform.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/containers/vmap.h" #include "rasterizer_canvas_gles2.h" #include "servers/visual/visual_server_raster.h" diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index a4b6330e7..1ba6a1adf 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -31,7 +31,7 @@ #include "rasterizer_storage_gles2.h" #include "core/math/transform.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "rasterizer_canvas_gles2.h" #include "rasterizer_scene_gles2.h" #include "servers/visual/shader_language.h" diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 6b80a23d4..f070ec342 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -31,7 +31,7 @@ #include "shader_compiler_gles2.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/string_buffer.h" #include "core/string/string_builder.h" diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index 656a23486..3ac6e01cc 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -32,7 +32,7 @@ #include "core/os/memory.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/string_builder.h" #include "rasterizer_gles2.h" #include "rasterizer_storage_gles2.h" diff --git a/drivers/gles_common/rasterizer_canvas_batcher.h b/drivers/gles_common/rasterizer_canvas_batcher.h index c59eae667..8b0cbdf9d 100644 --- a/drivers/gles_common/rasterizer_canvas_batcher.h +++ b/drivers/gles_common/rasterizer_canvas_batcher.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "rasterizer_array.h" #include "rasterizer_asserts.h" #include "rasterizer_storage_common.h" diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 657539696..31c18593a 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -33,7 +33,7 @@ #ifdef PULSEAUDIO_ENABLED #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" #ifdef ALSAMIDI_ENABLED diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index dfa3ecac1..719a776a6 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -32,7 +32,7 @@ #ifdef UNIX_ENABLED -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "drivers/unix/net_socket_posix.h" diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index fcde0c05b..578b3fdbf 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -33,7 +33,7 @@ #include "audio_driver_wasapi.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include diff --git a/drivers/xaudio2/audio_driver_xaudio2.cpp b/drivers/xaudio2/audio_driver_xaudio2.cpp index 14b21d0f5..ec27743f0 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.cpp +++ b/drivers/xaudio2/audio_driver_xaudio2.cpp @@ -31,7 +31,7 @@ #include "audio_driver_xaudio2.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" const char *AudioDriverXAudio2::get_name() const { return "XAudio2"; diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 33307ee13..588781fae 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -34,7 +34,7 @@ #include "core/variant/array.h" #include "core/object/class_db.h" #include "core/math/color.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/error/error_macros.h" #include "core/math/basis.h" #include "core/math/math_funcs.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index ca3f13bec..05a79e2b0 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -35,7 +35,7 @@ #include "editor_node.h" #include "editor_scale.h" #include "scene/gui/margin_container.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/class_db.h" #include "core/math/color.h" #include "core/error/error_list.h" diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index c5dcb8479..24bdc175a 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -30,11 +30,11 @@ #include "doc_data.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/global_constants.h" #include "core/io/compression.h" #include "core/os/dir_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "core/string/translation.h" #include "core/version.h" diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 83db91a49..93b095f47 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -38,7 +38,7 @@ #include "filesystem_dock.h" #include "scene/resources/font.h" #include "servers/audio_server.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error/error_list.h" diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 209df2b25..6b12277cb 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -31,7 +31,7 @@ #include "editor_autoload_settings.h" #include "core/global_constants.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_node.h" #include "editor_scale.h" #include "project_settings_editor.h" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index d27c6866c..aea2a3995 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -37,7 +37,7 @@ #include "core/io/resource_loader.h" #include "core/os/file_access.h" #include "core/os/memory.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "editor_node.h" diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index e87cb1d0e..e278932a6 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -41,7 +41,7 @@ #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "core/version.h" #include "core/version_generated.gen.h" diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index c52d5366b..0d48d7e2d 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -44,7 +44,7 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/containers/pool_vector.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/typedefs.h" #include "dependency_editor.h" #include "editor_file_system.h" diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index cb6158e3b..512546372 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -35,7 +35,7 @@ #include "core/io/resource_saver.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/variant/variant_parser.h" #include "editor_node.h" #include "editor_resource_preview.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 2797256e6..75570022f 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -35,7 +35,7 @@ #include "core/variant/array.h" #include "core/object/class_db.h" #include "core/math/color.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/error/error_macros.h" #include "core/image.h" #include "core/io/config_file.h" @@ -56,7 +56,7 @@ #include "core/os/os.h" #include "core/containers/pool_vector.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "core/string/translation.h" #include "core/object/undo_redo.h" diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 628688fe4..4b0ddc124 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -49,7 +49,7 @@ #include "core/object_id.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/rid.h" #include "core/object/script_language.h" #include "core/typedefs.h" diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index dc829c650..915192014 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -36,7 +36,7 @@ #include "core/io/resource_saver.h" #include "core/object/message_queue.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_node.h" #include "editor_scale.h" #include "editor_settings.h" diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 83b4ef0fa..48f91b1e4 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -34,7 +34,7 @@ #include "plugins/script_editor_plugin.h" #include "script_editor_debugger.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_settings.h" #include "core/error/error_macros.h" #include "core/math/math_funcs.h" diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index bcd44a114..52009cfce 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -52,7 +52,7 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/containers/set.h" #include "core/string/translation.h" #include "core/typedefs.h" diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 1344ddb18..b75f78060 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -36,7 +36,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_node.h" #include "editor_resource_preview.h" #include "editor_scale.h" diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index 509f2e054..1fdcd40aa 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -32,7 +32,7 @@ #include "core/os/dir_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_node.h" #include "editor_scale.h" #include "scene/gui/box_container.h" diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp index 5498011dc..ade1e7fe8 100644 --- a/editor/import/resource_importer_layered_texture.cpp +++ b/editor/import/resource_importer_layered_texture.cpp @@ -34,7 +34,7 @@ #include "core/io/config_file.h" #include "core/io/image_loader.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "scene/resources/texture.h" diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 751cd275a..988573466 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -32,7 +32,7 @@ #include "core/io/config_file.h" #include "core/io/image_loader.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "scene/resources/texture.h" diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index f8d71d50b..58ca90dbb 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -36,7 +36,7 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/os/memory.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/reference.h" #include "core/string/string_name.h" #include "core/typedefs.h" diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 32d021af5..6b3acc918 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -30,7 +30,7 @@ #include "import_dock.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor_node.h" #include "editor_resource_preview.h" #include "editor_scale.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 243e0e03d..b4661adfe 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "core/io/resource_saver.h" #include "core/os/input.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/animation_track_editor.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 054d91fde..e67f40be3 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" @@ -54,7 +54,7 @@ #include "core/variant/array.h" #include "core/object/class_db.h" #include "core/math/color.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/error/error_list.h" #include "core/error/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index f1703eddc..b13eb4171 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -38,7 +38,7 @@ #include "scene/resources/material.h" #include "scene/resources/mesh.h" #include "servers/audio/audio_stream.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/variant/array.h" #include "core/object/class_db.h" #include "core/math/color.h" diff --git a/editor/plugins/room_manager_editor_plugin.cpp b/editor/plugins/room_manager_editor_plugin.cpp index b6640cd59..5bc189e7b 100644 --- a/editor/plugins/room_manager_editor_plugin.cpp +++ b/editor/plugins/room_manager_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "editor/spatial_editor_gizmos.h" #include "scene/resources/occluder_shape.h" #include "core/object/class_db.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/local_vector.h" #include "core/math/math_defs.h" #include "core/math/transform.h" diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 8274e25be..55372bf16 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_node.h" #include "editor/editor_run_script.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 91f1e9444..38577e861 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -45,7 +45,7 @@ #include "core/os/input_event.h" #include "core/os/keyboard.h" #include "core/os/memory.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "core/containers/set.h" #include "core/string/string_name.h" diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 2b819e2c8..538f7647d 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/variant/array.h" #include "core/object/class_db.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/resource_loader.h" #include "core/containers/map.h" #include "core/math/basis.h" @@ -48,7 +48,7 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/containers/pool_vector.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/rid_handle.h" #include "core/object/script_language.h" #include "core/containers/set.h" diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index 719e236aa..4780ee363 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -30,7 +30,7 @@ #include "theme_editor_preview.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/resources/packed_scene.h" #include "editor/editor_scale.h" #include "core/object/class_db.h" diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 49b0c76e6..9e1b079f8 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -38,7 +38,7 @@ #include "core/math/rect2.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/containers/set.h" #include "core/containers/vector.h" #include "editor/editor_export.h" diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index b49e16cc6..c63cf397b 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -32,7 +32,7 @@ #include "core/object/class_db.h" #include "core/math/color.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/error/error_list.h" #include "core/error/error_macros.h" #include "core/image.h" @@ -51,7 +51,7 @@ #include "core/os/os.h" #include "core/containers/pool_vector.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/containers/set.h" #include "core/containers/sort_array.h" #include "core/string/translation.h" diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 36cdaa9bb..f3a0aba65 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -32,7 +32,7 @@ #include "core/input_map.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" #include "editor/editor_export.h" #include "editor/editor_node.h" diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index fd20e4750..ecbdd46ce 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -54,7 +54,7 @@ #include "core/os/main_loop.h" #include "core/os/memory.h" #include "core/pair.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/ref_ptr.h" #include "core/object/resource.h" #include "core/rid.h" diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 42d8a54c5..21c44991f 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -44,7 +44,7 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/ref_ptr.h" #include "core/object/script_language.h" #include "core/string/string_name.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 5efae2612..7605cb251 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -39,7 +39,7 @@ #include "core/math/vector2.h" #include "core/os/dir_access.h" #include "core/os/memory.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/reference.h" #include "core/object/resource.h" #include "core/object/script_language.h" diff --git a/main/main.cpp b/main/main.cpp index 7db914600..52afb2664 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -42,7 +42,7 @@ #include "core/os/dir_access.h" #include "core/os/os.h" #include "core/os/time.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/register_core_types.h" #include "core/script_debugger_local.h" #include "core/object/script_language.h" diff --git a/main/main_timer_sync.h b/main/main_timer_sync.h index 1cc32d416..837a08fda 100644 --- a/main/main_timer_sync.h +++ b/main/main_timer_sync.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/engine.h" +#include "core/config/engine.h" // define these to get more debugging logs for the delta smoothing //#define PANDEMONIUM_DEBUG_DELTA_SMOOTHER diff --git a/modules/broken_seals_module/biome_terrarin_generator.cpp b/modules/broken_seals_module/biome_terrarin_generator.cpp index 4a3274e76..5242d0676 100644 --- a/modules/broken_seals_module/biome_terrarin_generator.cpp +++ b/modules/broken_seals_module/biome_terrarin_generator.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "biome_terrarin_generator.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/math_funcs.h" diff --git a/modules/cscript/cscript.cpp b/modules/cscript/cscript.cpp index 663010a16..6c174bf16 100644 --- a/modules/cscript/cscript.cpp +++ b/modules/cscript/cscript.cpp @@ -31,12 +31,12 @@ #include "cscript.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/global_constants.h" #include "core/io/file_access_encrypted.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "cscript_compiler.h" /////////////////////////// diff --git a/modules/cscript/cscript_editor.cpp b/modules/cscript/cscript_editor.cpp index 9d444daa0..8a47863c1 100644 --- a/modules/cscript/cscript_editor.cpp +++ b/modules/cscript/cscript_editor.cpp @@ -30,10 +30,10 @@ #include "cscript.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/global_constants.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "cscript_compiler.h" #ifdef TOOLS_ENABLED diff --git a/modules/cscript/cscript_parser.cpp b/modules/cscript/cscript_parser.cpp index 2a2786e14..39627f737 100644 --- a/modules/cscript/cscript_parser.cpp +++ b/modules/cscript/cscript_parser.cpp @@ -31,11 +31,11 @@ #include "cscript_parser.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/resource_loader.h" #include "core/os/file_access.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/reference.h" #include "core/object/script_language.h" #include "cscript.h" diff --git a/modules/database/register_types.cpp b/modules/database/register_types.cpp index c4bdde877..e40d91cc6 100644 --- a/modules/database/register_types.cpp +++ b/modules/database/register_types.cpp @@ -31,7 +31,7 @@ SOFTWARE. #include "query_result.h" #include "table_builder.h" -#include "core/engine.h" +#include "core/config/engine.h" DatabaseManager *_database_manager = nullptr; diff --git a/modules/entity_spell_system/database/ess_resource_db_folders.h b/modules/entity_spell_system/database/ess_resource_db_folders.h index 133c0f0b4..51371acbe 100644 --- a/modules/entity_spell_system/database/ess_resource_db_folders.h +++ b/modules/entity_spell_system/database/ess_resource_db_folders.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/bind/core_bind.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/hash_map.h" #include "core/string/ustring.h" #include "core/variant/variant.h" diff --git a/modules/entity_spell_system/database/ess_resource_db_map.h b/modules/entity_spell_system/database/ess_resource_db_map.h index 820f07282..8a38dc044 100644 --- a/modules/entity_spell_system/database/ess_resource_db_map.h +++ b/modules/entity_spell_system/database/ess_resource_db_map.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/bind/core_bind.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/hash_map.h" #include "core/string/ustring.h" #include "core/variant/variant.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.cpp b/modules/entity_spell_system/profiles/input/input_profile.cpp index 9b1c8fd6e..3fb6adc3a 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.cpp +++ b/modules/entity_spell_system/profiles/input/input_profile.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "input_profile.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/ustring.h" #include "../class_profile.h" diff --git a/modules/entity_spell_system/singletons/ess.cpp b/modules/entity_spell_system/singletons/ess.cpp index de09fc932..5d3a4012d 100644 --- a/modules/entity_spell_system/singletons/ess.cpp +++ b/modules/entity_spell_system/singletons/ess.cpp @@ -26,7 +26,7 @@ SOFTWARE. #include "../material_cache/ess_material_cache.h" #include "../spawners/ess_entity_spawner.h" #include "../utility/entity_create_info.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" ESS *ESS::instance; diff --git a/modules/entity_spell_system/singletons/ess.h b/modules/entity_spell_system/singletons/ess.h index c46c79699..795de4ad9 100644 --- a/modules/entity_spell_system/singletons/ess.h +++ b/modules/entity_spell_system/singletons/ess.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/bind/core_bind.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/object.h" #include "core/object/resource.h" #include "core/string/ustring.h" diff --git a/modules/entity_spell_system/singletons/profile_manager.cpp b/modules/entity_spell_system/singletons/profile_manager.cpp index 492b21bc1..c8f271ae9 100644 --- a/modules/entity_spell_system/singletons/profile_manager.cpp +++ b/modules/entity_spell_system/singletons/profile_manager.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "core/io/json.h" #include "core/os/file_access.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "../defines.h" diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 6062ccfa2..3cb5db3c1 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -31,12 +31,12 @@ #include "gdscript.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/global_constants.h" #include "core/io/file_access_encrypted.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "gdscript_compiler.h" /////////////////////////// diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index f578d6551..a6d97ac07 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -30,10 +30,10 @@ #include "gdscript.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/global_constants.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "gdscript_compiler.h" #ifdef TOOLS_ENABLED diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 184bf30bd..ed6cc2652 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -31,11 +31,11 @@ #include "gdscript_parser.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/resource_loader.h" #include "core/os/file_access.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/reference.h" #include "core/object/script_language.h" #include "gdscript.h" diff --git a/modules/material_maker/register_types.cpp b/modules/material_maker/register_types.cpp index 4a974fc25..ed3fbc64d 100644 --- a/modules/material_maker/register_types.cpp +++ b/modules/material_maker/register_types.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "algos/mm_algos.h" #include "algos/mm_algos_bind.h" diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp index fcf2f57a6..1b8aad4aa 100644 --- a/modules/mbedtls/crypto_mbedtls.cpp +++ b/modules/mbedtls/crypto_mbedtls.cpp @@ -32,10 +32,10 @@ #include "core/os/file_access.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/certs_compressed.gen.h" #include "core/io/compression.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/modules/mesh_utils/register_types.cpp b/modules/mesh_utils/register_types.cpp index 9a5f8c38e..093689d1a 100644 --- a/modules/mesh_utils/register_types.cpp +++ b/modules/mesh_utils/register_types.cpp @@ -24,7 +24,7 @@ SOFTWARE. #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "fast_quadratic_mesh_simplifier.h" #include "mesh_merger.h" diff --git a/modules/minimp3/register_types.cpp b/modules/minimp3/register_types.cpp index e3509b115..e33068796 100644 --- a/modules/minimp3/register_types.cpp +++ b/modules/minimp3/register_types.cpp @@ -33,7 +33,7 @@ #include "audio_stream_mp3.h" #ifdef TOOLS_ENABLED -#include "core/engine.h" +#include "core/config/engine.h" #include "resource_importer_mp3.h" #endif diff --git a/modules/navigation/register_types.cpp b/modules/navigation/register_types.cpp index 20110661b..aa1fd4b5a 100644 --- a/modules/navigation/register_types.cpp +++ b/modules/navigation/register_types.cpp @@ -30,7 +30,7 @@ #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "pandemonium_navigation_server.h" #include "servers/navigation_server.h" diff --git a/modules/network_synchronizer/networked_controller.cpp b/modules/network_synchronizer/networked_controller.cpp index 454e01ce5..09fa90998 100644 --- a/modules/network_synchronizer/networked_controller.cpp +++ b/modules/network_synchronizer/networked_controller.cpp @@ -34,11 +34,11 @@ #include "networked_controller.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/marshalls.h" #include "scene_synchronizer.h" #include -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/os/os.h" #define METADATA_SIZE 1 diff --git a/modules/network_synchronizer/register_types.cpp b/modules/network_synchronizer/register_types.cpp index cbdb6b9f9..60d1c55a3 100644 --- a/modules/network_synchronizer/register_types.cpp +++ b/modules/network_synchronizer/register_types.cpp @@ -39,7 +39,7 @@ #include "networked_controller.h" #include "scene_diff.h" #include "scene_synchronizer.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" void register_network_synchronizer_types() { diff --git a/modules/network_synchronizer/scene_synchronizer.cpp b/modules/network_synchronizer/scene_synchronizer.cpp index 3ea34a0cb..7a58fa735 100644 --- a/modules/network_synchronizer/scene_synchronizer.cpp +++ b/modules/network_synchronizer/scene_synchronizer.cpp @@ -35,7 +35,7 @@ #include "scene_synchronizer.h" #include "networked_controller.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/class_db.h" #include "scene_diff.h" #include "scene/main/viewport.h" diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp index 2e4bb2c6b..b912dc83b 100644 --- a/modules/props/prop_instance_merger.cpp +++ b/modules/props/prop_instance_merger.cpp @@ -7,7 +7,7 @@ #include "scene/resources/world.h" #include "servers/visual_server.h" -#include "core/engine.h" +#include "core/config/engine.h" #define VARIANT_ARRAY_GET(arr) \ Vector r; \ diff --git a/modules/props/prop_scene_instance.cpp b/modules/props/prop_scene_instance.cpp index a3487df9b..2cdda58c2 100644 --- a/modules/props/prop_scene_instance.cpp +++ b/modules/props/prop_scene_instance.cpp @@ -1,6 +1,6 @@ #include "prop_scene_instance.h" -#include "core/engine.h" +#include "core/config/engine.h" Ref PropSceneInstance::get_scene() { return _scene; diff --git a/modules/props/register_types.cpp b/modules/props/register_types.cpp index f3afc8185..bb9e34b88 100644 --- a/modules/props/register_types.cpp +++ b/modules/props/register_types.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "tiled_wall/tiled_wall.h" #include "tiled_wall/tiled_wall_data.h" diff --git a/modules/props/singleton/prop_cache.cpp b/modules/props/singleton/prop_cache.cpp index 5dd66c68d..bde658bd8 100644 --- a/modules/props/singleton/prop_cache.cpp +++ b/modules/props/singleton/prop_cache.cpp @@ -25,8 +25,8 @@ SOFTWARE. #include "../props/prop_data.h" #include "../props/prop_data_entry.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "../jobs/prop_texture_job.h" diff --git a/modules/props/singleton/prop_utils.cpp b/modules/props/singleton/prop_utils.cpp index 5e21e2bbf..760f1be9b 100644 --- a/modules/props/singleton/prop_utils.cpp +++ b/modules/props/singleton/prop_utils.cpp @@ -36,7 +36,7 @@ SOFTWARE. #include "../../mesh_data_resource/nodes/mesh_data_instance.h" #endif -#include "core/engine.h" +#include "core/config/engine.h" PropUtils *PropUtils::_instance; Vector> PropUtils::_processors; diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index b113235b9..e1f766813 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -6,7 +6,7 @@ #include "scene/resources/world_2d.h" #include "servers/physics_server.h" -#include "core/engine.h" +#include "core/config/engine.h" #define VARIANT_ARRAY_GET(arr) \ Vector r; \ diff --git a/modules/props_2d/prop_2d_scene_instance.cpp b/modules/props_2d/prop_2d_scene_instance.cpp index 70439a01b..37256adf0 100644 --- a/modules/props_2d/prop_2d_scene_instance.cpp +++ b/modules/props_2d/prop_2d_scene_instance.cpp @@ -1,6 +1,6 @@ #include "prop_2d_scene_instance.h" -#include "core/engine.h" +#include "core/config/engine.h" Ref Prop2DSceneInstance::get_scene() { return _scene; diff --git a/modules/props_2d/register_types.cpp b/modules/props_2d/register_types.cpp index 0f0c7fb3f..d789855f3 100644 --- a/modules/props_2d/register_types.cpp +++ b/modules/props_2d/register_types.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "tiled_wall/tiled_wall_2d.h" #include "tiled_wall/tiled_wall_2d_data.h" diff --git a/modules/props_2d/singleton/prop_2d_cache.cpp b/modules/props_2d/singleton/prop_2d_cache.cpp index c1ee9c030..52574b0d0 100644 --- a/modules/props_2d/singleton/prop_2d_cache.cpp +++ b/modules/props_2d/singleton/prop_2d_cache.cpp @@ -25,8 +25,8 @@ SOFTWARE. #include "../props/prop_2d_data.h" #include "../props/prop_2d_data_entry.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "../jobs/prop_2d_texture_job.h" diff --git a/modules/props_2d/singleton/prop_2d_utils.cpp b/modules/props_2d/singleton/prop_2d_utils.cpp index cc4982e02..ccbdc938b 100644 --- a/modules/props_2d/singleton/prop_2d_utils.cpp +++ b/modules/props_2d/singleton/prop_2d_utils.cpp @@ -36,7 +36,7 @@ SOFTWARE. #include "../../mesh_data_resource/nodes/mesh_data_instance.h" #endif -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/2d/node_2d.h" diff --git a/modules/rtile_map/tile_set.cpp b/modules/rtile_map/tile_set.cpp index ce34abf29..90cfa7cc7 100644 --- a/modules/rtile_map/tile_set.cpp +++ b/modules/rtile_map/tile_set.cpp @@ -30,7 +30,7 @@ #include "tile_set.h" #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" bool RTileSet::_set(const StringName &p_name, const Variant &p_value) { String n = p_name; diff --git a/modules/stb_vorbis/register_types.cpp b/modules/stb_vorbis/register_types.cpp index d4c6b0cd2..86560be66 100644 --- a/modules/stb_vorbis/register_types.cpp +++ b/modules/stb_vorbis/register_types.cpp @@ -33,7 +33,7 @@ #include "audio_stream_ogg_vorbis.h" #ifdef TOOLS_ENABLED -#include "core/engine.h" +#include "core/config/engine.h" #include "resource_importer_ogg_vorbis.h" #endif diff --git a/modules/terraman/world/default/terrain_chunk_default.h b/modules/terraman/world/default/terrain_chunk_default.h index bcc1999c0..400ec60e1 100644 --- a/modules/terraman/world/default/terrain_chunk_default.h +++ b/modules/terraman/world/default/terrain_chunk_default.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/string/ustring.h" #include "../terrain_chunk.h" diff --git a/modules/terraman/world/terrain_chunk.h b/modules/terraman/world/terrain_chunk.h index 53a51c073..140225fc2 100644 --- a/modules/terraman/world/terrain_chunk.h +++ b/modules/terraman/world/terrain_chunk.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/resource.h" #include "core/string/ustring.h" diff --git a/modules/terraman/world/terrain_world.h b/modules/terraman/world/terrain_world.h index 0896ee23b..e190e2c39 100644 --- a/modules/terraman/world/terrain_world.h +++ b/modules/terraman/world/terrain_world.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/hash_map.h" #include "../defines.h" diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.h b/modules/terraman_2d/world/default/terrain_2d_chunk_default.h index c5005dd39..72fd28dfe 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.h +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/string/ustring.h" #include "../terrain_2d_chunk.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h index 43c09a1f3..13a3a3dc6 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.h +++ b/modules/terraman_2d/world/terrain_2d_chunk.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/resource.h" #include "core/string/ustring.h" diff --git a/modules/terraman_2d/world/terrain_2d_world.h b/modules/terraman_2d/world/terrain_2d_world.h index 18a4bf024..67a45d47c 100644 --- a/modules/terraman_2d/world/terrain_2d_world.h +++ b/modules/terraman_2d/world/terrain_2d_world.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/hash_map.h" #include "../defines.h" diff --git a/modules/text_editor/text_file_editor.cpp b/modules/text_editor/text_file_editor.cpp index 19e2d27e6..61e922cf3 100644 --- a/modules/text_editor/text_file_editor.cpp +++ b/modules/text_editor/text_file_editor.cpp @@ -2,7 +2,7 @@ #include "text_file_editor.h" #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/math_defs.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" diff --git a/modules/texture_packer/texture_merger.h b/modules/texture_packer/texture_merger.h index 6badae40f..6ea46360b 100644 --- a/modules/texture_packer/texture_merger.h +++ b/modules/texture_packer/texture_merger.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/vector.h" #include "scene/main/node.h" diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index b2dc30d8e..fa569b8cc 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -31,7 +31,7 @@ #include "video_stream_theora.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "thirdparty/misc/yuv2rgb.h" diff --git a/modules/thread_pool/register_types.cpp b/modules/thread_pool/register_types.cpp index d055ba1f3..d5f59e8a7 100644 --- a/modules/thread_pool/register_types.cpp +++ b/modules/thread_pool/register_types.cpp @@ -24,7 +24,7 @@ SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "thread_pool.h" #include "thread_pool_execute_job.h" diff --git a/modules/thread_pool/thread_pool.cpp b/modules/thread_pool/thread_pool.cpp index ac07d3a33..e372cdeb6 100644 --- a/modules/thread_pool/thread_pool.cpp +++ b/modules/thread_pool/thread_pool.cpp @@ -24,8 +24,8 @@ SOFTWARE. */ -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/os/os.h" #include "scene/main/scene_tree.h" diff --git a/modules/ui_extensions/input_map_editor.cpp b/modules/ui_extensions/input_map_editor.cpp index f5d23c6ee..89bb80eb5 100644 --- a/modules/ui_extensions/input_map_editor.cpp +++ b/modules/ui_extensions/input_map_editor.cpp @@ -31,7 +31,7 @@ #include "input_map_editor.h" #include "core/global_constants.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" #include "core/string/ustring.h" diff --git a/modules/ui_extensions/touch_button.h b/modules/ui_extensions/touch_button.h index 2f3eca607..710ecfe39 100644 --- a/modules/ui_extensions/touch_button.h +++ b/modules/ui_extensions/touch_button.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/os/os.h" #include "scene/gui/button.h" diff --git a/modules/users/managers/user_manager.cpp b/modules/users/managers/user_manager.cpp index d46d9739f..931c85538 100644 --- a/modules/users/managers/user_manager.cpp +++ b/modules/users/managers/user_manager.cpp @@ -1,6 +1,6 @@ #include "user_manager.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "../singleton/user_db.h" #include "../users/user.h" diff --git a/modules/users/managers/user_manager_file.cpp b/modules/users/managers/user_manager_file.cpp index 286558974..edfc9d1d1 100644 --- a/modules/users/managers/user_manager_file.cpp +++ b/modules/users/managers/user_manager_file.cpp @@ -1,6 +1,6 @@ #include "user_manager_file.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/os/dir_access.h" diff --git a/modules/users/register_types.cpp b/modules/users/register_types.cpp index eb331b0e6..547191294 100644 --- a/modules/users/register_types.cpp +++ b/modules/users/register_types.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "register_types.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "users/user.h" #include "users/user_module.h" diff --git a/modules/voxelman/world/default/voxel_chunk_default.h b/modules/voxelman/world/default/voxel_chunk_default.h index 93805df09..b87e56e09 100644 --- a/modules/voxelman/world/default/voxel_chunk_default.h +++ b/modules/voxelman/world/default/voxel_chunk_default.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/string/ustring.h" #include "../voxel_chunk.h" diff --git a/modules/voxelman/world/voxel_chunk.h b/modules/voxelman/world/voxel_chunk.h index 50b1f9edc..0b3d9daee 100644 --- a/modules/voxelman/world/voxel_chunk.h +++ b/modules/voxelman/world/voxel_chunk.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/resource.h" #include "core/string/ustring.h" diff --git a/modules/voxelman/world/voxel_world.h b/modules/voxelman/world/voxel_world.h index 399118f3d..7b605659a 100644 --- a/modules/voxelman/world/voxel_world.h +++ b/modules/voxelman/world/voxel_world.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/hash_map.h" #include "../defines.h" diff --git a/modules/web/file_cache.cpp b/modules/web/file_cache.cpp index bc1de4d4e..e85358cd0 100644 --- a/modules/web/file_cache.cpp +++ b/modules/web/file_cache.cpp @@ -4,7 +4,7 @@ #include "core/os/file_access.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" String FileCache::get_wwwroot() { return _wwwroot_orig; diff --git a/modules/web/http_server_simple/http_server_simple.h b/modules/web/http_server_simple/http_server_simple.h index d16ac19ea..748628b20 100644 --- a/modules/web/http_server_simple/http_server_simple.h +++ b/modules/web/http_server_simple/http_server_simple.h @@ -39,7 +39,7 @@ #include "core/os/semaphore.h" #include "core/containers/vector.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "../http/http_server_enums.h" diff --git a/modules/web/http_server_simple/web_server_simple.h b/modules/web/http_server_simple/web_server_simple.h index 9f56646fc..1efcf1e94 100644 --- a/modules/web/http_server_simple/web_server_simple.h +++ b/modules/web/http_server_simple/web_server_simple.h @@ -39,7 +39,7 @@ #include "../http/web_server.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" class HTTPServerSimple; diff --git a/modules/web/nodes/paged_article/paged_article_web_page.cpp b/modules/web/nodes/paged_article/paged_article_web_page.cpp index d289433c0..e3402a521 100644 --- a/modules/web/nodes/paged_article/paged_article_web_page.cpp +++ b/modules/web/nodes/paged_article/paged_article_web_page.cpp @@ -2,7 +2,7 @@ #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "../../file_cache.h" #include "../../html/markdown_renderer.h" diff --git a/modules/web/nodes/paged_article/paged_articles_web_page.cpp b/modules/web/nodes/paged_article/paged_articles_web_page.cpp index 4b4818422..e13a8bd21 100644 --- a/modules/web/nodes/paged_article/paged_articles_web_page.cpp +++ b/modules/web/nodes/paged_article/paged_articles_web_page.cpp @@ -2,7 +2,7 @@ #include "core/os/dir_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "../../html/html_builder.h" #include "../../http/web_server_request.h" diff --git a/modules/web/register_types.cpp b/modules/web/register_types.cpp index a03e27a40..d9557692c 100644 --- a/modules/web/register_types.cpp +++ b/modules/web/register_types.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "register_types.h" -//#include "core/engine.h" +//#include "core/config/engine.h" #include "file_cache.h" diff --git a/modules/websocket/emws_client.cpp b/modules/websocket/emws_client.cpp index ce56a011d..abb3c096f 100644 --- a/modules/websocket/emws_client.cpp +++ b/modules/websocket/emws_client.cpp @@ -32,7 +32,7 @@ #include "emws_client.h" #include "core/io/ip.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "emscripten.h" void EMWSClient::_esws_on_connect(void *obj, char *proto) { diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp index 5c7579146..28edd2031 100644 --- a/modules/websocket/register_types.cpp +++ b/modules/websocket/register_types.cpp @@ -30,7 +30,7 @@ #include "register_types.h" #include "core/error/error_macros.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #ifdef JAVASCRIPT_ENABLED #include "emscripten.h" #include "emws_client.h" diff --git a/modules/websocket/wsl_client.cpp b/modules/websocket/wsl_client.cpp index 976c21533..e2751ca5b 100644 --- a/modules/websocket/wsl_client.cpp +++ b/modules/websocket/wsl_client.cpp @@ -32,7 +32,7 @@ #include "wsl_client.h" #include "core/io/ip.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" void WSLClient::_do_handshake() { if (_requested < _request.size() - 1) { diff --git a/modules/websocket/wsl_server.cpp b/modules/websocket/wsl_server.cpp index c24077fbe..cdd79829b 100644 --- a/modules/websocket/wsl_server.cpp +++ b/modules/websocket/wsl_server.cpp @@ -32,7 +32,7 @@ #include "wsl_server.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" WSLServer::PendingPeer::PendingPeer() { use_ssl = false; diff --git a/platform/android/api/api.cpp b/platform/android/api/api.cpp index 78c2e503c..d2fee5398 100644 --- a/platform/android/api/api.cpp +++ b/platform/android/api/api.cpp @@ -30,7 +30,7 @@ #include "api.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "java_class_wrapper.h" #include "jni_singleton.h" diff --git a/platform/android/api/jni_singleton.h b/platform/android/api/jni_singleton.h index 5b3f0ff3c..40551aa1d 100644 --- a/platform/android/api/jni_singleton.h +++ b/platform/android/api/jni_singleton.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include +#include #include #ifdef ANDROID_ENABLED #include diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index b046301e1..fa512dcd5 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -35,7 +35,7 @@ #include "core/os/dir_access.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/safe_refcount.h" #include "core/version.h" #include "drivers/png/png_driver_common.h" diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp index f5283117a..d93c459e6 100644 --- a/platform/android/export/gradle_export_util.cpp +++ b/platform/android/export/gradle_export_util.cpp @@ -30,7 +30,7 @@ #include "gradle_export_util.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" int _get_android_orientation_value(OS::ScreenOrientation screen_orientation) { switch (screen_orientation) { diff --git a/platform/android/export/pandemonium_plugin_config.h b/platform/android/export/pandemonium_plugin_config.h index 080df2f98..f1afa3943 100644 --- a/platform/android/export/pandemonium_plugin_config.h +++ b/platform/android/export/pandemonium_plugin_config.h @@ -33,7 +33,7 @@ #include "core/error/error_list.h" #include "core/io/config_file.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/ustring.h" /* diff --git a/platform/android/java_pandemonium_lib_jni.cpp b/platform/android/java_pandemonium_lib_jni.cpp index e9dcf1397..b38151664 100644 --- a/platform/android/java_pandemonium_lib_jni.cpp +++ b/platform/android/java_pandemonium_lib_jni.cpp @@ -36,8 +36,8 @@ #include "android_input_handler.h" #include "api/java_class_wrapper.h" #include "api/jni_singleton.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "dir_access_jandroid.h" #include "file_access_android.h" #include "file_access_filesystem_jandroid.h" diff --git a/platform/android/jni_utils.h b/platform/android/jni_utils.h index 8ad168b2f..fdccaa36f 100644 --- a/platform/android/jni_utils.h +++ b/platform/android/jni_utils.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "string_android.h" -#include +#include #include #include diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 845763a51..2943edc86 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -31,7 +31,7 @@ #include "os_android.h" #include "core/variant/array.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/gles2/rasterizer_gles2.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" diff --git a/platform/android/plugin/pandemonium_plugin_jni.cpp b/platform/android/plugin/pandemonium_plugin_jni.cpp index 4545bc239..891a31a51 100644 --- a/platform/android/plugin/pandemonium_plugin_jni.cpp +++ b/platform/android/plugin/pandemonium_plugin_jni.cpp @@ -30,7 +30,7 @@ #include "pandemonium_plugin_jni.h" -#include +#include #include #include #include diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index 4ccf016f4..e716c03fe 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -64,7 +64,7 @@ typedef AudioDriver AudioDriverSW; #define INPUT_EVENT_REF(t) Ref #define joystick_linux JoypadLinux -#include "core/project_settings.h" +#include "core/config/project_settings.h" #define PROJECT_SETTINGS \ ProjectSettings *project_settings = ProjectSettings::get_singleton(); diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 4501ee630..860fbec40 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -30,7 +30,7 @@ #import "app_delegate.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" #import "pandemonium_view.h" #include "main/main.h" diff --git a/platform/iphone/display_layer.mm b/platform/iphone/display_layer.mm index e07dc26f9..f9f82a078 100644 --- a/platform/iphone/display_layer.mm +++ b/platform/iphone/display_layer.mm @@ -31,7 +31,7 @@ #import "display_layer.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "main/main.h" #include "os_iphone.h" #include "servers/audio_server.h" diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 41c41ac09..c0701e976 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -35,7 +35,7 @@ #include "core/io/zip_io.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/safe_refcount.h" #include "core/version.h" #include "editor/editor_export.h" diff --git a/platform/iphone/joypad_iphone.mm b/platform/iphone/joypad_iphone.mm index bcdc42f77..6acc25767 100644 --- a/platform/iphone/joypad_iphone.mm +++ b/platform/iphone/joypad_iphone.mm @@ -30,7 +30,7 @@ #import "joypad_iphone.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" #import "pandemonium_view.h" #include "main/main.h" diff --git a/platform/iphone/os_iphone.mm b/platform/iphone/os_iphone.mm index 0428f059a..7e7a0e78d 100644 --- a/platform/iphone/os_iphone.mm +++ b/platform/iphone/os_iphone.mm @@ -41,7 +41,7 @@ #include "core/io/file_access_pack.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "drivers/unix/syslog_logger.h" #import "app_delegate.h" diff --git a/platform/iphone/pandemonium_view.mm b/platform/iphone/pandemonium_view.mm index 29a26a4bb..cf603188e 100644 --- a/platform/iphone/pandemonium_view.mm +++ b/platform/iphone/pandemonium_view.mm @@ -30,7 +30,7 @@ #import "pandemonium_view.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "os_iphone.h" #include "servers/audio_server.h" diff --git a/platform/iphone/pandemonium_view_gesture_recognizer.mm b/platform/iphone/pandemonium_view_gesture_recognizer.mm index 83097b84a..f354c6def 100644 --- a/platform/iphone/pandemonium_view_gesture_recognizer.mm +++ b/platform/iphone/pandemonium_view_gesture_recognizer.mm @@ -31,7 +31,7 @@ #import "pandemonium_view_gesture_recognizer.h" #import "pandemonium_view.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" // Minimum distance for touches to move to fire // a delay timer before scheduled time. diff --git a/platform/iphone/pandemonium_view_renderer.mm b/platform/iphone/pandemonium_view_renderer.mm index 854c56013..b2c9ba3bb 100644 --- a/platform/iphone/pandemonium_view_renderer.mm +++ b/platform/iphone/pandemonium_view_renderer.mm @@ -31,7 +31,7 @@ #import "pandemonium_view_renderer.h" #include "core/os/keyboard.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "main/main.h" #include "os_iphone.h" #include "servers/audio_server.h" diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm index 37c0bddc6..d79ccce4c 100644 --- a/platform/iphone/view_controller.mm +++ b/platform/iphone/view_controller.mm @@ -30,7 +30,7 @@ #import "view_controller.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #import "pandemonium_view.h" #import "pandemonium_view_renderer.h" #import "keyboard_input_view.h" diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp index aa05f5898..e24647012 100644 --- a/platform/javascript/api/api.cpp +++ b/platform/javascript/api/api.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "api.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "javascript_singleton.h" #include "javascript_tools_editor_plugin.h" diff --git a/platform/javascript/api/javascript_tools_editor_plugin.cpp b/platform/javascript/api/javascript_tools_editor_plugin.cpp index 52ddd247e..4daa4925f 100644 --- a/platform/javascript/api/javascript_tools_editor_plugin.cpp +++ b/platform/javascript/api/javascript_tools_editor_plugin.cpp @@ -31,10 +31,10 @@ #if defined(TOOLS_ENABLED) && defined(JAVASCRIPT_ENABLED) #include "javascript_tools_editor_plugin.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_node.h" #include diff --git a/platform/javascript/audio_driver_javascript.cpp b/platform/javascript/audio_driver_javascript.cpp index cc7c475a2..03611afe9 100644 --- a/platform/javascript/audio_driver_javascript.cpp +++ b/platform/javascript/audio_driver_javascript.cpp @@ -30,7 +30,7 @@ #include "audio_driver_javascript.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 73453cca2..1158c1c9b 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -41,7 +41,7 @@ #include "platform/javascript/logo.gen.h" #include "platform/javascript/run_icon.gen.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_settings.h" class EditorHTTPServer : public Reference { diff --git a/platform/osx/crash_handler_osx.mm b/platform/osx/crash_handler_osx.mm index c0e5a5c7c..c8da1b936 100644 --- a/platform/osx/crash_handler_osx.mm +++ b/platform/osx/crash_handler_osx.mm @@ -32,7 +32,7 @@ #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index da1de0fee..c42fb2104 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -37,7 +37,7 @@ #include "core/os/dir_access.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" #include "editor/editor_export.h" #include "editor/editor_node.h" diff --git a/platform/windows/crash_handler_windows.cpp b/platform/windows/crash_handler_windows.cpp index ffecaa795..330a8b372 100644 --- a/platform/windows/crash_handler_windows.cpp +++ b/platform/windows/crash_handler_windows.cpp @@ -32,7 +32,7 @@ #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index ee75304c0..1acc3f2be 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -37,7 +37,7 @@ #include "editor/editor_settings.h" #include "platform/windows/logo.gen.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" class EditorExportPlatformWindows : public EditorExportPlatformPC { Error _rcedit_add_data(const Ref &p_preset, const String &p_path); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index d16ae089b..4a009b056 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -33,7 +33,7 @@ #include "context_gl_windows.h" #include "core/os/input.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "crash_handler_windows.h" #include "drivers/unix/ip_unix.h" #include "drivers/wasapi/audio_driver_wasapi.h" diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index 57653df3c..e2d35ea4b 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -32,7 +32,7 @@ #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" #include "main/main.h" diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 46173f5bc..a6b5d0259 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -30,7 +30,7 @@ #include "audio_stream_player_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/2d/area_2d.h" #include "scene/2d/listener_2d.h" #include "scene/main/viewport.h" diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 1c168b549..f6daf6faa 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -30,7 +30,7 @@ #include "camera_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/math_funcs.h" #include "scene/main/viewport.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 805f48005..9fcdbdf48 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -31,7 +31,7 @@ #include "collision_polygon_2d.h" #include "collision_object_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/2d/area_2d.h" #include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index bfa56bef3..804f5f3d0 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -31,7 +31,7 @@ #include "collision_shape_2d.h" #include "collision_object_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/2d/area_2d.h" #include "scene/resources/capsule_shape_2d.h" #include "scene/resources/circle_shape_2d.h" diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index c3939278d..4333e9a9b 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -30,7 +30,7 @@ #include "joints_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "physics_body_2d.h" #include "scene/scene_string_names.h" #include "servers/physics_2d_server.h" diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 088a33c47..0cccb7fc5 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -30,7 +30,7 @@ #include "light_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "servers/visual_server.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 807e93d63..e2302ee8f 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -30,7 +30,7 @@ #include "light_occluder_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #define LINE_GRAB_WIDTH 8 diff --git a/scene/2d/navigation_agent_2d.cpp b/scene/2d/navigation_agent_2d.cpp index 0e76e018f..c88b9b1bd 100644 --- a/scene/2d/navigation_agent_2d.cpp +++ b/scene/2d/navigation_agent_2d.cpp @@ -30,7 +30,7 @@ #include "navigation_agent_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/vector.h" #include "scene/2d/navigation_2d.h" #include "scene/resources/world_2d.h" diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index b47d96c60..8217ebebe 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -31,7 +31,7 @@ #include "navigation_polygon.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/os/mutex.h" #include "navigation_2d.h" #include "scene/resources/navigation_mesh.h" diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 8e50c73d1..a5ff89c34 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -30,7 +30,7 @@ #include "parallax_layer.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "parallax_background.h" void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index e67981f7d..ec438962d 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -30,7 +30,7 @@ #include "path_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/resources/curve.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 804f57fec..33496c06c 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -31,12 +31,12 @@ #include "physics_body_2d.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/list.h" #include "core/math/math_funcs.h" #include "core/object/method_bind_ext.gen.inc" #include "core/object/object.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/rid.h" #include "scene/resources/physics_material.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp index cfb4e6bd8..a7b56fa70 100644 --- a/scene/2d/position_2d.cpp +++ b/scene/2d/position_2d.cpp @@ -30,7 +30,7 @@ #include "position_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/resources/texture.h" const float DEFAULT_GIZMO_EXTENTS = 10.0; diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index d2a9ea9ee..dd39dbd91 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -31,7 +31,7 @@ #include "ray_cast_2d.h" #include "collision_object_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "physics_body_2d.h" #include "scene/resources/world_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index a09b777d6..256d8904d 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -30,7 +30,7 @@ #include "visibility_notifier_2d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/2d/animated_sprite.h" #include "scene/2d/physics_body_2d.h" #include "scene/animation/animation_player.h" diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 025548061..d50f35047 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "audio_stream_player_3d.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/3d/area.h" #include "scene/3d/camera.h" #include "scene/3d/listener.h" diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index bc28903ff..3e400d154 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -31,7 +31,7 @@ #include "camera.h" #include "collision_object.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/projection.h" #include "scene/3d/spatial_velocity_tracker.h" #include "scene/main/viewport.h" diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index fa0a820b6..d9b7bacc8 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -30,7 +30,7 @@ #include "collision_object.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "mesh_instance.h" #include "scene/resources/mesh.h" #include "scene/resources/world.h" diff --git a/scene/3d/interpolated_camera.cpp b/scene/3d/interpolated_camera.cpp index f805aa9ae..8aeda8c4e 100644 --- a/scene/3d/interpolated_camera.cpp +++ b/scene/3d/interpolated_camera.cpp @@ -30,7 +30,7 @@ #include "interpolated_camera.h" -#include "core/engine.h" +#include "core/config/engine.h" void InterpolatedCamera::_notification(int p_what) { switch (p_what) { diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 827396d3d..a934991da 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -30,8 +30,8 @@ #include "light.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "scene/resources/surface_tool.h" void Light::set_param(Param p_param, float p_value) { diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 76c11877d..49280000f 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -32,7 +32,7 @@ #include "collision_shape.h" #include "core/core_string_names.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "physics_body.h" #include "scene/3d/skeleton.h" #include "scene/resources/material.h" diff --git a/scene/3d/navigation_agent.cpp b/scene/3d/navigation_agent.cpp index 3959fb282..f7a79aa31 100644 --- a/scene/3d/navigation_agent.cpp +++ b/scene/3d/navigation_agent.cpp @@ -30,7 +30,7 @@ #include "navigation_agent.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/geometry.h" #include "scene/3d/navigation.h" #include "scene/resources/world.h" diff --git a/scene/3d/occluder.cpp b/scene/3d/occluder.cpp index 48ba3304b..5cae95206 100644 --- a/scene/3d/occluder.cpp +++ b/scene/3d/occluder.cpp @@ -30,7 +30,7 @@ #include "occluder.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/resources/occluder_shape.h" #include "scene/resources/world.h" #include "servers/visual/portals/portal_occlusion_culler.h" diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index 698bbc1d4..2ecd5c78c 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -30,7 +30,7 @@ #include "path.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/resources/curve.h" #include "scene/scene_string_names.h" diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 2f13f2b75..56b147643 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -31,11 +31,11 @@ #include "physics_body.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/list.h" #include "core/object/method_bind_ext.gen.inc" #include "core/object/object.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/rid.h" #include "scene/resources/physics_material.h" #include "scene/scene_string_names.h" diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 58c0644b0..a4ef6edd8 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -30,7 +30,7 @@ #include "portal.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "mesh_instance.h" #include "room.h" #include "room_group.h" diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index 51d15521b..4e5158d66 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -31,7 +31,7 @@ #include "ray_cast.h" #include "collision_object.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "mesh_instance.h" #include "scene/resources/material.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp index 7b1fe23fa..156a957ba 100644 --- a/scene/3d/room_manager.cpp +++ b/scene/3d/room_manager.cpp @@ -31,11 +31,11 @@ #include "room_manager.h" #include "core/bitfield_dynamic.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/geometry.h" #include "core/math/quick_hull.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_node.h" #include "mesh_instance.h" #include "multimesh_instance.h" diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index 8a001d586..cd5fd4683 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -32,8 +32,8 @@ #include "core/object/message_queue.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "scene/3d/physics_body.h" #include "scene/resources/skeleton_modification_3d.h" #include "scene/resources/skeleton_modification_stack_3d.h" diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index b7324a731..ceebd002a 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -30,7 +30,7 @@ #include "spatial.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/transform_interpolator.h" #include "core/object/message_queue.h" #include "scene/main/scene_tree.h" diff --git a/scene/3d/spatial_velocity_tracker.cpp b/scene/3d/spatial_velocity_tracker.cpp index cec5c39cf..a269458bc 100644 --- a/scene/3d/spatial_velocity_tracker.cpp +++ b/scene/3d/spatial_velocity_tracker.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "spatial_velocity_tracker.h" -#include "core/engine.h" +#include "core/config/engine.h" void SpatialVelocityTracker::set_track_physics_step(bool p_track_physics_step) { physics_step = p_track_physics_step; diff --git a/scene/3d/spring_arm.cpp b/scene/3d/spring_arm.cpp index 25b2764ce..f334b1ba1 100644 --- a/scene/3d/spring_arm.cpp +++ b/scene/3d/spring_arm.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "spring_arm.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/3d/collision_object.h" #include "scene/resources/shape.h" #include "scene/resources/sphere_shape.h" diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index 5cd6b9d75..689eace99 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -30,7 +30,7 @@ #include "visibility_notifier.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/3d/camera.h" #include "scene/3d/physics_body.h" #include "scene/animation/animation_player.h" diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 71e4ed771..804021e33 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -30,7 +30,7 @@ #include "animation_player.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/message_queue.h" #include "scene/2d/node_2d.h" #include "scene/3d/skeleton.h" diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index fc7875400..e2ae28df1 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -32,7 +32,7 @@ #include "animation_blend_tree.h" #include "animation_player.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/method_bind_ext.gen.inc" #include "scene/3d/skeleton.h" #include "scene/3d/spatial.h" diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index c4e9895e6..675144e6c 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -30,7 +30,7 @@ #include "audio_stream_player.h" -#include "core/engine.h" +#include "core/config/engine.h" void AudioStreamPlayer::_mix_to_bus(const AudioFrame *p_frames, int p_amount) { int bus_index = AudioServer::get_singleton()->thread_find_bus_index(bus); diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp index f68b9d5a4..475b8ae66 100644 --- a/scene/debugger/script_debugger_remote.cpp +++ b/scene/debugger/script_debugger_remote.cpp @@ -30,14 +30,14 @@ #include "script_debugger_remote.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/ip.h" #include "core/io/marshalls.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/os/input.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 4fc77ab6a..acea0c4da 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -34,7 +34,7 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/gui/label.h" #include "scene/gui/panel.h" #include "scene/gui/shortcut.h" diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index 978658d04..da7694b72 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -30,7 +30,7 @@ #include "item_list.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/gui/scroll_bar.h" void ItemList::add_item(const String &p_item, const Ref &p_texture, bool p_selectable) { diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 6336debc7..75518566b 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -30,7 +30,7 @@ #include "label.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" void Label::set_autowrap(bool p_autowrap) { diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index 2f868c91f..7e5270485 100644 --- a/scene/gui/nine_patch_rect.cpp +++ b/scene/gui/nine_patch_rect.cpp @@ -30,7 +30,7 @@ #include "nine_patch_rect.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "servers/visual_server.h" void NinePatchRect::_notification(int p_what) { diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 6845041ad..9e7127fd5 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -30,7 +30,7 @@ #include "popup.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/os/keyboard.h" void Popup::_gui_input(Ref p_event) { diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index b7d9e3f4f..83f1f8ece 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -33,7 +33,7 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/string/translation.h" #include "scene/gui/shortcut.h" #include "scene/main/timer.h" diff --git a/scene/gui/reference_rect.cpp b/scene/gui/reference_rect.cpp index 89ca7ed52..19a187429 100644 --- a/scene/gui/reference_rect.cpp +++ b/scene/gui/reference_rect.cpp @@ -30,7 +30,7 @@ #include "reference_rect.h" -#include "core/engine.h" +#include "core/config/engine.h" void ReferenceRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index f14b18d23..b51e97625 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -30,7 +30,7 @@ #include "scroll_container.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/main/viewport.h" #include "scroll_bar.h" diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 5aab1bda3..fdcf2b55d 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -34,7 +34,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "label.h" #include "scene/gui/popup_menu.h" diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp index d286fc491..ec1c1213f 100644 --- a/scene/gui/texture_progress.cpp +++ b/scene/gui/texture_progress.cpp @@ -30,7 +30,7 @@ #include "texture_progress.h" -#include "core/engine.h" +#include "core/config/engine.h" void TextureProgress::set_under_texture(const Ref &p_texture) { under = p_texture; diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 726aaa4ea..f0bdd31bd 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -35,7 +35,7 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/gui/line_edit.h" #include "scene/gui/popup_menu.h" #include "scene/gui/scroll_bar.h" diff --git a/scene/gui/viewport_container.cpp b/scene/gui/viewport_container.cpp index e748a6c10..051d525e0 100644 --- a/scene/gui/viewport_container.cpp +++ b/scene/gui/viewport_container.cpp @@ -30,7 +30,7 @@ #include "viewport_container.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "scene/main/viewport.h" Size2 ViewportContainer::get_minimum_size() const { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 9a3b3c102..ba73d258e 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -41,7 +41,7 @@ #include "viewport.h" #include "core/object/class_db.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #ifdef TOOLS_ENABLED diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 8b3cbaed8..66cded3b3 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -37,7 +37,7 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "main/input_default.h" #include "node.h" #include "scene/3d/spatial.h" diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 2cf21e0e4..1c7671949 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -30,7 +30,7 @@ #include "timer.h" -#include "core/engine.h" +#include "core/config/engine.h" void Timer::_notification(int p_what) { switch (p_what) { diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index f5079544f..05b23fef6 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -33,7 +33,7 @@ #include "core/core_string_names.h" #include "core/os/input.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/2d/camera_2d.h" #include "scene/2d/collision_object_2d.h" #include "scene/2d/listener_2d.h" diff --git a/scene/property_utils.cpp b/scene/property_utils.cpp index 0d366a697..023630ba7 100644 --- a/scene/property_utils.cpp +++ b/scene/property_utils.cpp @@ -31,7 +31,7 @@ #include "property_utils.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/containers/local_vector.h" #include "editor/editor_node.h" #include "scene/resources/packed_scene.h" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 79742f9a8..5186e1878 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -32,7 +32,7 @@ #include "core/object/class_db.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/2d/animated_sprite.h" #include "scene/2d/area_2d.h" #include "scene/2d/audio_stream_player_2d.h" diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index 5c85ed598..1f08d5add 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -30,7 +30,7 @@ #include "environment.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/resources/sky.h" #include "scene/resources/texture.h" #include "servers/visual_server.h" diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 5c33c65aa..cd6bd632f 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -30,8 +30,8 @@ #include "material.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/version.h" #include "scene/resources/texture.h" #include "servers/visual/shader_language.h" diff --git a/scene/resources/occluder_shape.cpp b/scene/resources/occluder_shape.cpp index dd47e3a84..4d770502f 100644 --- a/scene/resources/occluder_shape.cpp +++ b/scene/resources/occluder_shape.cpp @@ -30,7 +30,7 @@ #include "occluder_shape.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/transform.h" #include "servers/visual_server.h" diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 1c1994452..3a6457eec 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -31,9 +31,9 @@ #include "packed_scene.h" #include "core/core_string_names.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/io/resource_loader.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "editor/editor_inspector.h" #include "scene/2d/node_2d.h" #include "scene/3d/spatial.h" diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index ead1ecfcf..e32074139 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -32,7 +32,7 @@ #include "core/io/resource_format_binary.h" #include "core/os/dir_access.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/version.h" //version 2: changed names for basis, aabb, poolvectors, etc. diff --git a/scene/resources/shape_2d.cpp b/scene/resources/shape_2d.cpp index 1f47b59c2..806c62ed6 100644 --- a/scene/resources/shape_2d.cpp +++ b/scene/resources/shape_2d.cpp @@ -30,8 +30,8 @@ #include "shape_2d.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "servers/physics_2d_server.h" RID Shape2D::get_rid() const { diff --git a/scene/resources/world.cpp b/scene/resources/world.cpp index aa9f371ae..0fa62462f 100644 --- a/scene/resources/world.cpp +++ b/scene/resources/world.cpp @@ -32,7 +32,7 @@ #include "core/math/projection.h" #include "core/math/octree.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/3d/camera.h" #include "scene/3d/visibility_notifier.h" #include "scene/scene_string_names.h" diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index ff36937c5..4ab2dbf75 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -30,7 +30,7 @@ #include "world_2d.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/2d/camera_2d.h" #include "scene/2d/visibility_notifier_2d.h" #include "scene/main/viewport.h" diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h index b3e70d9ab..ae5306b7a 100644 --- a/scene/resources/world_2d.h +++ b/scene/resources/world_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/resource.h" #include "servers/physics_2d_server.h" diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp index 216df99ca..911f0434d 100644 --- a/servers/audio/audio_driver_dummy.cpp +++ b/servers/audio/audio_driver_dummy.cpp @@ -31,7 +31,7 @@ #include "audio_driver_dummy.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" Error AudioDriverDummy::init() { active = false; diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp index d92b3bd4a..fdf402a46 100644 --- a/servers/audio/audio_stream.cpp +++ b/servers/audio/audio_stream.cpp @@ -31,7 +31,7 @@ #include "audio_stream.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" ////////////////////////////// diff --git a/servers/audio/effects/audio_effect_capture.h b/servers/audio/effects/audio_effect_capture.h index 50fcaeef6..d35e5ebf8 100644 --- a/servers/audio/effects/audio_effect_capture.h +++ b/servers/audio/effects/audio_effect_capture.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/audio_frame.h" #include "core/containers/pool_vector.h" #include "core/object/reference.h" diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index b59ab9ee0..03a8dd98a 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -33,7 +33,7 @@ #include "core/io/resource_loader.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "scene/resources/audio_stream_sample.h" #include "servers/audio/audio_driver_dummy.h" #include "servers/audio/effects/audio_effect_compressor.h" diff --git a/servers/physics/broad_phase_bvh.cpp b/servers/physics/broad_phase_bvh.cpp index c61a6f098..e21489d46 100644 --- a/servers/physics/broad_phase_bvh.cpp +++ b/servers/physics/broad_phase_bvh.cpp @@ -30,7 +30,7 @@ #include "broad_phase_bvh.h" #include "collision_object_sw.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" BroadPhaseSW::ID BroadPhaseBVH::create(CollisionObjectSW *p_object, int p_subindex, const AABB &p_aabb, bool p_static) { uint32_t tree_id = p_static ? TREE_STATIC : TREE_DYNAMIC; diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index d214c98b0..424e2aa06 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -34,7 +34,7 @@ #include "broad_phase_bvh.h" #include "broad_phase_octree.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #include "joints/cone_twist_joint_sw.h" #include "joints/generic_6dof_joint_sw.h" diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp index a2fc07035..c34b057c8 100644 --- a/servers/physics/space_sw.cpp +++ b/servers/physics/space_sw.cpp @@ -31,7 +31,7 @@ #include "space_sw.h" #include "collision_solver_sw.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "physics_server_sw.h" #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001 diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 0ba72ba9e..e871595d0 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -37,7 +37,7 @@ #include "broad_phase_sw.h" #include "collision_object_sw.h" #include "core/containers/hash_map.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/typedefs.h" class PhysicsDirectSpaceStateSW : public PhysicsDirectSpaceState { diff --git a/servers/physics_2d/broad_phase_2d_bvh.cpp b/servers/physics_2d/broad_phase_2d_bvh.cpp index 258bf6ee7..c879142c0 100644 --- a/servers/physics_2d/broad_phase_2d_bvh.cpp +++ b/servers/physics_2d/broad_phase_2d_bvh.cpp @@ -30,7 +30,7 @@ #include "broad_phase_2d_bvh.h" #include "collision_object_2d_sw.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" BroadPhase2DSW::ID BroadPhase2DBVH::create(CollisionObject2DSW *p_object, int p_subindex, const Rect2 &p_aabb, bool p_static) { uint32_t tree_id = p_static ? TREE_STATIC : TREE_DYNAMIC; diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.cpp b/servers/physics_2d/broad_phase_2d_hash_grid.cpp index 5e25c3822..3fc3a8e3f 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.cpp +++ b/servers/physics_2d/broad_phase_2d_hash_grid.cpp @@ -30,7 +30,7 @@ #include "broad_phase_2d_hash_grid.h" #include "collision_object_2d_sw.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #define LARGE_ELEMENT_FI 1.01239812 diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index 476f78e8b..44d5c0a9b 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -34,7 +34,7 @@ #include "broad_phase_2d_hash_grid.h" #include "collision_solver_2d_sw.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/object/script_language.h" #define FLUSH_QUERY_CHECK(m_object) \ diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index 5e17678c6..ae3e68c22 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -32,7 +32,7 @@ #include "core/command_queue_mt.h" #include "core/os/thread.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/safe_refcount.h" #include "servers/physics_2d_server.h" diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h index 974cf293f..a95aa662a 100644 --- a/servers/physics_2d/space_2d_sw.h +++ b/servers/physics_2d/space_2d_sw.h @@ -37,7 +37,7 @@ #include "broad_phase_2d_sw.h" #include "collision_object_2d_sw.h" #include "core/containers/hash_map.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/typedefs.h" class Physics2DDirectSpaceStateSW : public Physics2DDirectSpaceState { diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index a3c42f6c6..7ea0dde84 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -32,7 +32,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" Physics2DServer *Physics2DServer::singleton = nullptr; diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index e95b7f73e..3bb5f0701 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -32,7 +32,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/string/print_string.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" PhysicsServer *PhysicsServer::singleton = nullptr; diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index dd8b0fe8b..42167d43d 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "register_server_types.h" -#include "core/engine.h" -#include "core/project_settings.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "audio/audio_effect.h" #include "audio/audio_stream.h" diff --git a/servers/visual/portals/portal_occlusion_culler.cpp b/servers/visual/portals/portal_occlusion_culler.cpp index 274d524f8..732159c74 100644 --- a/servers/visual/portals/portal_occlusion_culler.cpp +++ b/servers/visual/portals/portal_occlusion_culler.cpp @@ -30,9 +30,9 @@ #include "portal_occlusion_culler.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/math/aabb.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "portal_renderer.h" #include "servers/visual/visual_server_globals.h" #include "servers/visual/visual_server_scene.h" diff --git a/servers/visual/portals/portal_renderer.cpp b/servers/visual/portals/portal_renderer.cpp index 12b81ef7d..dee2e4a27 100644 --- a/servers/visual/portals/portal_renderer.cpp +++ b/servers/visual/portals/portal_renderer.cpp @@ -33,7 +33,7 @@ #include "portal_pvs_builder.h" #include "servers/visual/visual_server_globals.h" #include "servers/visual/visual_server_scene.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" bool PortalRenderer::use_occlusion_culling = true; diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 8da3b53bc..8a5e52290 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -32,7 +32,7 @@ #include "core/io/marshalls.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "core/containers/sort_array.h" #include "visual_server_canvas.h" #include "visual_server_globals.h" diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index cf6d53eb4..ab02d29b8 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -32,7 +32,7 @@ #include "core/math/transform_interpolator.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "visual_server_globals.h" #include "visual_server_raster.h" diff --git a/servers/visual/visual_server_viewport.cpp b/servers/visual/visual_server_viewport.cpp index e7f1cf0ba..58e6ca842 100644 --- a/servers/visual/visual_server_viewport.cpp +++ b/servers/visual/visual_server_viewport.cpp @@ -30,7 +30,7 @@ #include "visual_server_viewport.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "visual_server_canvas.h" #include "visual_server_globals.h" #include "visual_server_scene.h" diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp index 341f0e550..ddabcc09f 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/visual/visual_server_wrap_mt.cpp @@ -30,7 +30,7 @@ #include "visual_server_wrap_mt.h" #include "core/os/os.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" void VisualServerWrapMT::thread_exit() { exit.set(); diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index db5ab1036..53e123e11 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -30,9 +30,9 @@ #include "visual_server.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "core/object/method_bind_ext.gen.inc" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h"