diff --git a/core/SCsub b/core/SCsub index f94268f56..449347f01 100644 --- a/core/SCsub +++ b/core/SCsub @@ -201,6 +201,7 @@ SConscript("object/SCsub") SConscript("input/SCsub") SConscript("bind/SCsub") SConscript("scene/SCsub") +SConscript("servers/SCsub") # Build it all as a library lib = env.add_library("core", env.core_sources) diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index ac31ef23d..c8da522a6 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -80,6 +80,8 @@ #include "core/bind/logger_bind.h" #include "core/log/logger_backend.h" +#include "core/servers/rendering/rendering_server.h" + static Ref resource_saver_binary; static Ref resource_loader_binary; static Ref resource_format_importer; @@ -110,6 +112,16 @@ extern void unregister_global_constants(); extern void register_variant_methods(); extern void unregister_variant_methods(); +static bool has_server_feature_callback(const String &p_feature) { + if (RenderingServer::get_singleton()) { + if (RenderingServer::get_singleton()->has_os_feature(p_feature)) { + return true; + } + } + + return false; +} + void register_core_types() { OS::get_singleton()->benchmark_begin_measure("register_core_types"); @@ -265,6 +277,8 @@ void register_core_settings() { } void register_core_singletons() { + OS::get_singleton()->set_has_server_feature_callback(has_server_feature_callback); + ClassDB::register_class(); ClassDB::register_virtual_class(); ClassDB::register_class<_Geometry>(); @@ -285,6 +299,7 @@ void register_core_singletons() { ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class<_ScriptServer>(); + ClassDB::register_virtual_class(); Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton())); @@ -303,6 +318,7 @@ void register_core_singletons() { Engine::get_singleton()->add_singleton(Engine::Singleton("PLogger", _PLogger::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("ThreadPool", ThreadPool::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("ScriptServer", _ScriptServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton())); } void unregister_core_types() { diff --git a/core/servers/SCsub b/core/servers/SCsub new file mode 100644 index 000000000..7ff531135 --- /dev/null +++ b/core/servers/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +Import("env") + +env.add_source_files(env.core_sources, "rendering/*.cpp") +#env.add_source_files(env.core_sources, "*.cpp") diff --git a/servers/rendering_server.cpp b/core/servers/rendering/rendering_server.cpp similarity index 99% rename from servers/rendering_server.cpp rename to core/servers/rendering/rendering_server.cpp index 7d8b5b52d..11b44d251 100644 --- a/servers/rendering_server.cpp +++ b/core/servers/rendering/rendering_server.cpp @@ -34,10 +34,6 @@ #include "core/config/project_settings.h" #include "core/object/method_bind_ext.gen.inc" -#ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" -#endif - RenderingServer *RenderingServer::singleton = nullptr; RenderingServer *(*RenderingServer::create_func)() = nullptr; diff --git a/servers/rendering_server.h b/core/servers/rendering/rendering_server.h similarity index 100% rename from servers/rendering_server.h rename to core/servers/rendering/rendering_server.h diff --git a/servers/rendering_server_callbacks.cpp b/core/servers/rendering/rendering_server_callbacks.cpp similarity index 100% rename from servers/rendering_server_callbacks.cpp rename to core/servers/rendering/rendering_server_callbacks.cpp diff --git a/servers/rendering_server_callbacks.h b/core/servers/rendering/rendering_server_callbacks.h similarity index 100% rename from servers/rendering_server_callbacks.h rename to core/servers/rendering/rendering_server_callbacks.h diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 419b46e3e..6456eb80a 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -34,7 +34,7 @@ #include "core/containers/self_list.h" #include "scene/resources/mesh/mesh.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class RasterizerSceneDummy : public RasterizerScene { public: diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index a180c69b3..cb943b7cb 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -34,7 +34,7 @@ #include "core/string/string_builder.h" #include "servers/rendering/shader_language.h" #include "servers/rendering/shader_types.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class ShaderCompilerGLES2 { public: diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 0df7b2585..9d25e6c0e 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -38,7 +38,7 @@ #include "drivers/unix/net_socket_posix.h" #include "drivers/unix/sub_process_unix.h" #include "drivers/unix/thread_posix.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef __APPLE__ #include diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 9e0b174c4..e5207cebb 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -52,7 +52,7 @@ #include "core/containers/vector.h" #include "scene/animation/animation.h" #include "scene/resources/font/font.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" /// BOOL /// int AnimationTrackEditBool::get_key_height() const { diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 99063e3a3..3237ad335 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -66,7 +66,7 @@ #include "scene/resources/font/font.h" #include "scene/resources/packed_scene.h" #include "scene/resources/style_box.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Size2 EditorProperty::get_minimum_size() const { Size2 ms; diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index d43324ef2..c06c4ded2 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -190,7 +190,7 @@ #include "servers/navigation_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index e071db2e2..9f37d55f4 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -72,7 +72,7 @@ #include "scene/gui/tab_container.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index edad4d876..8c368dcc4 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -49,7 +49,7 @@ #include "core/object/script_language.h" #include "core/typedefs.h" #include "scene/main/control.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool EditorResourcePreviewGenerator::handles(const String &p_type) const { if (get_script_instance() && get_script_instance()->has_method("handles")) { diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 82faf46a8..09af02d09 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -81,7 +81,7 @@ #include "scene/main/viewport.h" #include "scene/animation/animation.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void AnimationPlayerEditor::_node_removed(Node *p_node) { if (player && player == p_node) { diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp index eb790d277..50c819e57 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/plugins/audio_stream_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "servers/audio/audio_stream.h" void AudioStreamEditor::_notification(int p_what) { diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index a0aaeba43..6dca42eee 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -98,7 +98,7 @@ #include "scene/resources/font/font.h" #include "scene/resources/packed_scene.h" #include "scene/resources/theme.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 123f4f0c4..f1948630a 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -66,7 +66,7 @@ #include "scene/resources/shader.h" #include "scene/resources/texture.h" #include "servers/audio_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void post_process_preview(Ref p_image) { if (p_image->get_format() != Image::FORMAT_RGBA8) { diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 39c2bf536..a542dcb40 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/resources/mesh/mesh.h" #include "scene/resources/shader.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class EditorNode; diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 8866b73cf..d7230b4fb 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -76,7 +76,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class EditorNode; class Node2D; diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index cdad23717..7bec17926 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -62,7 +62,7 @@ #include "scene/gui/spin_box.h" #include "scene/gui/tool_button.h" #include "scene/main/node.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" /** @author Mariano Suligoy diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 3b15b15f0..a53ce2e0f 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -97,7 +97,7 @@ #include "scene/resources/font/font.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void EditorResourceConversionPlugin::_bind_methods() { MethodInfo mi; diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 63d1e878c..1e1b18407 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -104,7 +104,7 @@ #include "scene/resources/mesh/surface_tool.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef MODULE_SKELETON_3D_ENABLED #include "modules/skeleton_3d/nodes/skeleton.h" diff --git a/editor_modules/shader_editor/shader_editor_plugin.cpp b/editor_modules/shader_editor/shader_editor_plugin.cpp index e5fbcea37..dba9a07f9 100644 --- a/editor_modules/shader_editor/shader_editor_plugin.cpp +++ b/editor_modules/shader_editor/shader_editor_plugin.cpp @@ -64,7 +64,7 @@ #include "scene/gui/resources/syntax_highlighter.h" #include "servers/rendering/shader_language.h" #include "servers/rendering/shader_types.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "editor_code_editor/editor_find_replace_bar.h" #include "editor_code_editor/editor_goto_line_dialog.h" diff --git a/main/input_default.cpp b/main/input_default.cpp index 7b7f5304f..e19d3ea9a 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -35,7 +35,7 @@ #include "core/os/os.h" #include "core/config/project_settings.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef DEV_ENABLED #include "core/os/thread.h" diff --git a/main/main.cpp b/main/main.cpp index e7c41eec2..2c288994d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -70,7 +70,7 @@ #include "servers/physics_2d_server.h" #include "servers/physics_server.h" #include "servers/register_server_types.h" -#include "servers/rendering_server_callbacks.h" +#include "core/servers/rendering/rendering_server_callbacks.h" #ifdef TOOLS_ENABLED #include "editor/doc/doc_data.h" diff --git a/main/performance.cpp b/main/performance.cpp index 5590315a2..8bbe8a3a1 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -38,7 +38,7 @@ #include "servers/navigation_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Performance *Performance::singleton = nullptr; diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 5a3c4989e..5c1e63b7c 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -37,7 +37,7 @@ #include "core/os/os.h" #include "core/string/print_string.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class TestPhysicsMainLoop : public MainLoop { GDCLASS(TestPhysicsMainLoop, MainLoop); diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index bf7c2ab4e..1b66800fd 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -36,7 +36,7 @@ #include "core/string/print_string.h" #include "scene/resources/texture.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" static const unsigned char convex_png[] = { 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x40, 0x8, 0x6, 0x0, 0x0, 0x0, 0xaa, 0x69, 0x71, 0xde, 0x0, 0x0, 0x0, 0x1, 0x73, 0x52, 0x47, 0x42, 0x0, 0xae, 0xce, 0x1c, 0xe9, 0x0, 0x0, 0x0, 0x6, 0x62, 0x4b, 0x47, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf9, 0x43, 0xbb, 0x7f, 0x0, 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0xb, 0x13, 0x0, 0x0, 0xb, 0x13, 0x1, 0x0, 0x9a, 0x9c, 0x18, 0x0, 0x0, 0x0, 0x7, 0x74, 0x49, 0x4d, 0x45, 0x7, 0xdb, 0x6, 0xa, 0x3, 0x13, 0x31, 0x66, 0xa7, 0xac, 0x79, 0x0, 0x0, 0x4, 0xef, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xed, 0x9b, 0xdd, 0x4e, 0x2a, 0x57, 0x14, 0xc7, 0xf7, 0x1e, 0xc0, 0x19, 0x38, 0x32, 0x80, 0xa, 0x6a, 0xda, 0x18, 0xa3, 0xc6, 0x47, 0x50, 0x7b, 0xa1, 0xd9, 0x36, 0x27, 0x7e, 0x44, 0xed, 0x45, 0x4d, 0x93, 0x3e, 0x40, 0x1f, 0x64, 0x90, 0xf4, 0x1, 0xbc, 0xf0, 0xc2, 0x9c, 0x57, 0x30, 0x4d, 0xbc, 0xa8, 0x6d, 0xc, 0x69, 0x26, 0xb5, 0x68, 0x8b, 0x35, 0x7e, 0x20, 0xb4, 0xf5, 0x14, 0xbf, 0x51, 0x3c, 0x52, 0xe, 0xc, 0xe, 0xc8, 0xf0, 0xb1, 0x7a, 0x51, 0x3d, 0xb1, 0x9e, 0x19, 0x1c, 0x54, 0x70, 0x1c, 0xdc, 0x9, 0x17, 0x64, 0x8, 0xc9, 0xff, 0xb7, 0xd6, 0x7f, 0xcd, 0x3f, 0x2b, 0xd9, 0x8, 0xbd, 0x9c, 0xda, 0x3e, 0xf8, 0x31, 0xff, 0xc, 0x0, 0x8, 0x42, 0x88, 0x9c, 0x9f, 0x9f, 0xbf, 0xa, 0x87, 0xc3, 0xad, 0x7d, 0x7d, 0x7d, 0x7f, 0x23, 0x84, 0x78, 0x8c, 0x31, 0xaf, 0x55, 0x0, 0xc6, 0xc7, 0x14, 0x1e, 0x8f, 0xc7, 0xbf, 0x38, 0x3c, 0x3c, 0x6c, 0x9b, 0x9f, 0x9f, 0x6f, 0xb8, 0x82, 0x9b, 0xee, 0xe8, 0xe8, 0xf8, 0x12, 0x0, 0xbe, 0xd3, 0x2a, 0x8, 0xfc, 0x50, 0xd1, 0xf9, 0x7c, 0x9e, 0x8a, 0x46, 0xa3, 0x5f, 0x9d, 0x9e, 0x9e, 0x7e, 0xb2, 0xb0, 0xb0, 0x60, 0xe5, 0x79, 0x1e, 0xf1, 0xfc, 0x7f, 0x3a, 0x9, 0x21, 0x88, 0x10, 0x82, 0x26, 0x26, 0x26, 0xde, 0x77, 0x75, 0x75, 0x85, 0x59, 0x96, 0xfd, 0x5e, 0x6b, 0x20, 0xf0, 0x7d, 0x85, 0x4b, 0x92, 0xf4, 0xfa, 0xe0, 0xe0, 0xe0, 0xd3, 0xb9, 0xb9, 0xb9, 0x46, 0x49, 0x92, 0xea, 0x6f, 0xa, 0xbf, 0x7d, 0x8, 0x21, 0x68, 0x70, 0x70, 0xb0, 0x38, 0x39, 0x39, 0x79, 0xd6, 0xd9, 0xd9, 0xb9, 0xcf, 0x30, 0xcc, 0xa2, 0xd6, 0xad, 0x21, 0x2b, 0x1c, 0x0, 0x38, 0x41, 0x10, 0xfc, 0xdb, 0xdb, 0xdb, 0x27, 0x1e, 0x8f, 0x27, 0x4b, 0x8, 0x1, 0x84, 0x90, 0xea, 0xf, 0x21, 0x4, 0x3c, 0x1e, 0x4f, 0x76, 0x67, 0x67, 0x67, 0x3f, 0x9f, 0xcf, 0xff, 0x7c, 0x5, 0xf3, 0xd9, 0x0, 0xe0, 0x2, 0x81, 0xc0, 0xa9, 0xdb, 0xed, 0x2e, 0x94, 0x2b, 0x5c, 0xe, 0xc4, 0xca, 0xca, 0x8a, 0x18, 0x8d, 0x46, 0x3, 0x0, 0xc0, 0x69, 0x1e, 0x4, 0x0, 0x90, 0x48, 0x24, 0x12, 0xe4, 0x38, 0xee, 0x41, 0xc2, 0x6f, 0x43, 0xe0, 0x38, 0xe, 0xfc, 0x7e, 0xbf, 0x10, 0x8b, 0xc5, 0xd6, 0x35, 0xd, 0x22, 0x9b, 0xcd, 0x7a, 0x96, 0x97, 0x97, 0x33, 0xf, 0xad, 0x7c, 0x29, 0x10, 0x9b, 0x9b, 0x9b, 0xef, 0x2e, 0x2e, 0x2e, 0x7e, 0xd5, 0x1c, 0x8, 0x0, 0x20, 0xe1, 0x70, 0x38, 0xfc, 0x98, 0xd5, 0x57, 0x2, 0xe1, 0x76, 0xbb, 0xf3, 0xa1, 0x50, 0xe8, 0x38, 0x9b, 0xcd, 0xfe, 0xa2, 0x9, 0x8, 0x0, 0x40, 0x2e, 0x2f, 0x2f, 0x7d, 0x4b, 0x4b, 0x4b, 0xb9, 0x4a, 0x54, 0x5f, 0x9, 0xc4, 0xd2, 0xd2, 0x92, 0xb4, 0xb7, 0xb7, 0xf7, 0x36, 0x97, 0xcb, 0x4d, 0x3d, 0x29, 0x8, 0x0, 0xe0, 0x42, 0xa1, 0xd0, 0x71, 0xb5, 0xc4, 0xdf, 0xb6, 0xc5, 0x93, 0xe, 0x4a, 0x0, 0x20, 0xa9, 0x54, 0xea, 0x37, 0xb7, 0xdb, 0x5d, 0xa8, 0xa6, 0x78, 0x39, 0x10, 0x6b, 0x6b, 0x6b, 0xf1, 0x64, 0x32, 0xb9, 0x5a, 0x55, 0x10, 0x0, 0xc0, 0x6d, 0x6c, 0x6c, 0x9c, 0x57, 0xbb, 0xfa, 0x25, 0x40, 0x14, 0x3, 0x81, 0x40, 0x34, 0x93, 0xc9, 0x2c, 0x57, 0x1c, 0x4, 0x0, 0x90, 0x58, 0x2c, 0xb6, 0x5e, 0xe9, 0xc1, 0x77, 0x1f, 0x10, 0x53, 0x53, 0x53, 0x52, 0xc5, 0x83, 0x14, 0x0, 0x70, 0x7e, 0xbf, 0x5f, 0xd0, 0x42, 0xf5, 0x95, 0x40, 0xf8, 0x7c, 0xbe, 0xcb, 0xa3, 0xa3, 0xa3, 0x3f, 0x1e, 0xbd, 0x1b, 0x0, 0x80, 0x1c, 0x1f, 0x1f, 0x87, 0xb4, 0x56, 0xfd, 0xaa, 0x5, 0x29, 0x51, 0x14, 0xbf, 0xf5, 0xf9, 0x7c, 0x97, 0x5a, 0xad, 0xbe, 0x12, 0x88, 0xf5, 0xf5, 0xf5, 0xd8, 0x83, 0x83, 0x54, 0xb5, 0x42, 0x8f, 0x66, 0x83, 0x94, 0xd6, 0xbd, 0x5f, 0xce, 0x7c, 0x38, 0x3c, 0x3c, 0xfc, 0xb3, 0x50, 0x28, 0xb8, 0xcb, 0x2, 0x1, 0x0, 0xdc, 0xf4, 0xf4, 0xf4, 0xfe, 0x73, 0x15, 0x2f, 0x17, 0xa4, 0x22, 0x91, 0x48, 0x50, 0xb5, 0x2d, 0x0, 0x80, 0x9b, 0x99, 0x99, 0x79, 0xfb, 0xdc, 0x1, 0xc8, 0x5, 0xa9, 0x44, 0x22, 0xf1, 0xfb, 0x9d, 0x10, 0x0, 0x80, 0x9b, 0x9d, 0x9d, 0xd, 0xea, 0x5, 0xc0, 0xad, 0xfd, 0x43, 0x1a, 0x0, 0xb8, 0xdb, 0x9a, 0xa9, 0x8f, 0xb6, 0xa4, 0x46, 0xa3, 0xa4, 0xb7, 0xd5, 0x37, 0xcf, 0xf3, 0x68, 0x75, 0x75, 0xf5, 0x4c, 0xee, 0x99, 0x1c, 0x80, 0x9c, 0x1e, 0xf7, 0xff, 0x16, 0x8b, 0x45, 0x50, 0x5, 0xa0, 0xb7, 0xb7, 0xb7, 0x85, 0x10, 0xa2, 0x2b, 0xf1, 0x84, 0x10, 0xd4, 0xdf, 0xdf, 0x6f, 0x57, 0x3, 0x80, 0x37, 0x18, 0xc, 0x5, 0x3d, 0x2, 0xa0, 0x69, 0x3a, 0x8b, 0x10, 0xe2, 0x4b, 0x2, 0xc0, 0x18, 0xf3, 0xc1, 0x60, 0x70, 0x47, 0x8f, 0x16, 0x38, 0x3a, 0x3a, 0x5a, 0x93, 0x5b, 0xc3, 0x7f, 0x64, 0x81, 0xba, 0xba, 0x3a, 0x49, 0x8f, 0x0, 0x1a, 0x1a, 0x1a, 0xd4, 0xcd, 0x0, 0x93, 0xc9, 0xa4, 0xcb, 0x21, 0xe8, 0x74, 0x3a, 0xd5, 0x1, 0xa0, 0x69, 0x5a, 0x77, 0x1d, 0x80, 0x31, 0x2e, 0x38, 0x9d, 0x4e, 0xb1, 0x66, 0x1, 0x30, 0xc, 0x23, 0x28, 0x3d, 0x93, 0x9b, 0x1, 0xb9, 0x9a, 0x6, 0x60, 0x36, 0x9b, 0x75, 0xd7, 0x1, 0x4a, 0x21, 0xa8, 0x26, 0x0, 0x94, 0xa, 0x41, 0xb2, 0x0, 0x18, 0x86, 0xc9, 0xe9, 0xd, 0x80, 0x52, 0x8, 0x92, 0x5, 0x60, 0xb1, 0x58, 0x74, 0x67, 0x1, 0xa5, 0x10, 0xa4, 0x4, 0x40, 0x77, 0x43, 0xd0, 0xe1, 0x70, 0xa8, 0x9f, 0x1, 0x14, 0x45, 0x1, 0x45, 0x51, 0x79, 0x3d, 0x1, 0x68, 0x6e, 0x6e, 0x4e, 0xaa, 0x6, 0x80, 0x10, 0x42, 0x6, 0x83, 0x41, 0x37, 0x36, 0x28, 0x15, 0x82, 0x6a, 0x2, 0x0, 0x4d, 0xd3, 0xa9, 0x52, 0xcf, 0x95, 0x0, 0xe8, 0x66, 0xe, 0x98, 0xcd, 0x66, 0xa1, 0x6c, 0x0, 0x7a, 0x5a, 0x8b, 0x59, 0x2c, 0x96, 0x64, 0xcd, 0x2, 0xb8, 0x2b, 0x4, 0xe9, 0xde, 0x2, 0x77, 0x85, 0xa0, 0x9a, 0xb0, 0x40, 0xa9, 0x10, 0xa4, 0x8, 0xc0, 0x64, 0x32, 0xe9, 0x6, 0x40, 0xa9, 0x10, 0x54, 0xaa, 0x3, 0x74, 0xf3, 0x16, 0x70, 0xb9, 0x5c, 0xe5, 0x3, 0xe8, 0xe9, 0xe9, 0x69, 0xd5, 0xc3, 0x66, 0x18, 0x63, 0x5c, 0x68, 0x6a, 0x6a, 0x12, 0xcb, 0x5, 0xa0, 0x9b, 0xd5, 0x38, 0x4d, 0xd3, 0x29, 0x8a, 0xa2, 0xa0, 0x2c, 0x0, 0x18, 0x63, 0x3e, 0x14, 0xa, 0xfd, 0x55, 0xb, 0x21, 0x48, 0xd1, 0x2, 0x7a, 0x59, 0x8d, 0xdf, 0x1b, 0x80, 0x1e, 0x56, 0xe3, 0x84, 0x10, 0x34, 0x30, 0x30, 0x60, 0xbb, 0xeb, 0x77, 0x46, 0x5, 0xef, 0x48, 0xcf, 0x4d, 0xec, 0x8d, 0x99, 0x5, 0xf5, 0xf5, 0xf5, 0xef, 0x46, 0x47, 0x47, 0xb, 0x2e, 0x97, 0xeb, 0xbc, 0x54, 0x8, 0x52, 0x4, 0xc0, 0x30, 0x8c, 0xf4, 0x5c, 0x4, 0x9b, 0x4c, 0xa6, 0xf4, 0xf8, 0xf8, 0xb8, 0xc8, 0xb2, 0x6c, 0x32, 0x9d, 0x4e, 0xff, 0xd4, 0xdd, 0xdd, 0x7d, 0x66, 0x34, 0x1a, 0x8b, 0xd7, 0x3, 0xfd, 0xae, 0x5b, 0x29, 0xb2, 0x57, 0x66, 0xb6, 0xb6, 0xb6, 0xde, 0xc4, 0xe3, 0xf1, 0x6f, 0xae, 0xaf, 0xc1, 0x28, 0x5d, 0x85, 0x79, 0x2, 0xc1, 0x60, 0xb5, 0x5a, 0xa3, 0xa3, 0xa3, 0xa3, 0x45, 0xab, 0xd5, 0x9a, 0x2a, 0x16, 0x8b, 0x8b, 0x6d, 0x6d, 0x6d, 0xef, 0xd5, 0x8a, 0x55, 0xd, 0x20, 0x91, 0x48, 0xbc, 0x3e, 0x38, 0x38, 0xf8, 0xda, 0x6e, 0xb7, 0xf7, 0x5f, 0x5c, 0x5c, 0xd4, 0x7b, 0xbd, 0xde, 0xbc, 0x20, 0x8, 0xcd, 0x85, 0x42, 0x81, 0xfe, 0xf0, 0xae, 0xac, 0x10, 0x98, 0x9b, 0xd5, 0xc5, 0x18, 0x17, 0x59, 0x96, 0x3d, 0x1d, 0x19, 0x19, 0x1, 0x96, 0x65, 0x5, 0x8a, 0xa2, 0x7e, 0x6c, 0x69, 0x69, 0x49, 0x3d, 0x44, 0xb0, 0x2a, 0x0, 0x1f, 0xcc, 0x74, 0x75, 0x41, 0xea, 0xfa, 0x7b, 0x32, 0x99, 0x64, 0x76, 0x77, 0x77, 0x5d, 0xe, 0x87, 0xa3, 0x5f, 0x14, 0xc5, 0x57, 0x57, 0x60, 0x5a, 0x8b, 0xc5, 0xa2, 0xf1, 0xbe, 0x50, 0x6e, 0xa, 0x66, 0x18, 0x26, 0x31, 0x36, 0x36, 0x96, 0x65, 0x59, 0x36, 0x29, 0x49, 0x92, 0xb7, 0xbd, 0xbd, 0xfd, 0x9f, 0x72, 0xda, 0xf9, 0xd1, 0x1, 0xa8, 0x1, 0x93, 0xcf, 0xe7, 0xa9, 0x93, 0x93, 0x13, 0x1b, 0x4d, 0xd3, 0x9f, 0xb, 0x82, 0x60, 0xf5, 0x7a, 0xbd, 0xd9, 0x54, 0x2a, 0xe5, 0xcc, 0x64, 0x32, 0xe, 0xb9, 0x6e, 0xb9, 0x16, 0x8c, 0x31, 0x2e, 0xda, 0x6c, 0xb6, 0xc8, 0xd0, 0xd0, 0x10, 0x65, 0xb3, 0xd9, 0x92, 0x95, 0xa8, 0x6e, 0xc5, 0x0, 0xa8, 0xe9, 0x96, 0x68, 0x34, 0x6a, 0xdd, 0xdf, 0xdf, 0x6f, 0x76, 0xb9, 0x5c, 0x9f, 0x89, 0xa2, 0x58, 0xbf, 0xb8, 0xb8, 0x8, 0x26, 0x93, 0x29, 0x3b, 0x3c, 0x3c, 0x8c, 0xed, 0x76, 0x7b, 0xd2, 0x68, 0x34, 0xfe, 0xd0, 0xd8, 0xd8, 0x98, 0xae, 0xb6, 0xe0, 0x8a, 0x1, 0x50, 0xb, 0xe6, 0xa9, 0x5, 0xbf, 0x9c, 0x97, 0xf3, 0xff, 0xf3, 0x2f, 0x6a, 0x82, 0x7f, 0xf6, 0x4e, 0xca, 0x1b, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp index 39881b697..fcef9fba9 100644 --- a/main/tests/test_render.cpp +++ b/main/tests/test_render.cpp @@ -36,7 +36,7 @@ #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #define OBJECT_COUNT 50 diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index f0ff9aab1..cb0864950 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -39,7 +39,7 @@ #include "scene/resources/mesh/surface_tool.h" #include "scene/main/scene_string_names.h" #include "servers/navigation_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/world_3d.h" diff --git a/modules/mesh_utils/mesh_utils.cpp b/modules/mesh_utils/mesh_utils.cpp index 992a7e31a..c71ec942c 100644 --- a/modules/mesh_utils/mesh_utils.cpp +++ b/modules/mesh_utils/mesh_utils.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/variant.h" #include "scene/resources/mesh/mesh.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "xatlas/xatlas.h" diff --git a/modules/mesh_utils/simplify.h b/modules/mesh_utils/simplify.h index a0c55345b..a0348a59d 100644 --- a/modules/mesh_utils/simplify.h +++ b/modules/mesh_utils/simplify.h @@ -32,7 +32,7 @@ #include #include -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" namespace Simplify { diff --git a/modules/paint/nodes/polygon_2d/editor/paint_polygon_2d_editor_plugin.cpp b/modules/paint/nodes/polygon_2d/editor/paint_polygon_2d_editor_plugin.cpp index 5f733231b..aa23ebba6 100644 --- a/modules/paint/nodes/polygon_2d/editor/paint_polygon_2d_editor_plugin.cpp +++ b/modules/paint/nodes/polygon_2d/editor/paint_polygon_2d_editor_plugin.cpp @@ -72,7 +72,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "../paint_polygon_2d.h" diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp index 189dd2c9a..91a1f5ce8 100644 --- a/modules/props/prop_instance_merger.cpp +++ b/modules/props/prop_instance_merger.cpp @@ -5,7 +5,7 @@ //#include "../thread_pool/thread_pool.h" #include "scene/resources/world_3d.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "core/config/engine.h" @@ -16,7 +16,7 @@ } \ return r; -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index 77961ad29..f6f48f3cf 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -19,7 +19,7 @@ } \ return r; -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman/meshers/default/terrain_mesher_default.cpp b/modules/terraman/meshers/default/terrain_mesher_default.cpp index 7d7fb3cb8..2e541a01c 100644 --- a/modules/terraman/meshers/default/terrain_mesher_default.cpp +++ b/modules/terraman/meshers/default/terrain_mesher_default.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" _FORCE_INLINE_ int TerrainMesherDefault::get_build_flags() const { return _build_flags; diff --git a/modules/terraman/world/default/terrain_chunk_default.cpp b/modules/terraman/world/default/terrain_chunk_default.cpp index fff8240b1..1bdce2402 100644 --- a/modules/terraman/world/default/terrain_chunk_default.cpp +++ b/modules/terraman/world/default/terrain_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/terrain_mesher_default.h" diff --git a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp index a260eb717..929ff6922 100644 --- a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp +++ b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "scene/resources/world_2d.h" #include "servers/physics_2d_server.h" diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp index fb2f25595..2af835be7 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/terrain_2d_mesher_default.h" diff --git a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp index f10d580c8..00f253f4b 100644 --- a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp +++ b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp @@ -26,7 +26,7 @@ SOFTWARE. #include "../../defines.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void VoxelMesherCubic::_add_chunk(Ref p_chunk) { Ref chunk = p_chunk; diff --git a/modules/voxelman/meshers/default/voxel_mesher_default.cpp b/modules/voxelman/meshers/default/voxel_mesher_default.cpp index fd25e4d9f..bdd77d872 100644 --- a/modules/voxelman/meshers/default/voxel_mesher_default.cpp +++ b/modules/voxelman/meshers/default/voxel_mesher_default.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" _FORCE_INLINE_ int VoxelMesherDefault::get_build_flags() const { return _build_flags; diff --git a/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp b/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp index f3364b927..7124f5d44 100644 --- a/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp +++ b/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp @@ -30,7 +30,7 @@ SOFTWARE. #include "../../world/jobs/voxel_job.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void VoxelMesherMarchingCubes::get_voxel_type_array(int *arr, Ref chunk, const int x, const int y, const int z, const int size) { uint8_t *channel_type = chunk->channel_get(_channel_index_type); diff --git a/modules/voxelman/world/default/voxel_chunk_default.cpp b/modules/voxelman/world/default/voxel_chunk_default.cpp index 5aea61538..7f57f4192 100644 --- a/modules/voxelman/world/default/voxel_chunk_default.cpp +++ b/modules/voxelman/world/default/voxel_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/voxel_mesher_default.h" diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index 860fca91a..c20671e0b 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -35,7 +35,7 @@ #include "core/input/input.h" #include "core/os/file_access.h" #include "drivers/unix/os_unix.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "servers/rendering/rasterizer.h" #include "servers/audio/audio_driver_dummy.h" #include "servers/rendering/rendering_server_raster.h" diff --git a/platform/frt_sdl/frt_godot3.cc b/platform/frt_sdl/frt_godot3.cc index a127653a6..9f57303ef 100644 --- a/platform/frt_sdl/frt_godot3.cc +++ b/platform/frt_sdl/frt_godot3.cc @@ -17,7 +17,7 @@ #pragma GCC diagnostic ignored "-Wvolatile" #include "servers/audio_server.h" #pragma GCC diagnostic pop -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "servers/rendering/rendering_server_wrap_mt.h" #include "servers/rendering/rasterizer.h" #include "servers/rendering/rendering_server_raster.h" diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index d604df8f8..b654ccc96 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -41,7 +41,7 @@ #include "main/input_default.h" #include "servers/audio_server.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class OSIPhone : public OS_Unix { private: diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 47fbe00ad..36dcd6a32 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -43,7 +43,7 @@ #include "servers/audio_server.h" #include "servers/rendering/rasterizer.h" #include "servers/rendering/rendering_server_wrap_mt.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include #include diff --git a/platform/server/os_server.h b/platform/server/os_server.h index d30175ed2..95754a14e 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -42,7 +42,7 @@ #endif #include "servers/audio_server.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #undef CursorShape diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index b54a4aeaa..8f32015c2 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -43,7 +43,7 @@ #include "power_windows.h" #include "servers/audio_server.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" #endif diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index e24346be0..7d3a32f24 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -43,7 +43,7 @@ #include "power_x11.h" #include "servers/audio_server.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include #include diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 0095225ec..e45fd7e80 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -34,7 +34,7 @@ #include "core/math/math_funcs.h" #include "scene/main/viewport.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void Camera2D::_update_scroll() { if (!is_inside_tree()) { diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index a85b0cbc6..4ea47a531 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -38,7 +38,7 @@ #include "scene/main/canvas_item.h" #include "scene/resources/material/particles_material.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void CPUParticles2D::set_emitting(bool p_emitting) { if (emitting == p_emitting) { diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index b693886a7..777130a03 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -31,7 +31,7 @@ #include "light_2d.h" #include "core/config/engine.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Light2D::_edit_get_state() const { diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 8f1cc06b2..26923454f 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -42,7 +42,7 @@ #include "scene/resources/shapes/ray_shape.h" #include "scene/resources/shapes/shape.h" #include "scene/resources/shapes/sphere_shape.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void CollisionShape::make_convex_from_brothers() { Node *p = get_parent(); diff --git a/scene/3d/cpu_particles.cpp b/scene/3d/cpu_particles.cpp index b063f12a8..b3a4cae29 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -37,7 +37,7 @@ #include "scene/resources/gradient.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/material/particles_material.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" AABB CPUParticles::get_aabb() const { return AABB(); diff --git a/scene/3d/light.h b/scene/3d/light.h index f0cd8e22d..53592f520 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/3d/visual_instance.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Light : public VisualInstance { GDCLASS(Light, VisualInstance); diff --git a/scene/3d/navigation_obstacle.cpp b/scene/3d/navigation_obstacle.cpp index 24a668fcb..51b8994e4 100644 --- a/scene/3d/navigation_obstacle.cpp +++ b/scene/3d/navigation_obstacle.cpp @@ -40,7 +40,7 @@ #include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void NavigationObstacle::_bind_methods() { ClassDB::bind_method(D_METHOD("get_rid"), &NavigationObstacle::get_rid); diff --git a/scene/3d/occluder.cpp b/scene/3d/occluder.cpp index 4f129cfb7..ee15ab2cd 100644 --- a/scene/3d/occluder.cpp +++ b/scene/3d/occluder.cpp @@ -34,7 +34,7 @@ #include "scene/resources/occluder_shape.h" #include "scene/resources/world_3d.h" #include "servers/rendering/portals/portal_occlusion_culler.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void Occluder::resource_changed(RES res) { update_gizmos(); diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index c6eefe73b..d2ca9c2cd 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -35,7 +35,7 @@ #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Path::Path() { SceneTree *st = SceneTree::get_singleton(); diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 3124f662b..4856902e7 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -38,7 +38,7 @@ #include "scene/main/viewport.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool Portal::_portal_plane_convention = false; bool Portal::_settings_gizmo_show_margins = true; diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index aceb37e78..e2bf57a2c 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -31,7 +31,7 @@ #include "reflection_probe.h" #include "scene/resources/sky.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void ReflectionProbe::set_intensity(float p_intensity) { intensity = p_intensity; diff --git a/scene/3d/room.cpp b/scene/3d/room.cpp index 0c9883698..fa384806e 100644 --- a/scene/3d/room.cpp +++ b/scene/3d/room.cpp @@ -34,7 +34,7 @@ #include "room_group.h" #include "room_manager.h" #include "scene/resources/world_3d.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void Room::SimplifyInfo::set_simplify(real_t p_value, real_t p_room_size) { _plane_simplify = CLAMP(p_value, 0.0, 1.0); diff --git a/scene/3d/room_group.cpp b/scene/3d/room_group.cpp index ba9a6474a..b5d7c4d52 100644 --- a/scene/3d/room_group.cpp +++ b/scene/3d/room_group.cpp @@ -35,7 +35,7 @@ #include "room_manager.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void RoomGroup::_bind_methods() { ClassDB::bind_method(D_METHOD("set_roomgroup_priority", "p_priority"), &RoomGroup::set_roomgroup_priority); diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 92006c25e..33a4ddec4 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -33,7 +33,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" //#include "skeleton.h" AABB VisualInstance::get_transformed_aabb() const { diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index 079a1f9d1..38a125acd 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -34,7 +34,7 @@ #include "core/math/face3.h" #include "core/object/reference.h" #include "scene/3d/cull_instance.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Material; diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp index f7163d177..e7eb7dbec 100644 --- a/scene/debugger/script_debugger_remote.cpp +++ b/scene/debugger/script_debugger_remote.cpp @@ -42,7 +42,7 @@ #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void ScriptDebuggerRemote::_send_video_memory() { List usage; diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 7857670be..025f42baa 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -31,7 +31,7 @@ #include "button.h" #include "core/string/translation.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "scene/main/scene_string_names.h" Size2 Button::get_minimum_size() const { diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index 14d8a5743..7c4226a9e 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -30,7 +30,7 @@ #include "check_box.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Size2 CheckBox::get_icon_size() const { Ref checked = Control::get_theme_icon("checked"); diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index a9ebebca0..0fefcc7bb 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -31,7 +31,7 @@ #include "check_button.h" #include "core/string/print_string.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Size2 CheckButton::get_icon_size() const { Ref on = Control::get_theme_icon(is_disabled() ? "on_disabled" : "on"); diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index d3cbf2960..8dfb53f9a 100644 --- a/scene/gui/nine_patch_rect.cpp +++ b/scene/gui/nine_patch_rect.cpp @@ -31,7 +31,7 @@ #include "nine_patch_rect.h" #include "core/config/project_settings.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void NinePatchRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index 1d371852a..3f7d76c51 100644 --- a/scene/gui/texture_rect.cpp +++ b/scene/gui/texture_rect.cpp @@ -30,7 +30,7 @@ #include "texture_rect.h" #include "core/core_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void TextureRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 41a63d593..ed3f05ee8 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -43,7 +43,7 @@ #include "scene/main/scene_string_names.h" #include "servers/rendering/rendering_server_constants.h" #include "servers/rendering/rendering_server_raster.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "scene/main/scene_tree.h" #include "scene/resources/mesh/multimesh.h" diff --git a/scene/main/control.cpp b/scene/main/control.cpp index 9fa5f9bdb..f915bede0 100644 --- a/scene/main/control.cpp +++ b/scene/main/control.cpp @@ -43,7 +43,7 @@ #include "scene/main/timer.h" #include "scene/main/viewport.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/main/node_2d.cpp b/scene/main/node_2d.cpp index 5222364a4..180792e5b 100644 --- a/scene/main/node_2d.cpp +++ b/scene/main/node_2d.cpp @@ -34,7 +34,7 @@ #include "scene/main/control.h" #include "scene/main/viewport.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Node2D::_edit_get_state() const { diff --git a/scene/main/spatial.cpp b/scene/main/spatial.cpp index 8f19d0569..b3a0e4d04 100644 --- a/scene/main/spatial.cpp +++ b/scene/main/spatial.cpp @@ -37,7 +37,7 @@ #include "scene/main/world.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" -#include "servers/rendering_server_callbacks.h" +#include "core/servers/rendering/rendering_server_callbacks.h" /* diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 8bf56326a..18432aafd 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -35,7 +35,7 @@ #include "core/math/transform_2d.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "world.h" class Camera; diff --git a/scene/resources/environment_3d.cpp b/scene/resources/environment_3d.cpp index 2abccdb87..c94ec7d6c 100644 --- a/scene/resources/environment_3d.cpp +++ b/scene/resources/environment_3d.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "scene/resources/sky.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "texture.h" RID Environment3D::get_rid() const { diff --git a/scene/resources/material/material.h b/scene/resources/material/material.h index 027993b84..3543d99f5 100644 --- a/scene/resources/material/material.h +++ b/scene/resources/material/material.h @@ -33,7 +33,7 @@ #include "core/object/resource.h" #include "core/containers/self_list.h" #include "scene/resources/shader.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Texture; diff --git a/scene/resources/mesh/mesh.h b/scene/resources/mesh/mesh.h index df5d81252..2696364bc 100644 --- a/scene/resources/mesh/mesh.h +++ b/scene/resources/mesh/mesh.h @@ -36,7 +36,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/shapes/shape.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Mesh : public Resource { GDCLASS(Mesh, Resource); diff --git a/scene/resources/mesh/multimesh.cpp b/scene/resources/mesh/multimesh.cpp index 9b959d236..dc316143e 100644 --- a/scene/resources/mesh/multimesh.cpp +++ b/scene/resources/mesh/multimesh.cpp @@ -30,7 +30,7 @@ #include "multimesh.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void MultiMesh::_set_transform_array(const PoolVector &p_array) { if (transform_format != TRANSFORM_3D) { diff --git a/scene/resources/mesh/multimesh.h b/scene/resources/mesh/multimesh.h index b5086938e..44608ff52 100644 --- a/scene/resources/mesh/multimesh.h +++ b/scene/resources/mesh/multimesh.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/resources/mesh/mesh.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class MultiMesh : public Resource { GDCLASS(MultiMesh, Resource); diff --git a/scene/resources/mesh/primitive_meshes.cpp b/scene/resources/mesh/primitive_meshes.cpp index 4100733cf..7f8186175 100644 --- a/scene/resources/mesh/primitive_meshes.cpp +++ b/scene/resources/mesh/primitive_meshes.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "primitive_meshes.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "core/core_string_names.h" #include "core/os/main_loop.h" diff --git a/scene/resources/occluder_shape.cpp b/scene/resources/occluder_shape.cpp index b1192c679..42025ba34 100644 --- a/scene/resources/occluder_shape.cpp +++ b/scene/resources/occluder_shape.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "core/math/transform.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef TOOLS_ENABLED #include "editor/editor_node.h" diff --git a/scene/resources/occluder_shape_polygon.cpp b/scene/resources/occluder_shape_polygon.cpp index 7e4eafb8a..f93b92643 100644 --- a/scene/resources/occluder_shape_polygon.cpp +++ b/scene/resources/occluder_shape_polygon.cpp @@ -30,7 +30,7 @@ #include "occluder_shape_polygon.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #ifdef TOOLS_ENABLED void OccluderShapePolygon::_update_aabb() { diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index db60febea..e0ae66f64 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -32,7 +32,7 @@ #include "core/os/file_access.h" #include "scene/main/scene_string_names.h" #include "servers/rendering/shader_language.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "texture.h" Shader::Mode Shader::get_mode() const { diff --git a/scene/resources/shapes_2d/capsule_shape_2d.cpp b/scene/resources/shapes_2d/capsule_shape_2d.cpp index 51216a34b..a6cb96f7c 100644 --- a/scene/resources/shapes_2d/capsule_shape_2d.cpp +++ b/scene/resources/shapes_2d/capsule_shape_2d.cpp @@ -31,7 +31,7 @@ #include "capsule_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" Vector CapsuleShape2D::get_points() const { Vector points; diff --git a/scene/resources/shapes_2d/circle_shape_2d.cpp b/scene/resources/shapes_2d/circle_shape_2d.cpp index af4e9d7eb..491f527fb 100644 --- a/scene/resources/shapes_2d/circle_shape_2d.cpp +++ b/scene/resources/shapes_2d/circle_shape_2d.cpp @@ -31,7 +31,7 @@ #include "circle_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { return p_point.length() < get_radius() + p_tolerance; diff --git a/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp index 8157b76bb..0abe736d4 100644 --- a/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp +++ b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp @@ -31,7 +31,7 @@ #include "concave_polygon_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { PoolVector s = get_segments(); diff --git a/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp index 7231d2c9b..e1abafcd3 100644 --- a/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp +++ b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp @@ -32,7 +32,7 @@ #include "core/math/geometry.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { return Geometry::is_point_in_polygon(p_point, points); diff --git a/scene/resources/shapes_2d/line_shape_2d.cpp b/scene/resources/shapes_2d/line_shape_2d.cpp index e5b1ae919..971d36acf 100644 --- a/scene/resources/shapes_2d/line_shape_2d.cpp +++ b/scene/resources/shapes_2d/line_shape_2d.cpp @@ -31,7 +31,7 @@ #include "line_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool LineShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { Vector2 point = get_d() * get_normal(); diff --git a/scene/resources/shapes_2d/rectangle_shape_2d.cpp b/scene/resources/shapes_2d/rectangle_shape_2d.cpp index ff5e2c6d4..a755b4c21 100644 --- a/scene/resources/shapes_2d/rectangle_shape_2d.cpp +++ b/scene/resources/shapes_2d/rectangle_shape_2d.cpp @@ -31,7 +31,7 @@ #include "rectangle_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" void RectangleShape2D::_update_shape() { Physics2DServer::get_singleton()->shape_set_data(get_rid(), extents); emit_changed(); diff --git a/scene/resources/shapes_2d/segment_shape_2d.cpp b/scene/resources/shapes_2d/segment_shape_2d.cpp index 47f2b7100..41941d19d 100644 --- a/scene/resources/shapes_2d/segment_shape_2d.cpp +++ b/scene/resources/shapes_2d/segment_shape_2d.cpp @@ -31,7 +31,7 @@ #include "segment_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { Vector2 l[2] = { a, b }; diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 4a0d8516b..6ee3eb497 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -32,7 +32,7 @@ #include "core/object/resource.h" #include "scene/resources/texture.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class CanvasItem; diff --git a/scene/resources/texture.h b/scene/resources/texture.h index fd78aa80d..33b200ff6 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -38,7 +38,7 @@ #include "core/os/thread_safe.h" #include "scene/resources/curve.h" #include "scene/resources/gradient.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Texture : public Resource { GDCLASS(Texture, Resource); diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index c437249b4..9a54bd0c0 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -37,7 +37,7 @@ #include "scene/main/world.h" #include "servers/navigation_2d_server.h" #include "servers/physics_2d_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" struct SpatialIndexer2D { struct CellRef { diff --git a/scene/resources/world_3d.h b/scene/resources/world_3d.h index 61d26c60c..dd9f7b67f 100644 --- a/scene/resources/world_3d.h +++ b/scene/resources/world_3d.h @@ -34,7 +34,7 @@ #include "core/object/resource.h" #include "scene/resources/environment_3d.h" #include "servers/physics_server.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class Camera; class VisibilityNotifier; diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index ff0d06526..f34ef03ed 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -65,7 +65,6 @@ #include "physics_2d_server.h" #include "physics_server.h" #include "rendering/shader_types.h" -#include "rendering_server.h" #include "scene/debugger/script_debugger_remote.h" static void _debugger_get_resource_usage(List *r_usage) { @@ -97,20 +96,8 @@ Physics2DServer *_createPandemoniumPhysics2DCallback() { return Physics2DServerWrapMT::init_server(); } -static bool has_server_feature_callback(const String &p_feature) { - if (RenderingServer::get_singleton()) { - if (RenderingServer::get_singleton()->has_os_feature(p_feature)) { - return true; - } - } - - return false; -} void register_server_types() { - OS::get_singleton()->set_has_server_feature_callback(has_server_feature_callback); - - ClassDB::register_virtual_class(); ClassDB::register_class(); ClassDB::register_virtual_class(); ClassDB::register_virtual_class(); @@ -221,7 +208,6 @@ void unregister_server_types() { } void register_server_singletons() { - Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton())); diff --git a/servers/rendering/portals/portal_gameplay_monitor.h b/servers/rendering/portals/portal_gameplay_monitor.h index 272532e33..0a9375ecb 100644 --- a/servers/rendering/portals/portal_gameplay_monitor.h +++ b/servers/rendering/portals/portal_gameplay_monitor.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/local_vector.h" -#include "servers/rendering_server_callbacks.h" +#include "core/servers/rendering/rendering_server_callbacks.h" #include diff --git a/servers/rendering/rasterizer.h b/servers/rendering/rasterizer.h index 6aa1d76ab..c5c8d7119 100644 --- a/servers/rendering/rasterizer.h +++ b/servers/rendering/rasterizer.h @@ -32,7 +32,7 @@ #include "core/math/projection.h" #include "core/math/transform_interpolator.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "core/containers/self_list.h" diff --git a/servers/rendering/rendering_server_canvas_helper.cpp b/servers/rendering/rendering_server_canvas_helper.cpp index 35da7e716..e4a1750ca 100644 --- a/servers/rendering/rendering_server_canvas_helper.cpp +++ b/servers/rendering/rendering_server_canvas_helper.cpp @@ -31,7 +31,7 @@ #include "rendering_server_canvas_helper.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" LocalVector RenderingServerCanvasHelper::_tilemap_multirects; Mutex RenderingServerCanvasHelper::_tilemap_mutex; diff --git a/servers/rendering/rendering_server_raster.h b/servers/rendering/rendering_server_raster.h index 3a9f2a10b..9b966a5e3 100644 --- a/servers/rendering/rendering_server_raster.h +++ b/servers/rendering/rendering_server_raster.h @@ -36,7 +36,7 @@ #include "rendering_server_scene.h" #include "rendering_server_viewport.h" #include "servers/rendering/rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class RenderingServerRaster : public RenderingServer { enum { diff --git a/servers/rendering/rendering_server_viewport.h b/servers/rendering/rendering_server_viewport.h index ec3291baa..ec6ee14ac 100644 --- a/servers/rendering/rendering_server_viewport.h +++ b/servers/rendering/rendering_server_viewport.h @@ -32,7 +32,7 @@ #include "core/containers/self_list.h" #include "rasterizer.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class RenderingServerViewport { public: diff --git a/servers/rendering/rendering_server_wrap_mt.h b/servers/rendering/rendering_server_wrap_mt.h index c53278503..3ff289689 100644 --- a/servers/rendering/rendering_server_wrap_mt.h +++ b/servers/rendering/rendering_server_wrap_mt.h @@ -33,7 +33,7 @@ #include "core/containers/command_queue_mt.h" #include "core/os/safe_refcount.h" #include "core/os/thread.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" class RenderingServerWrapMT : public RenderingServer { // the real visual server diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index f29805b24..a1ddad4e4 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -31,7 +31,7 @@ #include "shader_language.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" static bool _is_text_char(CharType c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_'; diff --git a/servers/rendering/shader_types.h b/servers/rendering/shader_types.h index d44f4635e..155264de1 100644 --- a/servers/rendering/shader_types.h +++ b/servers/rendering/shader_types.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/ordered_hash_map.h" -#include "servers/rendering_server.h" +#include "core/servers/rendering/rendering_server.h" #include "shader_language.h" class ShaderTypes {