From 88e9ad04f29884a9e7a589b82b9534d9c998f0fa Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 10 Dec 2023 23:11:07 +0100 Subject: [PATCH] Moved back the servers and resources from core. --- core/SCsub | 2 -- core/register_core_types.cpp | 22 ------------ core/scene/SCsub | 8 ----- core/servers/SCsub | 8 ----- drivers/dummy/rasterizer_dummy.h | 2 +- drivers/gles2/shader_compiler_gles2.h | 2 +- drivers/unix/os_unix.cpp | 2 +- editor/animation_track_editor_plugins.cpp | 2 +- editor/editor_atlas_packer.cpp | 2 +- editor/editor_atlas_packer.h | 2 +- editor/editor_inspector.cpp | 2 +- editor/editor_node.cpp | 6 ++-- editor/editor_plugin.cpp | 2 +- editor/editor_resource_preview.cpp | 2 +- editor/import/resource_importer_bitmask.cpp | 2 +- editor/import/resource_importer_scene.cpp | 10 +++--- .../animation_player_editor_plugin.cpp | 2 +- editor/plugins/audio_stream_editor_plugin.cpp | 2 +- editor/plugins/bit_map_editor_plugin.h | 2 +- editor/plugins/canvas_item_editor_plugin.cpp | 2 +- .../collision_shape_2d_editor_plugin.cpp | 16 ++++----- editor/plugins/editor_preview_plugins.cpp | 4 +-- editor/plugins/gradient_editor_plugin.cpp | 2 +- editor/plugins/material_editor_plugin.cpp | 2 +- .../plugins/mesh_instance_editor_plugin.cpp | 2 +- editor/plugins/path_2d_editor_plugin.cpp | 2 +- editor/plugins/path_editor_plugin.cpp | 2 +- editor/plugins/polygon_2d_editor_plugin.cpp | 2 +- editor/plugins/spatial_editor_plugin.cpp | 6 ++-- editor/plugins/sprite_editor_plugin.cpp | 2 +- .../plugins/texture_region_editor_plugin.cpp | 2 +- editor/project_manager.cpp | 4 +-- editor/property_editor.cpp | 2 +- editor/spatial_editor_gizmos.cpp | 22 ++++++------ .../gltf/extensions/physics/gltf_collider.cpp | 12 +++---- .../shader_editor/shader_editor_plugin.cpp | 2 +- main/input_default.cpp | 2 +- main/main.cpp | 6 ++-- main/performance.cpp | 6 ++-- main/tests/test_physics.cpp | 4 +-- main/tests/test_physics_2d.cpp | 4 +-- main/tests/test_render.cpp | 2 +- modules/csg/csg_shape.cpp | 2 +- modules/csg/csg_shape.h | 2 +- .../entities/stats/stat_data.h | 2 +- .../gridmap_navigation_geometry_parser_3d.cpp | 18 +++++----- modules/gridmap/grid_map.cpp | 2 +- modules/gridmap/mesh_library.cpp | 2 +- modules/gridmap/mesh_library.h | 2 +- .../image_picker_button.cpp | 2 +- .../mesh_data_resource/mesh_data_resource.h | 2 +- .../plugin/mdr_import_plugin_base.cpp | 14 ++++---- modules/mesh_utils/mesh_utils.cpp | 2 +- modules/mesh_utils/simplify.h | 2 +- ...icbody2d_navigation_geometry_parser_2d.cpp | 12 +++---- ...icbody3d_navigation_geometry_parser_3d.cpp | 18 +++++----- .../editor/paint_curve_2d_editor_plugin.cpp | 2 +- .../paint/nodes/curve_2d/paint_curve_2d.cpp | 2 +- .../editor/paint_polygon_2d_editor_plugin.cpp | 2 +- modules/props/prop_instance_merger.cpp | 6 ++-- modules/props/prop_instance_prop_job.cpp | 4 +-- modules/props/props/prop_data.cpp | 2 +- modules/props/tiled_wall/tiled_wall.cpp | 2 +- modules/props/tiled_wall/tiled_wall_data.cpp | 2 +- modules/props_2d/prop_2d_instance_merger.cpp | 6 ++-- modules/props_2d/prop_2d_instance_merger.h | 2 +- .../props_2d/prop_2d_instance_prop_job.cpp | 2 +- modules/props_2d/prop_2d_instance_prop_job.h | 2 +- modules/props_2d/props/prop_2d_data.cpp | 2 +- .../tiled_wall/tiled_wall_2d_data.cpp | 2 +- .../editor/skeleton_editor_plugin.cpp | 4 +-- modules/skeleton_3d/nodes/physical_bone.h | 2 +- .../skeleton_modification_3d_jiggle.cpp | 2 +- .../default/terrain_mesher_default.cpp | 2 +- .../world/default/terrain_chunk_default.cpp | 4 +-- .../world/default/terrain_world_default.cpp | 2 +- .../terraman/world/jobs/terrain_prop_job.cpp | 2 +- .../world/jobs/terrain_terrain_job.cpp | 2 +- modules/terraman/world/terrain_chunk.cpp | 2 +- .../terraman/world/terrain_world_editor.cpp | 2 +- .../default/terrain_2d_mesher_default.cpp | 4 +-- .../isometric/terrain_2d_mesher_isometric.cpp | 2 +- .../terraman_2d/meshers/terrain_2d_mesher.cpp | 4 +-- .../terraman_2d/meshers/terrain_2d_mesher.h | 2 +- .../default/terrain_2d_chunk_default.cpp | 6 ++-- .../world/jobs/terrain_2d_terrain_job.cpp | 2 +- modules/terraman_2d/world/terrain_2d_chunk.h | 2 +- modules/tile_map/tile_map.cpp | 2 +- modules/tile_map/tile_set.h | 4 +-- modules/tile_map/tile_set_editor_plugin.h | 4 +-- .../meshers/cubic/voxel_mesher_cubic.cpp | 2 +- .../meshers/default/voxel_mesher_default.cpp | 2 +- .../voxel_mesher_marching_cubes.cpp | 2 +- .../world/default/voxel_chunk_default.cpp | 4 +-- .../voxelman/world/jobs/voxel_prop_job.cpp | 2 +- .../voxelman/world/jobs/voxel_terrain_job.cpp | 2 +- modules/voxelman/world/voxel_chunk.cpp | 2 +- modules/voxelman/world/voxel_world_editor.cpp | 2 +- platform/frt/os_frt.cpp | 2 +- platform/frt_sdl/frt_godot3.cc | 2 +- platform/iphone/os_iphone.h | 2 +- platform/osx/os_osx.h | 2 +- platform/server/os_server.h | 2 +- platform/windows/os_windows.h | 2 +- platform/x11/os_x11.h | 2 +- scene/2d/area_2d.cpp | 2 +- scene/2d/audio_stream_player_2d.cpp | 2 +- scene/2d/camera_2d.cpp | 2 +- scene/2d/collision_object_2d.cpp | 2 +- scene/2d/collision_object_2d.h | 2 +- scene/2d/collision_polygon_2d.cpp | 6 ++-- scene/2d/collision_shape_2d.cpp | 16 ++++----- scene/2d/cpu_particles_2d.cpp | 2 +- scene/2d/joints_2d.cpp | 2 +- scene/2d/light_2d.cpp | 2 +- scene/2d/line_builder.cpp | 2 +- scene/2d/path_2d.cpp | 2 +- scene/2d/physics_body_2d.cpp | 2 +- scene/2d/physics_body_2d.h | 2 +- scene/2d/ray_cast_2d.cpp | 2 +- scene/2d/shape_cast_2d.cpp | 4 +-- scene/2d/shape_cast_2d.h | 2 +- scene/2d/touch_screen_button.cpp | 4 +-- scene/3d/area.cpp | 4 +-- scene/3d/audio_stream_player_3d.cpp | 4 +-- scene/3d/collision_object.cpp | 2 +- scene/3d/collision_object.h | 2 +- scene/3d/collision_polygon.cpp | 6 ++-- scene/3d/collision_shape.cpp | 18 +++++----- scene/3d/cpu_particles.cpp | 6 ++-- scene/3d/light.h | 2 +- scene/3d/navigation_obstacle.cpp | 4 +-- scene/3d/occluder.cpp | 2 +- scene/3d/path.cpp | 4 +-- scene/3d/physics_body.h | 2 +- scene/3d/physics_joint.cpp | 2 +- scene/3d/physics_joint.h | 2 +- scene/3d/portal.cpp | 2 +- scene/3d/ray_cast.cpp | 2 +- scene/3d/reflection_probe.cpp | 2 +- scene/3d/room.cpp | 2 +- scene/3d/room_group.cpp | 2 +- scene/3d/shape_cast.cpp | 2 +- scene/3d/shape_cast.h | 4 +-- scene/3d/soft_body.cpp | 2 +- scene/3d/spring_arm.cpp | 6 ++-- scene/3d/vehicle_body.cpp | 2 +- scene/3d/visibility_notifier.cpp | 2 +- scene/3d/visual_instance.cpp | 2 +- scene/3d/visual_instance.h | 2 +- scene/debugger/script_debugger_remote.cpp | 2 +- scene/gui/button.cpp | 2 +- scene/gui/check_box.cpp | 2 +- scene/gui/check_button.cpp | 2 +- scene/gui/gradient_edit.h | 2 +- scene/gui/nine_patch_rect.cpp | 2 +- scene/gui/texture_button.cpp | 2 +- scene/gui/texture_rect.cpp | 2 +- scene/main/canvas_item.cpp | 2 +- scene/main/control.cpp | 2 +- scene/main/node_2d.cpp | 2 +- scene/main/scene_tree.cpp | 4 +-- scene/main/spatial.cpp | 2 +- scene/main/viewport.cpp | 2 +- scene/main/viewport.h | 2 +- scene/register_scene_types.cpp | 36 +++++++++---------- scene/resources/SCsub | 14 ++++++++ {core/scene => scene}/resources/bit_map.cpp | 0 {core/scene => scene}/resources/bit_map.h | 0 {core/scene => scene}/resources/curve.cpp | 0 {core/scene => scene}/resources/curve.h | 0 scene/resources/environment_3d.cpp | 2 +- {core/scene => scene}/resources/gradient.cpp | 0 {core/scene => scene}/resources/gradient.h | 0 scene/resources/material/material.h | 2 +- scene/resources/material/shader_material.h | 2 +- scene/resources/material/spatial_material.h | 2 +- scene/resources/mesh/importer_mesh.h | 4 +-- scene/resources/mesh/mesh.cpp | 4 +-- scene/resources/mesh/mesh.h | 4 +-- scene/resources/mesh/multimesh.cpp | 2 +- scene/resources/mesh/multimesh.h | 2 +- scene/resources/mesh/primitive_meshes.cpp | 2 +- scene/resources/occluder_shape.cpp | 2 +- scene/resources/occluder_shape_polygon.cpp | 2 +- scene/resources/physics_material.h | 2 +- scene/resources/shader.cpp | 2 +- .../resources/shapes/box_shape.cpp | 2 +- .../resources/shapes/box_shape.h | 2 +- .../resources/shapes/capsule_shape.cpp | 2 +- .../resources/shapes/capsule_shape.h | 2 +- .../shapes/concave_polygon_shape.cpp | 2 +- .../resources/shapes/concave_polygon_shape.h | 2 +- .../resources/shapes/convex_polygon_shape.cpp | 2 +- .../resources/shapes/convex_polygon_shape.h | 2 +- .../resources/shapes/cylinder_shape.cpp | 2 +- .../resources/shapes/cylinder_shape.h | 2 +- .../resources/shapes/height_map_shape.cpp | 2 +- .../resources/shapes/height_map_shape.h | 2 +- .../resources/shapes/plane_shape.cpp | 2 +- .../resources/shapes/plane_shape.h | 2 +- .../resources/shapes/ray_shape.cpp | 2 +- .../resources/shapes/ray_shape.h | 2 +- .../resources/shapes/shape.cpp | 2 +- .../scene => scene}/resources/shapes/shape.h | 0 .../resources/shapes/sphere_shape.cpp | 2 +- .../resources/shapes/sphere_shape.h | 2 +- .../resources/shapes_2d/capsule_shape_2d.cpp | 4 +-- .../resources/shapes_2d/capsule_shape_2d.h | 2 +- .../resources/shapes_2d/circle_shape_2d.cpp | 4 +-- .../resources/shapes_2d/circle_shape_2d.h | 2 +- .../shapes_2d/concave_polygon_shape_2d.cpp | 4 +-- .../shapes_2d/concave_polygon_shape_2d.h | 2 +- .../shapes_2d/convex_polygon_shape_2d.cpp | 4 +-- .../shapes_2d/convex_polygon_shape_2d.h | 2 +- .../resources/shapes_2d/line_shape_2d.cpp | 4 +-- .../resources/shapes_2d/line_shape_2d.h | 2 +- .../shapes_2d/rectangle_shape_2d.cpp | 4 +-- .../resources/shapes_2d/rectangle_shape_2d.h | 2 +- .../resources/shapes_2d/segment_shape_2d.cpp | 4 +-- .../resources/shapes_2d/segment_shape_2d.h | 2 +- .../resources/shapes_2d/shape_2d.cpp | 2 +- .../resources/shapes_2d/shape_2d.h | 0 scene/resources/style_box.h | 2 +- scene/resources/texture.cpp | 2 +- scene/resources/texture.h | 6 ++-- scene/resources/world_2d.cpp | 4 +-- scene/resources/world_2d.h | 2 +- scene/resources/world_3d.h | 4 +-- servers/physics/area_sw.h | 2 +- servers/physics/collision_object_sw.h | 2 +- servers/physics/physics_server_sw.h | 2 +- servers/physics/shape_sw.h | 2 +- servers/physics_2d/area_2d_sw.h | 2 +- servers/physics_2d/collision_object_2d_sw.h | 2 +- servers/physics_2d/physics_2d_server_sw.h | 2 +- .../physics_2d/physics_2d_server_wrap_mt.h | 2 +- servers/physics_2d/shape_2d_sw.h | 2 +- .../physics_2d_server.cpp | 0 .../physics_2d_server.h | 0 .../physics => servers}/physics_server.cpp | 0 .../physics => servers}/physics_server.h | 0 servers/register_server_types.cpp | 26 ++++++++++++-- .../portals/portal_gameplay_monitor.h | 2 +- servers/rendering/rasterizer.h | 2 +- .../rendering_server_canvas_helper.cpp | 2 +- servers/rendering/rendering_server_raster.h | 2 +- servers/rendering/rendering_server_viewport.h | 2 +- servers/rendering/rendering_server_wrap_mt.h | 2 +- servers/rendering/shader_language.cpp | 2 +- servers/rendering/shader_types.h | 2 +- .../rendering_server.cpp | 0 .../rendering => servers}/rendering_server.h | 0 .../rendering_server_callbacks.cpp | 0 .../rendering_server_callbacks.h | 0 255 files changed, 411 insertions(+), 417 deletions(-) delete mode 100644 core/scene/SCsub delete mode 100644 core/servers/SCsub rename {core/scene => scene}/resources/bit_map.cpp (100%) rename {core/scene => scene}/resources/bit_map.h (100%) rename {core/scene => scene}/resources/curve.cpp (100%) rename {core/scene => scene}/resources/curve.h (100%) rename {core/scene => scene}/resources/gradient.cpp (100%) rename {core/scene => scene}/resources/gradient.h (100%) rename {core/scene => scene}/resources/shapes/box_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/box_shape.h (98%) rename {core/scene => scene}/resources/shapes/capsule_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/capsule_shape.h (98%) rename {core/scene => scene}/resources/shapes/concave_polygon_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/concave_polygon_shape.h (98%) rename {core/scene => scene}/resources/shapes/convex_polygon_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/convex_polygon_shape.h (98%) rename {core/scene => scene}/resources/shapes/cylinder_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/cylinder_shape.h (98%) rename {core/scene => scene}/resources/shapes/height_map_shape.cpp (99%) rename {core/scene => scene}/resources/shapes/height_map_shape.h (98%) rename {core/scene => scene}/resources/shapes/plane_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/plane_shape.h (98%) rename {core/scene => scene}/resources/shapes/ray_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/ray_shape.h (98%) rename {core/scene => scene}/resources/shapes/shape.cpp (98%) rename {core/scene => scene}/resources/shapes/shape.h (100%) rename {core/scene => scene}/resources/shapes/sphere_shape.cpp (98%) rename {core/scene => scene}/resources/shapes/sphere_shape.h (98%) rename {core/scene => scene}/resources/shapes_2d/capsule_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/capsule_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/circle_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/circle_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/concave_polygon_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/concave_polygon_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/convex_polygon_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/convex_polygon_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/line_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/line_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/rectangle_shape_2d.cpp (97%) rename {core/scene => scene}/resources/shapes_2d/rectangle_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/segment_shape_2d.cpp (98%) rename {core/scene => scene}/resources/shapes_2d/segment_shape_2d.h (98%) rename {core/scene => scene}/resources/shapes_2d/shape_2d.cpp (99%) rename {core/scene => scene}/resources/shapes_2d/shape_2d.h (100%) rename {core/servers/physics_2d => servers}/physics_2d_server.cpp (100%) rename {core/servers/physics_2d => servers}/physics_2d_server.h (100%) rename {core/servers/physics => servers}/physics_server.cpp (100%) rename {core/servers/physics => servers}/physics_server.h (100%) rename {core/servers/rendering => servers}/rendering_server.cpp (100%) rename {core/servers/rendering => servers}/rendering_server.h (100%) rename {core/servers/rendering => servers}/rendering_server_callbacks.cpp (100%) rename {core/servers/rendering => servers}/rendering_server_callbacks.h (100%) diff --git a/core/SCsub b/core/SCsub index 449347f01..b1cebfd49 100644 --- a/core/SCsub +++ b/core/SCsub @@ -200,8 +200,6 @@ SConscript("log/SCsub") 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 1b27dd51c..ac31ef23d 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -80,10 +80,6 @@ #include "core/bind/logger_bind.h" #include "core/log/logger_backend.h" -#include "core/servers/rendering/rendering_server.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" - static Ref resource_saver_binary; static Ref resource_loader_binary; static Ref resource_format_importer; @@ -114,16 +110,6 @@ 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"); @@ -279,8 +265,6 @@ 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>(); @@ -301,9 +285,6 @@ void register_core_singletons() { ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class<_ScriptServer>(); - ClassDB::register_virtual_class(); - ClassDB::register_virtual_class(); - 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())); @@ -322,9 +303,6 @@ 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())); - Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton())); - Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton())); } void unregister_core_types() { diff --git a/core/scene/SCsub b/core/scene/SCsub deleted file mode 100644 index 95eb3d831..000000000 --- a/core/scene/SCsub +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python - -Import("env") - -env.add_source_files(env.core_sources, "resources/*.cpp") -env.add_source_files(env.core_sources, "resources/shapes/*.cpp") -env.add_source_files(env.core_sources, "resources/shapes_2d/*.cpp") -#env.add_source_files(env.core_sources, "*.cpp") diff --git a/core/servers/SCsub b/core/servers/SCsub deleted file mode 100644 index 8656cfb9b..000000000 --- a/core/servers/SCsub +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python - -Import("env") - -env.add_source_files(env.core_sources, "rendering/*.cpp") -env.add_source_files(env.core_sources, "physics/*.cpp") -env.add_source_files(env.core_sources, "physics_2d/*.cpp") -#env.add_source_files(env.core_sources, "*.cpp") diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 6456eb80a..419b46e3e 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 cb943b7cb..a180c69b3 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class ShaderCompilerGLES2 { public: diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 9d25e6c0e..0df7b2585 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef __APPLE__ #include diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index e5207cebb..9e0b174c4 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" /// BOOL /// int AnimationTrackEditBool::get_key_height() const { diff --git a/editor/editor_atlas_packer.cpp b/editor/editor_atlas_packer.cpp index bbe341d40..4d73dfe87 100644 --- a/editor/editor_atlas_packer.cpp +++ b/editor/editor_atlas_packer.cpp @@ -33,7 +33,7 @@ #include "core/math/rect2.h" #include "core/typedefs.h" #include "core/string/ustring.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" void EditorAtlasPacker::_plot_triangle(Ref p_bitmap, Vector2i *vertices) { int width = p_bitmap->get_size().width; diff --git a/editor/editor_atlas_packer.h b/editor/editor_atlas_packer.h index cd476e6a0..c66b82925 100644 --- a/editor/editor_atlas_packer.h +++ b/editor/editor_atlas_packer.h @@ -32,7 +32,7 @@ #include "core/math/vector2.h" #include "core/containers/vector.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "core/object/reference.h" class BitMap; diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 3237ad335..99063e3a3 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" Size2 EditorProperty::get_minimum_size() const { Size2 ms; diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index c4c1fe31f..d43324ef2 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -188,9 +188,9 @@ #include "scene/resources/packed_scene.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 9f37d55f4..e071db2e2 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 8c368dcc4..edad4d876 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 "core/servers/rendering/rendering_server.h" +#include "servers/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/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp index 79788f680..e0c1386c9 100644 --- a/editor/import/resource_importer_bitmask.cpp +++ b/editor/import/resource_importer_bitmask.cpp @@ -34,7 +34,7 @@ #include "core/io/image_loader.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "scene/resources/texture.h" #include "core/io/image.h" diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 22d95b092..fc8c47405 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -41,15 +41,15 @@ #include "scene/3d/vehicle_body.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation.h" -#include "core/scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/box_shape.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/packed_scene.h" -#include "core/scene/resources/shapes/plane_shape.h" -#include "core/scene/resources/shapes/ray_shape.h" +#include "scene/resources/shapes/plane_shape.h" +#include "scene/resources/shapes/ray_shape.h" #include "scene/resources/resource_format_text.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 09af02d09..82faf46a8 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 50c819e57..eb790d277 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "servers/audio/audio_stream.h" void AudioStreamEditor::_notification(int p_what) { diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/plugins/bit_map_editor_plugin.h index 7a8eb1258..e62668466 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/plugins/bit_map_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 6dca42eee..a0aaeba43 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index 7d8e2fb8f..45e5c9d85 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -44,14 +44,14 @@ #include "scene/2d/collision_shape_2d.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" -#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" -#include "core/scene/resources/shapes_2d/circle_shape_2d.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/line_shape_2d.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "core/scene/resources/shapes_2d/segment_shape_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/capsule_shape_2d.h" +#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/line_shape_2d.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "scene/resources/shapes_2d/segment_shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/texture.h" void CollisionShape2DEditor::_node_removed(Node *p_node) { diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index f1948630a..32c63c2a5 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -34,7 +34,7 @@ #include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_scale.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "scene/resources/font/dynamic_font.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" @@ -66,7 +66,7 @@ #include "scene/resources/shader.h" #include "scene/resources/texture.h" #include "servers/audio_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void post_process_preview(Ref p_image) { if (p_image->get_format() != Image::FORMAT_RGBA8) { diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index 173c56542..3f903ba94 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -36,7 +36,7 @@ #include "core/object/undo_redo.h" #include "core/containers/vector.h" #include "editor/editor_node.h" -#include "core/scene/resources/gradient.h" +#include "scene/resources/gradient.h" Size2 GradientEditor::get_minimum_size() const { return Size2(0, 60) * EDSCALE; diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index a9d1beafc..b1d705164 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -63,7 +63,7 @@ #include "scene/resources/mesh/mesh.h" #include "scene/resources/shader.h" #include "scene/resources/texture.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class EditorNode; diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index 140c37ab6..aaea25a25 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/main/scene_tree.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "spatial_editor_plugin.h" void MeshInstanceEditor::_node_removed(Node *p_node) { diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index 00e287d27..4e45a9ce4 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/gui/separator.h" #include "scene/gui/tool_button.h" #include "scene/main/node.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/resources/texture.h" void Path2DEditor::_notification(int p_what) { diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index a3690fdc5..0f240a00b 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -54,7 +54,7 @@ #include "scene/gui/separator.h" #include "scene/gui/tool_button.h" #include "scene/main/node.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/resources/material/material.h" #include "spatial_editor_plugin.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index d7230b4fb..8866b73cf 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class EditorNode; class Node2D; diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 4f75b6613..93551d6bb 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -90,14 +90,14 @@ #include "scene/main/viewport.h" #include "scene/resources/environment_3d.h" #include "scene/resources/font/font.h" -#include "core/scene/resources/gradient.h" +#include "scene/resources/gradient.h" #include "scene/resources/packed_scene.h" #include "scene/resources/shader.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/resources/style_box.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index 24c817be4..88429c889 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/polygon_2d.h" #include "scene/gui/box_container.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "thirdparty/misc/clipper.hpp" #include "scene/resources/mesh/mesh.h" #include "core/variant/array.h" diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 7bec17926..cdad23717 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" /** @author Mariano Suligoy diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index dbf08a348..2be08c154 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -85,8 +85,8 @@ #include "scene/main/scene_tree.h" #include "scene/resources/texture.h" #include "servers/navigation_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" #include "thirdparty/minizip/ioapi.h" #include "thirdparty/minizip/unzip.h" diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index a53ce2e0f..3b15b15f0 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void EditorResourceConversionPlugin::_bind_methods() { MethodInfo mi; diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index a8b5cf3bb..0e64ae547 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -86,27 +86,27 @@ #include "scene/main/scene_tree.h" #include "scene/main/timer.h" #include "scene/main/viewport.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/cylinder_shape.h" -#include "core/scene/resources/shapes/height_map_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/material/material.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/occluder_shape.h" #include "scene/resources/occluder_shape_polygon.h" -#include "core/scene/resources/shapes/plane_shape.h" +#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "core/scene/resources/shapes/ray_shape.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/ray_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef MODULE_SKELETON_3D_ENABLED #include "modules/skeleton_3d/nodes/skeleton.h" diff --git a/editor_modules/gltf/extensions/physics/gltf_collider.cpp b/editor_modules/gltf/extensions/physics/gltf_collider.cpp index b4543675a..04068358a 100644 --- a/editor_modules/gltf/extensions/physics/gltf_collider.cpp +++ b/editor_modules/gltf/extensions/physics/gltf_collider.cpp @@ -33,12 +33,12 @@ #include "../../gltf_state.h" #include "core/math/convex_hull.h" #include "scene/3d/area.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/cylinder_shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/shapes/sphere_shape.h" void GLTFCollider::_bind_methods() { ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false)); diff --git a/editor_modules/shader_editor/shader_editor_plugin.cpp b/editor_modules/shader_editor/shader_editor_plugin.cpp index dba9a07f9..e5fbcea37 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 e19d3ea9a..7b7f5304f 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef DEV_ENABLED #include "core/os/thread.h" diff --git a/main/main.cpp b/main/main.cpp index dae21c10a..e7c41eec2 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -67,10 +67,10 @@ #include "servers/navigation/navigation_mesh_generator_dummy.h" #include "servers/navigation_2d_server.h" #include "servers/navigation_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" #include "servers/register_server_types.h" -#include "core/servers/rendering/rendering_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" #ifdef TOOLS_ENABLED #include "editor/doc/doc_data.h" diff --git a/main/performance.cpp b/main/performance.cpp index 1074274f0..5590315a2 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -36,9 +36,9 @@ #include "scene/main/scene_tree.h" #include "servers/audio_server.h" #include "servers/navigation_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" Performance *Performance::singleton = nullptr; diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index deb3170f6..5a3c4989e 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -36,8 +36,8 @@ #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_server.h" +#include "servers/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 1db1baaad..bf7c2ab4e 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -35,8 +35,8 @@ #include "core/os/os.h" #include "core/string/print_string.h" #include "scene/resources/texture.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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 fcef9fba9..39881b697 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #define OBJECT_COUNT 50 diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index cb5740191..4aef660d8 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -30,7 +30,7 @@ #include "csg_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/world_3d.h" #include "scene/resources/mesh/mesh.h" diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h index 43e77bf21..de0edb2bb 100644 --- a/modules/csg/csg_shape.h +++ b/modules/csg/csg_shape.h @@ -36,7 +36,7 @@ #include "csg.h" #include "scene/3d/path.h" #include "scene/3d/visual_instance.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" #include "thirdparty/misc/mikktspace.h" class CSGShape : public GeometryInstance { diff --git a/modules/entity_spell_system/entities/stats/stat_data.h b/modules/entity_spell_system/entities/stats/stat_data.h index 660083a7b..a654baa99 100644 --- a/modules/entity_spell_system/entities/stats/stat_data.h +++ b/modules/entity_spell_system/entities/stats/stat_data.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/object/resource.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "level_stat_data.h" diff --git a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp index 04a513c75..adac1404b 100644 --- a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp +++ b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp @@ -35,18 +35,18 @@ #include "core/math/convex_hull.h" #include "scene/3d/mesh_instance.h" #include "scene/3d/physics_body.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/cylinder_shape.h" -#include "core/scene/resources/shapes/height_map_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" -#include "core/scene/resources/shapes/plane_shape.h" +#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) { return (Object::cast_to(p_node) != nullptr); diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index d905aadbc..d8a1675a4 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/world_3d.h" diff --git a/modules/gridmap/mesh_library.cpp b/modules/gridmap/mesh_library.cpp index 611b37857..b97685fd2 100644 --- a/modules/gridmap/mesh_library.cpp +++ b/modules/gridmap/mesh_library.cpp @@ -30,7 +30,7 @@ #include "mesh_library.h" -#include "core/scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/box_shape.h" #include "scene/resources/navigation/navigation_mesh.h" MeshLibrary::Item::Item() { diff --git a/modules/gridmap/mesh_library.h b/modules/gridmap/mesh_library.h index 633899417..02e54eb32 100644 --- a/modules/gridmap/mesh_library.h +++ b/modules/gridmap/mesh_library.h @@ -35,7 +35,7 @@ #include "core/object/resource.h" #include "scene/3d/navigation_mesh_instance.h" #include "scene/resources/mesh/mesh.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class NavigationMesh; diff --git a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp index 5b2624912..19c981fa4 100644 --- a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp +++ b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp @@ -6,7 +6,7 @@ #include "core/io/resource_loader.h" #include "scene/resources/texture.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" String ImagePickerButton::get_image_path() { return image_path; diff --git a/modules/mesh_data_resource/mesh_data_resource.h b/modules/mesh_data_resource/mesh_data_resource.h index 1f0433def..089f2ffe9 100644 --- a/modules/mesh_data_resource/mesh_data_resource.h +++ b/modules/mesh_data_resource/mesh_data_resource.h @@ -29,7 +29,7 @@ SOFTWARE. #include "scene/resources/mesh/mesh.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class MeshDataResource : public Resource { GDCLASS(MeshDataResource, Resource); diff --git a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp index 6fd582f44..7dcb2307f 100644 --- a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp +++ b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp @@ -22,13 +22,13 @@ SOFTWARE. #include "mdr_import_plugin_base.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/cylinder_shape.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/mesh_utils/mesh_utils.cpp b/modules/mesh_utils/mesh_utils.cpp index c71ec942c..992a7e31a 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "xatlas/xatlas.h" diff --git a/modules/mesh_utils/simplify.h b/modules/mesh_utils/simplify.h index a0348a59d..a0c55345b 100644 --- a/modules/mesh_utils/simplify.h +++ b/modules/mesh_utils/simplify.h @@ -32,7 +32,7 @@ #include #include -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" namespace Simplify { diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp index 974c98ba5..68331a743 100644 --- a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp +++ b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp @@ -33,12 +33,12 @@ #include "core/math/convex_hull.h" #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/physics_body_2d.h" -#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" -#include "core/scene/resources/shapes_2d/circle_shape_2d.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/capsule_shape_2d.h" +#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_polygon.h" diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp index 04cce7fdc..4d272aa49 100644 --- a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp +++ b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp @@ -33,16 +33,16 @@ #include "core/math/convex_hull.h" #include "scene/3d/mesh_instance.h" #include "scene/3d/physics_body.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/cylinder_shape.h" -#include "core/scene/resources/shapes/height_map_shape.h" -#include "core/scene/resources/shapes/plane_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/shapes/height_map_shape.h" +#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" diff --git a/modules/paint/nodes/curve_2d/editor/paint_curve_2d_editor_plugin.cpp b/modules/paint/nodes/curve_2d/editor/paint_curve_2d_editor_plugin.cpp index b827f4f33..d0d098393 100644 --- a/modules/paint/nodes/curve_2d/editor/paint_curve_2d_editor_plugin.cpp +++ b/modules/paint/nodes/curve_2d/editor/paint_curve_2d_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/gui/separator.h" #include "scene/gui/tool_button.h" #include "scene/main/node.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/resources/texture.h" #include "../paint_curve_2d.h" diff --git a/modules/paint/nodes/curve_2d/paint_curve_2d.cpp b/modules/paint/nodes/curve_2d/paint_curve_2d.cpp index 6da2d31f5..667f61028 100644 --- a/modules/paint/nodes/curve_2d/paint_curve_2d.cpp +++ b/modules/paint/nodes/curve_2d/paint_curve_2d.cpp @@ -31,7 +31,7 @@ #include "paint_curve_2d.h" #include "core/config/engine.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED 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 aa23ebba6..5f733231b 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 8f908b5cb..189dd2c9a 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "core/config/engine.h" @@ -16,7 +16,7 @@ } \ return r; -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" @@ -48,7 +48,7 @@ #include "tiled_wall/tiled_wall_data.h" -#include "core/scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/box_shape.h" const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2; diff --git a/modules/props/prop_instance_prop_job.cpp b/modules/props/prop_instance_prop_job.cpp index 1e42898ed..95fbe09f5 100644 --- a/modules/props/prop_instance_prop_job.cpp +++ b/modules/props/prop_instance_prop_job.cpp @@ -28,9 +28,9 @@ SOFTWARE. #include "prop_instance.h" #include "prop_instance_merger.h" #include "prop_mesher.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "singleton/prop_cache.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/props/props/prop_data.cpp b/modules/props/props/prop_data.cpp index 78b696f5c..f9e52a5eb 100644 --- a/modules/props/props/prop_data.cpp +++ b/modules/props/props/prop_data.cpp @@ -26,7 +26,7 @@ SOFTWARE. #include "prop_data_light.h" #include "prop_data_prop.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props/tiled_wall/tiled_wall.cpp b/modules/props/tiled_wall/tiled_wall.cpp index c8550d5ed..fce3aa866 100644 --- a/modules/props/tiled_wall/tiled_wall.cpp +++ b/modules/props/tiled_wall/tiled_wall.cpp @@ -16,7 +16,7 @@ #include "core/core_string_names.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "tiled_wall_data.h" int TiledWall::get_width() const { diff --git a/modules/props/tiled_wall/tiled_wall_data.cpp b/modules/props/tiled_wall/tiled_wall_data.cpp index e085fe81b..b773248d5 100644 --- a/modules/props/tiled_wall/tiled_wall_data.cpp +++ b/modules/props/tiled_wall/tiled_wall_data.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "tiled_wall_data.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #define VARIANT_ARRAY_GET(arr) \ Vector r; \ diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index 2bc6b376c..77961ad29 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -4,7 +4,7 @@ //#include "../thread_pool/thread_pool.h" #include "scene/resources/world_2d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "core/config/engine.h" @@ -19,7 +19,7 @@ } \ return r; -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "modules/modules_enabled.gen.h" @@ -45,7 +45,7 @@ #include "tiled_wall/tiled_wall_2d_data.h" -#include "core/scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/box_shape.h" bool Prop2DInstanceMerger::get_building() { return _building; diff --git a/modules/props_2d/prop_2d_instance_merger.h b/modules/props_2d/prop_2d_instance_merger.h index 3f22bb63a..2593b977d 100644 --- a/modules/props_2d/prop_2d_instance_merger.h +++ b/modules/props_2d/prop_2d_instance_merger.h @@ -25,7 +25,7 @@ SOFTWARE. #include "prop_2d_instance.h" #include "scene/main/node_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "core/math/vector3.h" diff --git a/modules/props_2d/prop_2d_instance_prop_job.cpp b/modules/props_2d/prop_2d_instance_prop_job.cpp index 3da8863ea..e6b9b9c53 100644 --- a/modules/props_2d/prop_2d_instance_prop_job.cpp +++ b/modules/props_2d/prop_2d_instance_prop_job.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "prop_2d_instance.h" #include "prop_2d_instance_merger.h" #include "prop_2d_mesher.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "singleton/prop_2d_cache.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/prop_2d_instance_prop_job.h b/modules/props_2d/prop_2d_instance_prop_job.h index 94a6e1195..1121aa61a 100644 --- a/modules/props_2d/prop_2d_instance_prop_job.h +++ b/modules/props_2d/prop_2d_instance_prop_job.h @@ -24,7 +24,7 @@ SOFTWARE. #include "prop_2d_instance_job.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/props/prop_2d_data.cpp b/modules/props_2d/props/prop_2d_data.cpp index a1523ad79..410800967 100644 --- a/modules/props_2d/props/prop_2d_data.cpp +++ b/modules/props_2d/props/prop_2d_data.cpp @@ -26,7 +26,7 @@ SOFTWARE. #include "prop_2d_data_light.h" #include "prop_2d_data_prop.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp b/modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp index 1efcb80c4..de2609742 100644 --- a/modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp +++ b/modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "tiled_wall_2d_data.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #define VARIANT_ARRAY_GET(arr) \ Vector r; \ diff --git a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp index 63dc6e323..a28eb552b 100644 --- a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp +++ b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp @@ -55,8 +55,8 @@ #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" #include "scene/main/viewport.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "physical_bone_editor_plugin.h" diff --git a/modules/skeleton_3d/nodes/physical_bone.h b/modules/skeleton_3d/nodes/physical_bone.h index adfcc0f14..9c6755faa 100644 --- a/modules/skeleton_3d/nodes/physical_bone.h +++ b/modules/skeleton_3d/nodes/physical_bone.h @@ -34,7 +34,7 @@ #include "core/object/reference.h" #include "core/containers/vset.h" #include "scene/3d/collision_object.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/3d/physics_body.h" class PhysicsMaterial; diff --git a/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp index 21e3a983d..642bacc5d 100644 --- a/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp +++ b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp @@ -31,7 +31,7 @@ #include "skeleton_modification_3d_jiggle.h" #include "../nodes/skeleton.h" #include "skeleton_modification_stack_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/world_3d.h" bool SkeletonModification3DJiggle::_set(const StringName &p_path, const Variant &p_value) { diff --git a/modules/terraman/meshers/default/terrain_mesher_default.cpp b/modules/terraman/meshers/default/terrain_mesher_default.cpp index 2e541a01c..7d7fb3cb8 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 41d1d0915..fff8240b1 100644 --- a/modules/terraman/world/default/terrain_chunk_default.cpp +++ b/modules/terraman/world/default/terrain_chunk_default.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "../../defines.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/terrain_mesher_default.h" diff --git a/modules/terraman/world/default/terrain_world_default.cpp b/modules/terraman/world/default/terrain_world_default.cpp index e26c05abf..40fdb896a 100644 --- a/modules/terraman/world/default/terrain_world_default.cpp +++ b/modules/terraman/world/default/terrain_world_default.cpp @@ -30,7 +30,7 @@ SOFTWARE. #include "../jobs/terrain_light_job.h" #include "../jobs/terrain_prop_job.h" #include "../jobs/terrain_terrain_job.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" _FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const { return _build_flags; diff --git a/modules/terraman/world/jobs/terrain_prop_job.cpp b/modules/terraman/world/jobs/terrain_prop_job.cpp index 92029ac54..b72f71bbf 100644 --- a/modules/terraman/world/jobs/terrain_prop_job.cpp +++ b/modules/terraman/world/jobs/terrain_prop_job.cpp @@ -32,7 +32,7 @@ SOFTWARE. #include "../../meshers/terrain_mesher.h" #include "../default/terrain_chunk_default.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/terraman/world/jobs/terrain_terrain_job.cpp b/modules/terraman/world/jobs/terrain_terrain_job.cpp index 62748e5db..5e425839e 100644 --- a/modules/terraman/world/jobs/terrain_terrain_job.cpp +++ b/modules/terraman/world/jobs/terrain_terrain_job.cpp @@ -30,7 +30,7 @@ SOFTWARE. #include "../../meshers/terrain_mesher.h" #include "../default/terrain_chunk_default.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/terraman/world/terrain_chunk.cpp b/modules/terraman/world/terrain_chunk.cpp index 1d595d5da..3bc88e7da 100644 --- a/modules/terraman/world/terrain_chunk.cpp +++ b/modules/terraman/world/terrain_chunk.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "core/object/message_queue.h" #include "jobs/terrain_job.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "terrain_structure.h" #include "core/os/thread_pool.h" diff --git a/modules/terraman/world/terrain_world_editor.cpp b/modules/terraman/world/terrain_world_editor.cpp index d16730bbf..8613698c1 100644 --- a/modules/terraman/world/terrain_world_editor.cpp +++ b/modules/terraman/world/terrain_world_editor.cpp @@ -34,7 +34,7 @@ SOFTWARE. #include "../library/terrain_library.h" #include "../library/terrain_surface.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "../defines.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 ba8260e5d..a260eb717 100644 --- a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp +++ b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp @@ -28,10 +28,10 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "scene/resources/world_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" _FORCE_INLINE_ int Terrain2DMesherDefault::get_build_flags() const { return _build_flags; diff --git a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp index 3cdcb997d..d77e02826 100644 --- a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp +++ b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "core/math/math_funcs.h" #include "../../library/terrain_2d_material_cache.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" void Terrain2DMesherIsometric::_add_chunk(Ref p_chunk) { Ref chunk = p_chunk; diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp index c06051786..d8f826d20 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp @@ -28,8 +28,8 @@ SOFTWARE. #include "../world/default/terrain_2d_chunk_default.h" #include "../world/terrain_2d_chunk.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "servers/physics_2d_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h index 2815d2619..4afc8af02 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.h +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h @@ -44,7 +44,7 @@ SOFTWARE. #include "../../mesh_data_resource/mesh_data_resource.h" #endif -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "../library/terrain_2d_library.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 eca18c776..fb2f25595 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "../../defines.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/terrain_2d_mesher_default.h" @@ -40,7 +40,7 @@ SOFTWARE. #include "../jobs/terrain_2d_terrain_job.h" #include "scene/resources/world_3d.h" #include "scene/resources/world_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider"; diff --git a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp index 585392177..f6324dc4e 100644 --- a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp +++ b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp @@ -30,7 +30,7 @@ SOFTWARE. #include "../../meshers/terrain_2d_mesher.h" #include "../default/terrain_2d_chunk_default.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h index 94968b83e..11fb5992e 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.h +++ b/modules/terraman_2d/world/terrain_2d_chunk.h @@ -49,7 +49,7 @@ SOFTWARE. #include "../../props_2d/props/prop_2d_data.h" #endif -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "../library/terrain_2d_library.h" #include "../library/terrain_2d_surface.h" diff --git a/modules/tile_map/tile_map.cpp b/modules/tile_map/tile_map.cpp index 6438a7ac5..d388c65ed 100644 --- a/modules/tile_map/tile_map.cpp +++ b/modules/tile_map/tile_map.cpp @@ -37,7 +37,7 @@ #include "scene/2d/collision_object_2d.h" #include "scene/resources/world_2d.h" #include "servers/navigation_2d_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #include "servers/rendering/rendering_server_canvas_helper.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/tile_map/tile_set.h b/modules/tile_map/tile_set.h index dccb7933d..e8f6e9c30 100644 --- a/modules/tile_map/tile_set.h +++ b/modules/tile_map/tile_set.h @@ -36,9 +36,9 @@ #include "core/variant/array.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_polygon_instance.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "scene/resources/navigation_2d/navigation_polygon.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/texture.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/tile_map/tile_set_editor_plugin.h b/modules/tile_map/tile_set_editor_plugin.h index 4a65f746d..643e27a5b 100644 --- a/modules/tile_map/tile_set_editor_plugin.h +++ b/modules/tile_map/tile_set_editor_plugin.h @@ -32,8 +32,8 @@ #include "editor/editor_node.h" #include "scene/2d/sprite.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "tile_set.h" #define WORKSPACE_MARGIN Vector2(10, 10) diff --git a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp index 00f253f4b..f10d580c8 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 bdd77d872..fd25e4d9f 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 7124f5d44..f3364b927 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 3c214424d..5aea61538 100644 --- a/modules/voxelman/world/default/voxel_chunk_default.cpp +++ b/modules/voxelman/world/default/voxel_chunk_default.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "../../defines.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/voxel_mesher_default.h" diff --git a/modules/voxelman/world/jobs/voxel_prop_job.cpp b/modules/voxelman/world/jobs/voxel_prop_job.cpp index 74a843b89..90181caca 100644 --- a/modules/voxelman/world/jobs/voxel_prop_job.cpp +++ b/modules/voxelman/world/jobs/voxel_prop_job.cpp @@ -33,7 +33,7 @@ SOFTWARE. #include "../../library/voxel_material_cache.h" #include "../default/voxel_chunk_default.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/voxelman/world/jobs/voxel_terrain_job.cpp b/modules/voxelman/world/jobs/voxel_terrain_job.cpp index 8e1fbaca4..9d16b16a2 100644 --- a/modules/voxelman/world/jobs/voxel_terrain_job.cpp +++ b/modules/voxelman/world/jobs/voxel_terrain_job.cpp @@ -30,7 +30,7 @@ SOFTWARE. #include "../../library/voxel_material_cache.h" #include "../default/voxel_chunk_default.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" diff --git a/modules/voxelman/world/voxel_chunk.cpp b/modules/voxelman/world/voxel_chunk.cpp index dd46f13e3..6d4377150 100644 --- a/modules/voxelman/world/voxel_chunk.cpp +++ b/modules/voxelman/world/voxel_chunk.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../defines.h" #include "jobs/voxel_job.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "voxel_structure.h" #include "core/os/thread_pool.h" diff --git a/modules/voxelman/world/voxel_world_editor.cpp b/modules/voxelman/world/voxel_world_editor.cpp index 2ab5dd2e9..3249230f5 100644 --- a/modules/voxelman/world/voxel_world_editor.cpp +++ b/modules/voxelman/world/voxel_world_editor.cpp @@ -34,7 +34,7 @@ SOFTWARE. #include "../library/voxel_library.h" #include "../library/voxel_surface.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "../defines.h" diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index c20671e0b..860fca91a 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 9f57303ef..a127653a6 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 b654ccc96..d604df8f8 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class OSIPhone : public OS_Unix { private: diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 36dcd6a32..47fbe00ad 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include #include diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 95754a14e..d30175ed2 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #undef CursorShape diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 8f32015c2..b54a4aeaa 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 7d3a32f24..e24346be0 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include #include diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 5849fdb7c..76d521b42 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -32,7 +32,7 @@ #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" #include "servers/audio_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void Area2D::set_space_override_mode(SpaceOverride p_mode) { space_override = p_mode; diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index c74491b3b..d2c45b239 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -38,7 +38,7 @@ #include "scene/resources/world_2d.h" #include "servers/audio/audio_stream.h" #include "servers/audio_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void AudioStreamPlayer2D::_mix_audio() { if (!stream_playback.is_valid() || !active.is_set() || diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index e45fd7e80..0095225ec 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void Camera2D::_update_scroll() { if (!is_inside_tree()) { diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 22ebf45c3..1784d4e65 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -32,7 +32,7 @@ #include "scene/resources/world_2d.h" #include "scene/main/scene_string_names.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void CollisionObject2D::_notification(int p_what) { switch (p_what) { diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index c3fec8032..0790bdb9b 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/node_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class CollisionObject2D : public Node2D { GDCLASS(CollisionObject2D, Node2D); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 37538d335..ba5a94fae 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -33,9 +33,9 @@ #include "collision_object_2d.h" #include "core/config/engine.h" #include "scene/2d/area_2d.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "thirdparty/misc/triangulator.h" diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 1ec06d7b1..7f7366cef 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -33,14 +33,14 @@ #include "collision_object_2d.h" #include "core/config/engine.h" #include "scene/2d/area_2d.h" -#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" -#include "core/scene/resources/shapes_2d/circle_shape_2d.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "core/scene/resources/shapes_2d/line_shape_2d.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "core/scene/resources/shapes_2d/segment_shape_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/capsule_shape_2d.h" +#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes_2d/line_shape_2d.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "scene/resources/shapes_2d/segment_shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" void CollisionShape2D::_shape_changed() { update(); diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 4ea47a531..a85b0cbc6 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void CPUParticles2D::set_emitting(bool p_emitting) { if (emitting == p_emitting) { diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index 58ca1ac18..d32238c92 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -33,7 +33,7 @@ #include "core/config/engine.h" #include "physics_body_2d.h" #include "scene/main/scene_string_names.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void Joint2D::_disconnect_signals() { Node *node_a = get_node_or_null(a); diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 777130a03..b693886a7 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Light2D::_edit_get_state() const { diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index b03128c29..9d0030848 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -32,7 +32,7 @@ #include "core/math/color.h" #include "core/math/vector2.h" -#include "core/scene/resources/gradient.h" +#include "scene/resources/gradient.h" //---------------------------------------------------------------------------- // Util diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 0085e43c9..b7fda2e78 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -31,7 +31,7 @@ #include "path_2d.h" #include "core/config/engine.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/main/scene_string_names.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 68d2472b1..6086aae11 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -40,7 +40,7 @@ #include "core/containers/rid.h" #include "scene/resources/physics_material.h" #include "scene/main/scene_string_names.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void PhysicsBody2D::_notification(int p_what) { } diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index d4d9a9dce..de6dda178 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -32,7 +32,7 @@ #include "core/containers/vset.h" #include "scene/2d/collision_object_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" class PhysicsMaterial; class KinematicCollision2D; diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index bc6af15b2..22904690d 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -34,7 +34,7 @@ #include "core/config/engine.h" #include "physics_body_2d.h" #include "scene/resources/world_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void RayCast2D::set_cast_to(const Vector2 &p_point) { cast_to = p_point; diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp index 1f22c601b..c75462323 100644 --- a/scene/2d/shape_cast_2d.cpp +++ b/scene/2d/shape_cast_2d.cpp @@ -34,8 +34,8 @@ #include "core/config/engine.h" #include "scene/2d/collision_object_2d.h" #include "scene/2d/physics_body_2d.h" -#include "core/scene/resources/shapes_2d/circle_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "servers/physics_2d_server.h" void ShapeCast2D::set_target_position(const Vector2 &p_point) { target_position = p_point; diff --git a/scene/2d/shape_cast_2d.h b/scene/2d/shape_cast_2d.h index a1f7dd936..f551fb42f 100644 --- a/scene/2d/shape_cast_2d.h +++ b/scene/2d/shape_cast_2d.h @@ -32,7 +32,7 @@ #define SHAPE_CAST_2D_H #include "scene/main/node_2d.h" -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/world_2d.h" class CollisionObject2D; diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index 16ffa61fa..e0e1a300a 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -33,8 +33,8 @@ #include "core/input/input_map.h" #include "core/input/input.h" #include "core/os/os.h" -#include "core/scene/resources/bit_map.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "scene/resources/bit_map.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/texture.h" #include "scene/main/scene_string_names.h" diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 730b54c16..c594b74cf 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -29,10 +29,10 @@ /*************************************************************************/ #include "area.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/main/scene_string_names.h" #include "servers/audio_server.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" void Area::set_space_override_mode(SpaceOverride p_mode) { space_override = p_mode; diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index b05658790..1f643c4a4 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -36,10 +36,10 @@ #include "scene/3d/listener.h" #include "scene/3d/spatial_velocity_tracker.h" #include "scene/main/viewport.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "servers/audio/audio_stream.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004) // Speaker-Placement Correction Amplitude Panning (SPCAP) diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index e205bcb3b..086c86ae4 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.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 "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" void CollisionObject::_notification(int p_what) { switch (p_what) { diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index ebe21f962..9c041a9b1 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.h @@ -32,7 +32,7 @@ #include "core/object/reference.h" #include "scene/main/spatial.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class CollisionObject : public Spatial { GDCLASS(CollisionObject, Spatial); diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index b54a66cda..159c2a58d 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -32,9 +32,9 @@ #include "collision_object.h" #include "core/math/geometry.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/shape.h" void CollisionPolygon::_build_polygon() { if (!parent) { diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index db5e7c3ae..8f1cc06b2 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -33,16 +33,16 @@ #include "core/math/quick_hull.h" #include "mesh_instance.h" #include "physics_body.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/mesh/mesh.h" -#include "core/scene/resources/shapes/plane_shape.h" -#include "core/scene/resources/shapes/ray_shape.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" -#include "core/servers/rendering/rendering_server.h" +#include "scene/resources/shapes/plane_shape.h" +#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" 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 50de3700c..8ab893967 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -33,13 +33,13 @@ #include "core/os/os.h" #include "scene/3d/camera.h" #include "scene/main/viewport.h" -#include "core/scene/resources/curve.h" -#include "core/scene/resources/gradient.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/material/particles_material.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" AABB CPUParticles::get_aabb() const { return AABB(); diff --git a/scene/3d/light.h b/scene/3d/light.h index 53592f520..f0cd8e22d 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/3d/visual_instance.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 df9565800..2a71216b5 100644 --- a/scene/3d/navigation_obstacle.cpp +++ b/scene/3d/navigation_obstacle.cpp @@ -38,10 +38,10 @@ #include "scene/resources/material/material.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/mesh/mesh.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 ee15ab2cd..4f129cfb7 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void Occluder::resource_changed(RES res) { update_gizmos(); diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index 8ce8903bb..c6eefe73b 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -31,11 +31,11 @@ #include "path.h" #include "core/config/engine.h" -#include "core/scene/resources/curve.h" +#include "scene/resources/curve.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" Path::Path() { SceneTree *st = SceneTree::get_singleton(); diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index f59aefe6d..95faf8664 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -33,7 +33,7 @@ #include "core/containers/vset.h" #include "core/object/reference.h" #include "scene/3d/collision_object.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" class PhysicsMaterial; class Skeleton; diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index 2fb89e43f..b8f3b74e2 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -31,7 +31,7 @@ #include "physics_joint.h" #include "scene/3d/physics_body.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/main/scene_string_names.h" void Joint::_disconnect_signals() { diff --git a/scene/3d/physics_joint.h b/scene/3d/physics_joint.h index 5e2f208b7..45b931861 100644 --- a/scene/3d/physics_joint.h +++ b/scene/3d/physics_joint.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/spatial.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" class PhysicsBody; diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 4856902e7..3124f662b 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" bool Portal::_portal_plane_convention = false; bool Portal::_settings_gizmo_show_margins = true; diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index a977315da..0bccd8c49 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -37,7 +37,7 @@ #include "scene/resources/material/spatial_material.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" void RayCast::set_cast_to(const Vector3 &p_point) { cast_to = p_point; diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index e2bf57a2c..aceb37e78 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 fa384806e..0c9883698 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 b5d7c4d52..ba9a6474a 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 "core/servers/rendering/rendering_server.h" +#include "servers/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/shape_cast.cpp b/scene/3d/shape_cast.cpp index 500b58697..76f3c9fb6 100644 --- a/scene/3d/shape_cast.cpp +++ b/scene/3d/shape_cast.cpp @@ -33,7 +33,7 @@ #include "collision_object.h" #include "core/config/engine.h" #include "mesh_instance.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" #include "scene/resources/material/material.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/mesh/mesh.h" diff --git a/scene/3d/shape_cast.h b/scene/3d/shape_cast.h index 83daa6e6b..1407eeffa 100644 --- a/scene/3d/shape_cast.h +++ b/scene/3d/shape_cast.h @@ -34,8 +34,8 @@ #include "core/math/color.h" #include "scene/main/spatial.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/servers/physics/physics_server.h" +#include "scene/resources/shapes/shape.h" +#include "servers/physics_server.h" class SpatialMaterial; diff --git a/scene/3d/soft_body.cpp b/scene/3d/soft_body.cpp index 94c736b16..c35ee9acb 100644 --- a/scene/3d/soft_body.cpp +++ b/scene/3d/soft_body.cpp @@ -37,7 +37,7 @@ #include "scene/3d/physics_body.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" SoftBodyRenderingServerHandler::SoftBodyRenderingServerHandler() {} diff --git a/scene/3d/spring_arm.cpp b/scene/3d/spring_arm.cpp index 19e6f6bbe..b04edc350 100644 --- a/scene/3d/spring_arm.cpp +++ b/scene/3d/spring_arm.cpp @@ -31,10 +31,10 @@ #include "spring_arm.h" #include "core/config/engine.h" #include "scene/3d/collision_object.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/world_3d.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" SpringArm::SpringArm() : spring_length(1), diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp index 9e4b825df..11e3215e1 100644 --- a/scene/3d/vehicle_body.cpp +++ b/scene/3d/vehicle_body.cpp @@ -30,7 +30,7 @@ #include "vehicle_body.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #define ROLLING_INFLUENCE_FIX diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index 81a091a08..76f9e1d77 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -35,7 +35,7 @@ #include "scene/3d/physics_body.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 33a4ddec4..92006c25e 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 38a125acd..079a1f9d1 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class Material; diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp index e7eb7dbec..f7163d177 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void ScriptDebuggerRemote::_send_video_memory() { List usage; diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 025f42baa..7857670be 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -31,7 +31,7 @@ #include "button.h" #include "core/string/translation.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 7c4226a9e..14d8a5743 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -30,7 +30,7 @@ #include "check_box.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 0fefcc7bb..a9ebebca0 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 "core/servers/rendering/rendering_server.h" +#include "servers/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/gradient_edit.h b/scene/gui/gradient_edit.h index c2bd8e481..4e7e2cea7 100644 --- a/scene/gui/gradient_edit.h +++ b/scene/gui/gradient_edit.h @@ -32,7 +32,7 @@ #include "scene/main/control.h" -#include "core/scene/resources/gradient.h" +#include "scene/resources/gradient.h" class PopupPanel; class ColorPicker; diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index 8dfb53f9a..d3cbf2960 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" void NinePatchRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index 2c1984f3f..356c10ea5 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -31,7 +31,7 @@ #include "texture_button.h" #include "core/typedefs.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" #include "scene/main/scene_string_names.h" #include diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index 3f7d76c51..1d371852a 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 ed3f05ee8..41a63d593 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 f915bede0..9fa5f9bdb 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 180792e5b..5222364a4 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Node2D::_edit_get_state() const { diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index c4ce5a64f..d48dd72a6 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -55,8 +55,8 @@ #include "scene/main/scene_string_names.h" #include "servers/audio_server.h" #include "servers/navigation_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" #include "viewport.h" #include "modules/modules_enabled.gen.h" // For freetype. diff --git a/scene/main/spatial.cpp b/scene/main/spatial.cpp index b3a0e4d04..8f19d0569 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 "core/servers/rendering/rendering_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" /* diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 134b577ef..f846844d1 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -56,7 +56,7 @@ #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" void ViewportTexture::setup_local_to_scene() { Node *local_scene = get_local_scene(); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 18432aafd..8bf56326a 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "world.h" class Camera; diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index b8a041dcd..dd6d622ec 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -139,22 +139,22 @@ #include "scene/main/viewport.h" #include "scene/main/world.h" #include "scene/audio/audio_stream_sample.h" -#include "core/scene/resources/bit_map.h" -#include "core/scene/resources/shapes/box_shape.h" -#include "core/scene/resources/shapes/capsule_shape.h" -#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" -#include "core/scene/resources/shapes_2d/circle_shape_2d.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "core/scene/resources/shapes/cylinder_shape.h" +#include "scene/resources/bit_map.h" +#include "scene/resources/shapes/box_shape.h" +#include "scene/resources/shapes/capsule_shape.h" +#include "scene/resources/shapes_2d/capsule_shape_2d.h" +#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "scene/resources/shapes/cylinder_shape.h" #include "scene/resources/default_theme/default_theme.h" #include "scene/resources/font/dynamic_font.h" -#include "core/scene/resources/gradient.h" -#include "core/scene/resources/shapes/height_map_shape.h" +#include "scene/resources/gradient.h" +#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/mesh/immediate_mesh.h" -#include "core/scene/resources/shapes_2d/line_shape_2d.h" +#include "scene/resources/shapes_2d/line_shape_2d.h" #include "scene/resources/material/material.h" #include "scene/resources/material/spatial_material.h" #include "scene/resources/material/shader_material.h" @@ -168,16 +168,16 @@ #include "scene/resources/packed_scene.h" #include "scene/resources/material/particles_material.h" #include "scene/resources/physics_material.h" -#include "core/scene/resources/shapes/plane_shape.h" +#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/polygon_path_finder.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "core/scene/resources/shapes/ray_shape.h" -#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "scene/resources/shapes/ray_shape.h" +#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/resource_format_text.h" -#include "core/scene/resources/shapes_2d/segment_shape_2d.h" +#include "scene/resources/shapes_2d/segment_shape_2d.h" #include "scene/resources/sky.h" -#include "core/scene/resources/shapes/sphere_shape.h" +#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/gui/resources/syntax_highlighter.h" #include "scene/resources/text_file.h" diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 914d8721a..45e45c171 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -18,6 +18,20 @@ env.scene_sources += thirdparty_obj scene_obj = [] env.add_source_files(scene_obj, "*.cpp") +# 2d shapes +shapes_2d_obj = [] +env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp") + +for o in shapes_2d_obj: + scene_obj.append(o) + +# 3d shapes +shapes_3d_obj = [] +env.add_source_files(shapes_3d_obj, "shapes/*.cpp") + +for o in shapes_3d_obj: + scene_obj.append(o) + # 2d navigation navigation_2d_obj = [] env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp") diff --git a/core/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp similarity index 100% rename from core/scene/resources/bit_map.cpp rename to scene/resources/bit_map.cpp diff --git a/core/scene/resources/bit_map.h b/scene/resources/bit_map.h similarity index 100% rename from core/scene/resources/bit_map.h rename to scene/resources/bit_map.h diff --git a/core/scene/resources/curve.cpp b/scene/resources/curve.cpp similarity index 100% rename from core/scene/resources/curve.cpp rename to scene/resources/curve.cpp diff --git a/core/scene/resources/curve.h b/scene/resources/curve.h similarity index 100% rename from core/scene/resources/curve.h rename to scene/resources/curve.h diff --git a/scene/resources/environment_3d.cpp b/scene/resources/environment_3d.cpp index c94ec7d6c..2abccdb87 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "texture.h" RID Environment3D::get_rid() const { diff --git a/core/scene/resources/gradient.cpp b/scene/resources/gradient.cpp similarity index 100% rename from core/scene/resources/gradient.cpp rename to scene/resources/gradient.cpp diff --git a/core/scene/resources/gradient.h b/scene/resources/gradient.h similarity index 100% rename from core/scene/resources/gradient.h rename to scene/resources/gradient.h diff --git a/scene/resources/material/material.h b/scene/resources/material/material.h index 849696b27..76ed3c49c 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class Material : public Resource { GDCLASS(Material, Resource); diff --git a/scene/resources/material/shader_material.h b/scene/resources/material/shader_material.h index 95c25bfdf..48a00c4fc 100644 --- a/scene/resources/material/shader_material.h +++ b/scene/resources/material/shader_material.h @@ -37,7 +37,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/shader.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class Texture; diff --git a/scene/resources/material/spatial_material.h b/scene/resources/material/spatial_material.h index 041abfc08..16134e58b 100644 --- a/scene/resources/material/spatial_material.h +++ b/scene/resources/material/spatial_material.h @@ -36,7 +36,7 @@ #include "scene/resources/material/material.h" #include "scene/resources/shader.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class Texture; diff --git a/scene/resources/mesh/importer_mesh.h b/scene/resources/mesh/importer_mesh.h index 66d0cfc38..2a6bab58f 100644 --- a/scene/resources/mesh/importer_mesh.h +++ b/scene/resources/mesh/importer_mesh.h @@ -33,8 +33,8 @@ #include "core/object/resource.h" #include "core/containers/local_vector.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" diff --git a/scene/resources/mesh/mesh.cpp b/scene/resources/mesh/mesh.cpp index 7f4a7a353..314379ea9 100644 --- a/scene/resources/mesh/mesh.cpp +++ b/scene/resources/mesh/mesh.cpp @@ -34,8 +34,8 @@ #include "core/containers/local_vector.h" #include "core/math/convex_hull.h" #include "core/containers/pair.h" -#include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "scene/resources/shapes/concave_polygon_shape.h" +#include "scene/resources/shapes/convex_polygon_shape.h" #include "surface_tool.h" #include diff --git a/scene/resources/mesh/mesh.h b/scene/resources/mesh/mesh.h index 8b04b3af9..df5d81252 100644 --- a/scene/resources/mesh/mesh.h +++ b/scene/resources/mesh/mesh.h @@ -35,8 +35,8 @@ #include "core/object/resource.h" #include "scene/resources/material/material.h" -#include "core/scene/resources/shapes/shape.h" -#include "core/servers/rendering/rendering_server.h" +#include "scene/resources/shapes/shape.h" +#include "servers/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 dc316143e..9b959d236 100644 --- a/scene/resources/mesh/multimesh.cpp +++ b/scene/resources/mesh/multimesh.cpp @@ -30,7 +30,7 @@ #include "multimesh.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 44608ff52..b5086938e 100644 --- a/scene/resources/mesh/multimesh.h +++ b/scene/resources/mesh/multimesh.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/resources/mesh/mesh.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 7f8186175..4100733cf 100644 --- a/scene/resources/mesh/primitive_meshes.cpp +++ b/scene/resources/mesh/primitive_meshes.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "primitive_meshes.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/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 42025ba34..b1192c679 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 f93b92643..7e4eafb8a 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED void OccluderShapePolygon::_update_aabb() { diff --git a/scene/resources/physics_material.h b/scene/resources/physics_material.h index f8e9d050b..3626b6a5b 100644 --- a/scene/resources/physics_material.h +++ b/scene/resources/physics_material.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/object/resource.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" class PhysicsMaterial : public Resource { GDCLASS(PhysicsMaterial, Resource); diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index e0ae66f64..db60febea 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "texture.h" Shader::Mode Shader::get_mode() const { diff --git a/core/scene/resources/shapes/box_shape.cpp b/scene/resources/shapes/box_shape.cpp similarity index 98% rename from core/scene/resources/shapes/box_shape.cpp rename to scene/resources/shapes/box_shape.cpp index 2ddd2b5ff..bd050ceae 100644 --- a/core/scene/resources/shapes/box_shape.cpp +++ b/scene/resources/shapes/box_shape.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "box_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector BoxShape::get_debug_mesh_lines() { Vector lines; diff --git a/core/scene/resources/shapes/box_shape.h b/scene/resources/shapes/box_shape.h similarity index 98% rename from core/scene/resources/shapes/box_shape.h rename to scene/resources/shapes/box_shape.h index b742cbbaf..7a90f4efd 100644 --- a/core/scene/resources/shapes/box_shape.h +++ b/scene/resources/shapes/box_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class BoxShape : public Shape { GDCLASS(BoxShape, Shape); diff --git a/core/scene/resources/shapes/capsule_shape.cpp b/scene/resources/shapes/capsule_shape.cpp similarity index 98% rename from core/scene/resources/shapes/capsule_shape.cpp rename to scene/resources/shapes/capsule_shape.cpp index 1595e30a4..ef3dda302 100644 --- a/core/scene/resources/shapes/capsule_shape.cpp +++ b/scene/resources/shapes/capsule_shape.cpp @@ -30,7 +30,7 @@ #include "capsule_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector CapsuleShape::get_debug_mesh_lines() { float radius = get_radius(); diff --git a/core/scene/resources/shapes/capsule_shape.h b/scene/resources/shapes/capsule_shape.h similarity index 98% rename from core/scene/resources/shapes/capsule_shape.h rename to scene/resources/shapes/capsule_shape.h index 378c65a76..6d1740388 100644 --- a/core/scene/resources/shapes/capsule_shape.h +++ b/scene/resources/shapes/capsule_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class CapsuleShape : public Shape { GDCLASS(CapsuleShape, Shape); diff --git a/core/scene/resources/shapes/concave_polygon_shape.cpp b/scene/resources/shapes/concave_polygon_shape.cpp similarity index 98% rename from core/scene/resources/shapes/concave_polygon_shape.cpp rename to scene/resources/shapes/concave_polygon_shape.cpp index 081ace689..fab953446 100644 --- a/core/scene/resources/shapes/concave_polygon_shape.cpp +++ b/scene/resources/shapes/concave_polygon_shape.cpp @@ -30,7 +30,7 @@ #include "concave_polygon_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector ConcavePolygonShape::get_debug_mesh_lines() { RBSet edges; diff --git a/core/scene/resources/shapes/concave_polygon_shape.h b/scene/resources/shapes/concave_polygon_shape.h similarity index 98% rename from core/scene/resources/shapes/concave_polygon_shape.h rename to scene/resources/shapes/concave_polygon_shape.h index 8fe652f31..191915835 100644 --- a/core/scene/resources/shapes/concave_polygon_shape.h +++ b/scene/resources/shapes/concave_polygon_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class ConcavePolygonShape : public Shape { GDCLASS(ConcavePolygonShape, Shape); diff --git a/core/scene/resources/shapes/convex_polygon_shape.cpp b/scene/resources/shapes/convex_polygon_shape.cpp similarity index 98% rename from core/scene/resources/shapes/convex_polygon_shape.cpp rename to scene/resources/shapes/convex_polygon_shape.cpp index 17775f0d3..7bb85210b 100644 --- a/core/scene/resources/shapes/convex_polygon_shape.cpp +++ b/scene/resources/shapes/convex_polygon_shape.cpp @@ -30,7 +30,7 @@ #include "convex_polygon_shape.h" #include "core/math/convex_hull.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector ConvexPolygonShape::get_debug_mesh_lines() { PoolVector points = get_points(); diff --git a/core/scene/resources/shapes/convex_polygon_shape.h b/scene/resources/shapes/convex_polygon_shape.h similarity index 98% rename from core/scene/resources/shapes/convex_polygon_shape.h rename to scene/resources/shapes/convex_polygon_shape.h index 03759c1d0..c994cdaa4 100644 --- a/core/scene/resources/shapes/convex_polygon_shape.h +++ b/scene/resources/shapes/convex_polygon_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class ConvexPolygonShape : public Shape { GDCLASS(ConvexPolygonShape, Shape); diff --git a/core/scene/resources/shapes/cylinder_shape.cpp b/scene/resources/shapes/cylinder_shape.cpp similarity index 98% rename from core/scene/resources/shapes/cylinder_shape.cpp rename to scene/resources/shapes/cylinder_shape.cpp index 581dbb284..45a05ab12 100644 --- a/core/scene/resources/shapes/cylinder_shape.cpp +++ b/scene/resources/shapes/cylinder_shape.cpp @@ -30,7 +30,7 @@ #include "cylinder_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector CylinderShape::get_debug_mesh_lines() { float radius = get_radius(); diff --git a/core/scene/resources/shapes/cylinder_shape.h b/scene/resources/shapes/cylinder_shape.h similarity index 98% rename from core/scene/resources/shapes/cylinder_shape.h rename to scene/resources/shapes/cylinder_shape.h index 0f7f023b1..2ae73481c 100644 --- a/core/scene/resources/shapes/cylinder_shape.h +++ b/scene/resources/shapes/cylinder_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class CylinderShape : public Shape { GDCLASS(CylinderShape, Shape); diff --git a/core/scene/resources/shapes/height_map_shape.cpp b/scene/resources/shapes/height_map_shape.cpp similarity index 99% rename from core/scene/resources/shapes/height_map_shape.cpp rename to scene/resources/shapes/height_map_shape.cpp index 111f7898a..6b3f25b5f 100644 --- a/core/scene/resources/shapes/height_map_shape.cpp +++ b/scene/resources/shapes/height_map_shape.cpp @@ -30,7 +30,7 @@ #include "height_map_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector HeightMapShape::get_debug_mesh_lines() { Vector points; diff --git a/core/scene/resources/shapes/height_map_shape.h b/scene/resources/shapes/height_map_shape.h similarity index 98% rename from core/scene/resources/shapes/height_map_shape.h rename to scene/resources/shapes/height_map_shape.h index 914c30d69..af63b42d7 100644 --- a/core/scene/resources/shapes/height_map_shape.h +++ b/scene/resources/shapes/height_map_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class HeightMapShape : public Shape { GDCLASS(HeightMapShape, Shape); diff --git a/core/scene/resources/shapes/plane_shape.cpp b/scene/resources/shapes/plane_shape.cpp similarity index 98% rename from core/scene/resources/shapes/plane_shape.cpp rename to scene/resources/shapes/plane_shape.cpp index f693666ce..b0d0740d9 100644 --- a/core/scene/resources/shapes/plane_shape.cpp +++ b/scene/resources/shapes/plane_shape.cpp @@ -30,7 +30,7 @@ #include "plane_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector PlaneShape::get_debug_mesh_lines() { Plane p = get_plane(); diff --git a/core/scene/resources/shapes/plane_shape.h b/scene/resources/shapes/plane_shape.h similarity index 98% rename from core/scene/resources/shapes/plane_shape.h rename to scene/resources/shapes/plane_shape.h index 9fe1d1af8..bcf2c9984 100644 --- a/core/scene/resources/shapes/plane_shape.h +++ b/scene/resources/shapes/plane_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class PlaneShape : public Shape { GDCLASS(PlaneShape, Shape); diff --git a/core/scene/resources/shapes/ray_shape.cpp b/scene/resources/shapes/ray_shape.cpp similarity index 98% rename from core/scene/resources/shapes/ray_shape.cpp rename to scene/resources/shapes/ray_shape.cpp index a6694f1ae..965a5e0c0 100644 --- a/core/scene/resources/shapes/ray_shape.cpp +++ b/scene/resources/shapes/ray_shape.cpp @@ -30,7 +30,7 @@ #include "ray_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector RayShape::get_debug_mesh_lines() { Vector points; diff --git a/core/scene/resources/shapes/ray_shape.h b/scene/resources/shapes/ray_shape.h similarity index 98% rename from core/scene/resources/shapes/ray_shape.h rename to scene/resources/shapes/ray_shape.h index ed34cee4d..2c154cc97 100644 --- a/core/scene/resources/shapes/ray_shape.h +++ b/scene/resources/shapes/ray_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class RayShape : public Shape { GDCLASS(RayShape, Shape); diff --git a/core/scene/resources/shapes/shape.cpp b/scene/resources/shapes/shape.cpp similarity index 98% rename from core/scene/resources/shapes/shape.cpp rename to scene/resources/shapes/shape.cpp index 6834b232e..761dc1b65 100644 --- a/core/scene/resources/shapes/shape.cpp +++ b/scene/resources/shapes/shape.cpp @@ -33,7 +33,7 @@ #include "core/os/os.h" #include "scene/main/scene_tree.h" #include "scene/resources/mesh/mesh.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" void Shape::add_vertices_to_array(PoolVector &array, const Transform &p_xform) { Vector toadd = get_debug_mesh_lines(); diff --git a/core/scene/resources/shapes/shape.h b/scene/resources/shapes/shape.h similarity index 100% rename from core/scene/resources/shapes/shape.h rename to scene/resources/shapes/shape.h diff --git a/core/scene/resources/shapes/sphere_shape.cpp b/scene/resources/shapes/sphere_shape.cpp similarity index 98% rename from core/scene/resources/shapes/sphere_shape.cpp rename to scene/resources/shapes/sphere_shape.cpp index 0ef3d396b..e2f9ba1a1 100644 --- a/core/scene/resources/shapes/sphere_shape.cpp +++ b/scene/resources/shapes/sphere_shape.cpp @@ -30,7 +30,7 @@ #include "sphere_shape.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" Vector SphereShape::get_debug_mesh_lines() { float r = get_radius(); diff --git a/core/scene/resources/shapes/sphere_shape.h b/scene/resources/shapes/sphere_shape.h similarity index 98% rename from core/scene/resources/shapes/sphere_shape.h rename to scene/resources/shapes/sphere_shape.h index c1c597e0a..c304f2e2d 100644 --- a/core/scene/resources/shapes/sphere_shape.h +++ b/scene/resources/shapes/sphere_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes/shape.h" +#include "scene/resources/shapes/shape.h" class SphereShape : public Shape { GDCLASS(SphereShape, Shape); diff --git a/core/scene/resources/shapes_2d/capsule_shape_2d.cpp b/scene/resources/shapes_2d/capsule_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/capsule_shape_2d.cpp rename to scene/resources/shapes_2d/capsule_shape_2d.cpp index a7d88a988..51216a34b 100644 --- a/core/scene/resources/shapes_2d/capsule_shape_2d.cpp +++ b/scene/resources/shapes_2d/capsule_shape_2d.cpp @@ -30,8 +30,8 @@ #include "capsule_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/rendering_server.h" Vector CapsuleShape2D::get_points() const { Vector points; diff --git a/core/scene/resources/shapes_2d/capsule_shape_2d.h b/scene/resources/shapes_2d/capsule_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/capsule_shape_2d.h rename to scene/resources/shapes_2d/capsule_shape_2d.h index da258de3d..e09b4e081 100644 --- a/core/scene/resources/shapes_2d/capsule_shape_2d.h +++ b/scene/resources/shapes_2d/capsule_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class CapsuleShape2D : public Shape2D { GDCLASS(CapsuleShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/circle_shape_2d.cpp b/scene/resources/shapes_2d/circle_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/circle_shape_2d.cpp rename to scene/resources/shapes_2d/circle_shape_2d.cpp index 1f2c6a0e2..af4e9d7eb 100644 --- a/core/scene/resources/shapes_2d/circle_shape_2d.cpp +++ b/scene/resources/shapes_2d/circle_shape_2d.cpp @@ -30,8 +30,8 @@ #include "circle_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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/core/scene/resources/shapes_2d/circle_shape_2d.h b/scene/resources/shapes_2d/circle_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/circle_shape_2d.h rename to scene/resources/shapes_2d/circle_shape_2d.h index 9e95b219c..d5a64e2ca 100644 --- a/core/scene/resources/shapes_2d/circle_shape_2d.h +++ b/scene/resources/shapes_2d/circle_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class CircleShape2D : public Shape2D { GDCLASS(CircleShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp rename to scene/resources/shapes_2d/concave_polygon_shape_2d.cpp index 7395fe463..8157b76bb 100644 --- a/core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp +++ b/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp @@ -30,8 +30,8 @@ #include "concave_polygon_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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/core/scene/resources/shapes_2d/concave_polygon_shape_2d.h b/scene/resources/shapes_2d/concave_polygon_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/concave_polygon_shape_2d.h rename to scene/resources/shapes_2d/concave_polygon_shape_2d.h index 0a558a6ac..85bf03fc5 100644 --- a/core/scene/resources/shapes_2d/concave_polygon_shape_2d.h +++ b/scene/resources/shapes_2d/concave_polygon_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class ConcavePolygonShape2D : public Shape2D { GDCLASS(ConcavePolygonShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp rename to scene/resources/shapes_2d/convex_polygon_shape_2d.cpp index 99dcbf2ef..7231d2c9b 100644 --- a/core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp +++ b/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp @@ -31,8 +31,8 @@ #include "convex_polygon_shape_2d.h" #include "core/math/geometry.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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/core/scene/resources/shapes_2d/convex_polygon_shape_2d.h b/scene/resources/shapes_2d/convex_polygon_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/convex_polygon_shape_2d.h rename to scene/resources/shapes_2d/convex_polygon_shape_2d.h index 23d1c8db0..5abf2c1ad 100644 --- a/core/scene/resources/shapes_2d/convex_polygon_shape_2d.h +++ b/scene/resources/shapes_2d/convex_polygon_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class ConvexPolygonShape2D : public Shape2D { GDCLASS(ConvexPolygonShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/line_shape_2d.cpp b/scene/resources/shapes_2d/line_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/line_shape_2d.cpp rename to scene/resources/shapes_2d/line_shape_2d.cpp index fddb1a39b..e5b1ae919 100644 --- a/core/scene/resources/shapes_2d/line_shape_2d.cpp +++ b/scene/resources/shapes_2d/line_shape_2d.cpp @@ -30,8 +30,8 @@ #include "line_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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/core/scene/resources/shapes_2d/line_shape_2d.h b/scene/resources/shapes_2d/line_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/line_shape_2d.h rename to scene/resources/shapes_2d/line_shape_2d.h index 535785853..ace327405 100644 --- a/core/scene/resources/shapes_2d/line_shape_2d.h +++ b/scene/resources/shapes_2d/line_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class LineShape2D : public Shape2D { GDCLASS(LineShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/rectangle_shape_2d.cpp b/scene/resources/shapes_2d/rectangle_shape_2d.cpp similarity index 97% rename from core/scene/resources/shapes_2d/rectangle_shape_2d.cpp rename to scene/resources/shapes_2d/rectangle_shape_2d.cpp index 9f80dae8f..ff5e2c6d4 100644 --- a/core/scene/resources/shapes_2d/rectangle_shape_2d.cpp +++ b/scene/resources/shapes_2d/rectangle_shape_2d.cpp @@ -30,8 +30,8 @@ #include "rectangle_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/rendering_server.h" void RectangleShape2D::_update_shape() { Physics2DServer::get_singleton()->shape_set_data(get_rid(), extents); emit_changed(); diff --git a/core/scene/resources/shapes_2d/rectangle_shape_2d.h b/scene/resources/shapes_2d/rectangle_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/rectangle_shape_2d.h rename to scene/resources/shapes_2d/rectangle_shape_2d.h index ab66966bf..3ad44f13e 100644 --- a/core/scene/resources/shapes_2d/rectangle_shape_2d.h +++ b/scene/resources/shapes_2d/rectangle_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class RectangleShape2D : public Shape2D { GDCLASS(RectangleShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/segment_shape_2d.cpp b/scene/resources/shapes_2d/segment_shape_2d.cpp similarity index 98% rename from core/scene/resources/shapes_2d/segment_shape_2d.cpp rename to scene/resources/shapes_2d/segment_shape_2d.cpp index 716add6f4..47f2b7100 100644 --- a/core/scene/resources/shapes_2d/segment_shape_2d.cpp +++ b/scene/resources/shapes_2d/segment_shape_2d.cpp @@ -30,8 +30,8 @@ #include "segment_shape_2d.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/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/core/scene/resources/shapes_2d/segment_shape_2d.h b/scene/resources/shapes_2d/segment_shape_2d.h similarity index 98% rename from core/scene/resources/shapes_2d/segment_shape_2d.h rename to scene/resources/shapes_2d/segment_shape_2d.h index d4670fb22..759c35acd 100644 --- a/core/scene/resources/shapes_2d/segment_shape_2d.h +++ b/scene/resources/shapes_2d/segment_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/scene/resources/shapes_2d/shape_2d.h" +#include "scene/resources/shapes_2d/shape_2d.h" class SegmentShape2D : public Shape2D { GDCLASS(SegmentShape2D, Shape2D); diff --git a/core/scene/resources/shapes_2d/shape_2d.cpp b/scene/resources/shapes_2d/shape_2d.cpp similarity index 99% rename from core/scene/resources/shapes_2d/shape_2d.cpp rename to scene/resources/shapes_2d/shape_2d.cpp index 21a795ec8..806c62ed6 100644 --- a/core/scene/resources/shapes_2d/shape_2d.cpp +++ b/scene/resources/shapes_2d/shape_2d.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" RID Shape2D::get_rid() const { return shape; diff --git a/core/scene/resources/shapes_2d/shape_2d.h b/scene/resources/shapes_2d/shape_2d.h similarity index 100% rename from core/scene/resources/shapes_2d/shape_2d.h rename to scene/resources/shapes_2d/shape_2d.h diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 6ee3eb497..4a0d8516b 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" class CanvasItem; diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index a28f03d27..c2fb8a918 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -36,7 +36,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/os/os.h" #include "scene/resources/mesh/mesh.h" -#include "core/scene/resources/bit_map.h" +#include "scene/resources/bit_map.h" Size2 Texture::get_size() const { return Size2(get_width(), get_height()); diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 18e232ebe..fd78aa80d 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -36,9 +36,9 @@ #include "core/os/mutex.h" #include "core/os/rw_lock.h" #include "core/os/thread_safe.h" -#include "core/scene/resources/curve.h" -#include "core/scene/resources/gradient.h" -#include "core/servers/rendering/rendering_server.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" +#include "servers/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 01a7c428c..c437249b4 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -36,8 +36,8 @@ #include "scene/main/viewport.h" #include "scene/main/world.h" #include "servers/navigation_2d_server.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_2d_server.h" +#include "servers/rendering_server.h" struct SpatialIndexer2D { struct CellRef { diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h index e85069e15..ad740b219 100644 --- a/scene/resources/world_2d.h +++ b/scene/resources/world_2d.h @@ -32,7 +32,7 @@ #include "core/config/project_settings.h" #include "core/object/resource.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" class VisibilityNotifier2D; class Viewport; diff --git a/scene/resources/world_3d.h b/scene/resources/world_3d.h index cce942cc7..61d26c60c 100644 --- a/scene/resources/world_3d.h +++ b/scene/resources/world_3d.h @@ -33,8 +33,8 @@ #include "core/object/resource.h" #include "scene/resources/environment_3d.h" -#include "core/servers/physics/physics_server.h" -#include "core/servers/rendering/rendering_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" class Camera; class VisibilityNotifier; diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h index 0a083a8e9..4f9973ed0 100644 --- a/servers/physics/area_sw.h +++ b/servers/physics/area_sw.h @@ -32,7 +32,7 @@ #include "collision_object_sw.h" #include "core/containers/self_list.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" //#include "servers/physics/query_sw.h" class SpaceSW; diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h index a692eac5f..90244af64 100644 --- a/servers/physics/collision_object_sw.h +++ b/servers/physics/collision_object_sw.h @@ -32,7 +32,7 @@ #include "broad_phase_sw.h" #include "core/containers/self_list.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "shape_sw.h" #ifdef DEBUG_ENABLED diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index b971089f4..20cf5ac45 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "joints_sw.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" #include "shape_sw.h" #include "space_sw.h" #include "step_sw.h" diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index dd851e323..b8cbf4782 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -33,7 +33,7 @@ #include "core/containers/local_vector.h" #include "core/math/bsp_tree.h" #include "core/math/geometry.h" -#include "core/servers/physics/physics_server.h" +#include "servers/physics_server.h" /* SHAPE_LINE, ///< plane:"plane" diff --git a/servers/physics_2d/area_2d_sw.h b/servers/physics_2d/area_2d_sw.h index 32f381e50..9c39890df 100644 --- a/servers/physics_2d/area_2d_sw.h +++ b/servers/physics_2d/area_2d_sw.h @@ -32,7 +32,7 @@ #include "collision_object_2d_sw.h" #include "core/containers/self_list.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" //#include "servers/physics/query_sw.h" class Space2DSW; diff --git a/servers/physics_2d/collision_object_2d_sw.h b/servers/physics_2d/collision_object_2d_sw.h index d244e0fe5..88c7e6cbe 100644 --- a/servers/physics_2d/collision_object_2d_sw.h +++ b/servers/physics_2d/collision_object_2d_sw.h @@ -32,7 +32,7 @@ #include "broad_phase_2d_sw.h" #include "core/containers/self_list.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #include "shape_2d_sw.h" class Space2DSW; diff --git a/servers/physics_2d/physics_2d_server_sw.h b/servers/physics_2d/physics_2d_server_sw.h index e62d54bcd..3d68b3edc 100644 --- a/servers/physics_2d/physics_2d_server_sw.h +++ b/servers/physics_2d/physics_2d_server_sw.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "joints_2d_sw.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #include "shape_2d_sw.h" #include "space_2d_sw.h" #include "step_2d_sw.h" diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index b9b887b35..c1b445de6 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -34,7 +34,7 @@ #include "core/os/thread.h" #include "core/config/project_settings.h" #include "core/os/safe_refcount.h" -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #ifdef DEBUG_SYNC #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__)); diff --git a/servers/physics_2d/shape_2d_sw.h b/servers/physics_2d/shape_2d_sw.h index c3e666445..18b0b92f0 100644 --- a/servers/physics_2d/shape_2d_sw.h +++ b/servers/physics_2d/shape_2d_sw.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/servers/physics_2d/physics_2d_server.h" +#include "servers/physics_2d_server.h" #define _SEGMENT_IS_VALID_SUPPORT_THRESHOLD 0.99998 /* diff --git a/core/servers/physics_2d/physics_2d_server.cpp b/servers/physics_2d_server.cpp similarity index 100% rename from core/servers/physics_2d/physics_2d_server.cpp rename to servers/physics_2d_server.cpp diff --git a/core/servers/physics_2d/physics_2d_server.h b/servers/physics_2d_server.h similarity index 100% rename from core/servers/physics_2d/physics_2d_server.h rename to servers/physics_2d_server.h diff --git a/core/servers/physics/physics_server.cpp b/servers/physics_server.cpp similarity index 100% rename from core/servers/physics/physics_server.cpp rename to servers/physics_server.cpp diff --git a/core/servers/physics/physics_server.h b/servers/physics_server.h similarity index 100% rename from core/servers/physics/physics_server.h rename to servers/physics_server.h diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index e4161e559..43f4c6589 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -62,10 +62,11 @@ #include "physics/physics_server_sw.h" #include "physics_2d/physics_2d_server_sw.h" #include "physics_2d/physics_2d_server_wrap_mt.h" -#include "core/servers/physics_2d/physics_2d_server.h" -#include "core/servers/physics/physics_server.h" #include "rendering/shader_types.h" #include "scene/debugger/script_debugger_remote.h" +#include "servers/physics_2d_server.h" +#include "servers/physics_server.h" +#include "servers/rendering_server.h" static void _debugger_get_resource_usage(List *r_usage) { List tinfo; @@ -96,10 +97,26 @@ 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(); + ClassDB::register_virtual_class(); ClassDB::register_virtual_class(); //ClassDB::register_class(); @@ -207,6 +224,9 @@ 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("PhysicsServer", PhysicsServer::get_singleton())); + Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer", NavigationServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("Navigation2DServer", Navigation2DServer::get_singleton())); diff --git a/servers/rendering/portals/portal_gameplay_monitor.h b/servers/rendering/portals/portal_gameplay_monitor.h index 0a9375ecb..272532e33 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 "core/servers/rendering/rendering_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" #include diff --git a/servers/rendering/rasterizer.h b/servers/rendering/rasterizer.h index c5c8d7119..6aa1d76ab 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 e4a1750ca..35da7e716 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 9b966a5e3..3a9f2a10b 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 ec6ee14ac..ec3291baa 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 3ff289689..c53278503 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 a1ddad4e4..f29805b24 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 "core/servers/rendering/rendering_server.h" +#include "servers/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 155264de1..d44f4635e 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 "core/servers/rendering/rendering_server.h" +#include "servers/rendering_server.h" #include "shader_language.h" class ShaderTypes { diff --git a/core/servers/rendering/rendering_server.cpp b/servers/rendering_server.cpp similarity index 100% rename from core/servers/rendering/rendering_server.cpp rename to servers/rendering_server.cpp diff --git a/core/servers/rendering/rendering_server.h b/servers/rendering_server.h similarity index 100% rename from core/servers/rendering/rendering_server.h rename to servers/rendering_server.h diff --git a/core/servers/rendering/rendering_server_callbacks.cpp b/servers/rendering_server_callbacks.cpp similarity index 100% rename from core/servers/rendering/rendering_server_callbacks.cpp rename to servers/rendering_server_callbacks.cpp diff --git a/core/servers/rendering/rendering_server_callbacks.h b/servers/rendering_server_callbacks.h similarity index 100% rename from core/servers/rendering/rendering_server_callbacks.h rename to servers/rendering_server_callbacks.h