From e2d42db7115957abfad39522c7e7bbc5a6d26fcd Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 19 Aug 2022 21:24:36 +0200 Subject: [PATCH] Also renamed the files. --- core/math/bvh.h | 2 +- drivers/dummy/rasterizer_dummy.h | 4 +-- .../gles2/rasterizer_canvas_base_gles2.cpp | 2 +- drivers/gles2/rasterizer_canvas_base_gles2.h | 2 +- drivers/gles2/rasterizer_canvas_gles2.cpp | 2 +- drivers/gles2/rasterizer_gles2.h | 2 +- drivers/gles2/rasterizer_scene_gles2.cpp | 2 +- drivers/gles2/rasterizer_storage_gles2.cpp | 2 +- drivers/gles2/rasterizer_storage_gles2.h | 4 +-- drivers/gles2/shader_compiler_gles2.h | 6 ++-- drivers/gles2/shader_gles2.h | 2 +- .../gles_common/rasterizer_canvas_batcher.h | 2 +- drivers/unix/os_unix.cpp | 2 +- editor/animation_track_editor_plugins.cpp | 2 +- editor/editor_inspector.cpp | 2 +- editor/editor_node.cpp | 2 +- editor/editor_plugin.cpp | 2 +- editor/editor_resource_preview.cpp | 2 +- .../animation_player_editor_plugin.cpp | 2 +- editor/plugins/audio_stream_editor_plugin.cpp | 2 +- editor/plugins/canvas_item_editor_plugin.cpp | 2 +- editor/plugins/editor_preview_plugins.cpp | 2 +- editor/plugins/material_editor_plugin.cpp | 2 +- editor/plugins/polygon_2d_editor_plugin.cpp | 2 +- editor/plugins/shader_editor_plugin.cpp | 6 ++-- .../plugins/texture_region_editor_plugin.cpp | 2 +- editor/property_editor.cpp | 2 +- editor/spatial_editor_gizmos.cpp | 2 +- main/input_default.cpp | 2 +- main/main.cpp | 16 +++++----- main/performance.cpp | 2 +- main/tests/test_math.cpp | 2 +- main/tests/test_physics.cpp | 2 +- main/tests/test_physics_2d.cpp | 2 +- main/tests/test_render.cpp | 2 +- main/tests/test_shader_lang.cpp | 4 +-- modules/mesh_utils/mesh_utils.cpp | 2 +- modules/mesh_utils/simplify.h | 2 +- modules/props/prop_instance_merger.cpp | 4 +-- modules/props_2d/prop_2d_instance_merger.cpp | 2 +- .../default/terrain_mesher_default.cpp | 2 +- .../world/default/terrain_chunk_default.cpp | 2 +- .../default/terrain_2d_mesher_default.cpp | 2 +- .../default/terrain_2d_chunk_default.cpp | 2 +- .../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 | 2 +- platform/android/os_android.cpp | 10 +++---- platform/android/os_android.h | 4 +-- platform/frt/os_frt.cpp | 16 +++++----- platform/frt_sdl/frt_godot3.cc | 18 +++++------ platform/iphone/os_iphone.h | 6 ++-- platform/iphone/os_iphone.mm | 20 ++++++------- platform/javascript/os_javascript.cpp | 16 +++++----- platform/javascript/os_javascript.h | 4 +-- platform/osx/os_osx.h | 8 ++--- platform/osx/os_osx.mm | 12 ++++---- platform/server/os_server.cpp | 10 +++---- platform/server/os_server.h | 6 ++-- platform/windows/os_windows.cpp | 14 ++++----- platform/windows/os_windows.h | 6 ++-- platform/x11/os_x11.cpp | 16 +++++----- platform/x11/os_x11.h | 6 ++-- scene/2d/camera_2d.cpp | 2 +- scene/2d/canvas_item.cpp | 4 +-- scene/2d/cpu_particles_2d.cpp | 2 +- scene/2d/light_2d.cpp | 2 +- scene/2d/node_2d.cpp | 2 +- scene/3d/collision_shape.cpp | 2 +- scene/3d/cpu_particles.cpp | 2 +- scene/3d/light.h | 2 +- scene/3d/mesh_instance.cpp | 30 +++++++++---------- scene/3d/occluder.cpp | 4 +-- scene/3d/portal.cpp | 2 +- scene/3d/reflection_probe.cpp | 2 +- scene/3d/room.cpp | 2 +- scene/3d/room_group.cpp | 2 +- scene/3d/soft_body.cpp | 12 ++++---- scene/3d/soft_body.h | 2 +- scene/3d/spatial.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/control.cpp | 2 +- scene/gui/nine_patch_rect.cpp | 2 +- scene/gui/texture_rect.cpp | 2 +- scene/main/viewport.h | 2 +- scene/resources/capsule_shape_2d.cpp | 2 +- scene/resources/circle_shape_2d.cpp | 2 +- scene/resources/concave_polygon_shape_2d.cpp | 2 +- scene/resources/convex_polygon_shape_2d.cpp | 2 +- scene/resources/environment.cpp | 2 +- scene/resources/line_shape_2d.cpp | 2 +- scene/resources/material.cpp | 2 +- scene/resources/material.h | 2 +- scene/resources/mesh.h | 2 +- scene/resources/multimesh.cpp | 2 +- scene/resources/multimesh.h | 2 +- scene/resources/occluder_shape.cpp | 10 +++---- scene/resources/occluder_shape.h | 2 +- scene/resources/occluder_shape_polygon.cpp | 14 ++++----- scene/resources/occluder_shape_polygon.h | 2 +- scene/resources/primitive_meshes.cpp | 2 +- scene/resources/rectangle_shape_2d.cpp | 2 +- scene/resources/segment_shape_2d.cpp | 2 +- scene/resources/shader.cpp | 4 +-- scene/resources/style_box.h | 2 +- scene/resources/texture.h | 2 +- scene/resources/world.h | 2 +- scene/resources/world_2d.cpp | 2 +- servers/SCsub | 2 +- servers/physics/physics_server_sw.h | 2 +- servers/physics_server.h | 2 +- servers/register_server_types.cpp | 4 +-- servers/{visual => rendering}/SCsub | 0 servers/{visual => rendering}/portals/SCsub | 0 .../portals/portal_defines.h | 0 .../portals/portal_gameplay_monitor.cpp | 4 +-- .../portals/portal_gameplay_monitor.h | 2 +- .../portals/portal_occlusion_culler.cpp | 4 +-- .../portals/portal_occlusion_culler.h | 0 .../portals/portal_pvs.cpp | 0 .../portals/portal_pvs.h | 0 .../portals/portal_pvs_builder.cpp | 0 .../portals/portal_pvs_builder.h | 0 .../portals/portal_renderer.cpp | 4 +-- .../portals/portal_renderer.h | 0 .../portals/portal_resources.cpp | 0 .../portals/portal_resources.h | 0 .../portals/portal_rooms_bsp.cpp | 0 .../portals/portal_rooms_bsp.h | 0 .../portals/portal_tracer.cpp | 4 +-- .../portals/portal_tracer.h | 0 .../portals/portal_types.cpp | 0 .../portals/portal_types.h | 0 servers/{visual => rendering}/rasterizer.cpp | 0 servers/{visual => rendering}/rasterizer.h | 2 +- .../rendering_server_canvas.cpp} | 10 +++---- .../rendering_server_canvas.h} | 10 +++---- .../rendering_server_globals.cpp} | 4 +-- .../rendering_server_globals.h} | 8 ++--- .../rendering_server_raster.cpp} | 10 +++---- .../rendering_server_raster.h} | 18 +++++------ .../rendering_server_scene.cpp} | 12 ++++---- .../rendering_server_scene.h} | 14 ++++----- .../rendering_server_viewport.cpp} | 10 +++---- .../rendering_server_viewport.h} | 10 +++---- .../rendering_server_wrap_mt.cpp} | 28 ++++++++--------- .../rendering_server_wrap_mt.h} | 26 ++++++++-------- .../{visual => rendering}/shader_language.cpp | 2 +- .../{visual => rendering}/shader_language.h | 0 .../{visual => rendering}/shader_types.cpp | 0 servers/{visual => rendering}/shader_types.h | 2 +- ...visual_server.cpp => rendering_server.cpp} | 4 +-- .../{visual_server.h => rendering_server.h} | 6 ++-- ...cks.cpp => rendering_server_callbacks.cpp} | 4 +-- ...llbacks.h => rendering_server_callbacks.h} | 8 ++--- 161 files changed, 339 insertions(+), 339 deletions(-) rename servers/{visual => rendering}/SCsub (100%) rename servers/{visual => rendering}/portals/SCsub (100%) rename servers/{visual => rendering}/portals/portal_defines.h (100%) rename servers/{visual => rendering}/portals/portal_gameplay_monitor.cpp (99%) rename servers/{visual => rendering}/portals/portal_gameplay_monitor.h (99%) rename servers/{visual => rendering}/portals/portal_occlusion_culler.cpp (99%) rename servers/{visual => rendering}/portals/portal_occlusion_culler.h (100%) rename servers/{visual => rendering}/portals/portal_pvs.cpp (100%) rename servers/{visual => rendering}/portals/portal_pvs.h (100%) rename servers/{visual => rendering}/portals/portal_pvs_builder.cpp (100%) rename servers/{visual => rendering}/portals/portal_pvs_builder.h (100%) rename servers/{visual => rendering}/portals/portal_renderer.cpp (99%) rename servers/{visual => rendering}/portals/portal_renderer.h (100%) rename servers/{visual => rendering}/portals/portal_resources.cpp (100%) rename servers/{visual => rendering}/portals/portal_resources.h (100%) rename servers/{visual => rendering}/portals/portal_rooms_bsp.cpp (100%) rename servers/{visual => rendering}/portals/portal_rooms_bsp.h (100%) rename servers/{visual => rendering}/portals/portal_tracer.cpp (99%) rename servers/{visual => rendering}/portals/portal_tracer.h (100%) rename servers/{visual => rendering}/portals/portal_types.cpp (100%) rename servers/{visual => rendering}/portals/portal_types.h (100%) rename servers/{visual => rendering}/rasterizer.cpp (100%) rename servers/{visual => rendering}/rasterizer.h (99%) rename servers/{visual/visual_server_canvas.cpp => rendering/rendering_server_canvas.cpp} (99%) rename servers/{visual/visual_server_canvas.h => rendering/rendering_server_canvas.h} (98%) rename servers/{visual/visual_server_globals.cpp => rendering/rendering_server_globals.cpp} (95%) rename servers/{visual/visual_server_globals.h => rendering/rendering_server_globals.h} (93%) rename servers/{visual/visual_server_raster.cpp => rendering/rendering_server_raster.cpp} (97%) rename servers/{visual/visual_server_raster.h => rendering/rendering_server_raster.h} (98%) rename servers/{visual/visual_server_scene.cpp => rendering/rendering_server_scene.cpp} (99%) rename servers/{visual/visual_server_scene.h => rendering/rendering_server_scene.h} (98%) rename servers/{visual/visual_server_viewport.cpp => rendering/rendering_server_viewport.cpp} (99%) rename servers/{visual/visual_server_viewport.h => rendering/rendering_server_viewport.h} (97%) rename servers/{visual/visual_server_wrap_mt.cpp => rendering/rendering_server_wrap_mt.cpp} (91%) rename servers/{visual/visual_server_wrap_mt.h => rendering/rendering_server_wrap_mt.h} (97%) rename servers/{visual => rendering}/shader_language.cpp (99%) rename servers/{visual => rendering}/shader_language.h (100%) rename servers/{visual => rendering}/shader_types.cpp (100%) rename servers/{visual => rendering}/shader_types.h (98%) rename servers/{visual_server.cpp => rendering_server.cpp} (99%) rename servers/{visual_server.h => rendering_server.h} (99%) rename servers/{visual_server_callbacks.cpp => rendering_server_callbacks.cpp} (95%) rename servers/{visual_server_callbacks.h => rendering_server_callbacks.h} (93%) diff --git a/core/math/bvh.h b/core/math/bvh.h index ab636c23d..0ad630983 100644 --- a/core/math/bvh.h +++ b/core/math/bvh.h @@ -39,7 +39,7 @@ // Some notes on the use of BVH / Octree from Godot 3.2. // This is not well explained elsewhere. // The rendering tree mask and types that are sent to the BVH are NOT layer masks. -// They are INSTANCE_TYPES (defined in visual_server.h), e.g. MESH, MULTIMESH, PARTICLES etc. +// They are INSTANCE_TYPES (defined in rendering_server.h), e.g. MESH, MULTIMESH, PARTICLES etc. // Thus the lights do no cull by layer mask in the BVH. // Layer masks are implemented in the renderers as a later step, and light_cull_mask appears to be diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 5eec82cb1..d27c9dcd1 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -33,8 +33,8 @@ #include "core/math/projection.h" #include "core/containers/self_list.h" #include "scene/resources/mesh.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" class RasterizerSceneDummy : public RasterizerScene { public: diff --git a/drivers/gles2/rasterizer_canvas_base_gles2.cpp b/drivers/gles2/rasterizer_canvas_base_gles2.cpp index 028d0a11b..d9b0b26ae 100644 --- a/drivers/gles2/rasterizer_canvas_base_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_base_gles2.cpp @@ -34,7 +34,7 @@ #include "core/config/project_settings.h" #include "drivers/gles_common/rasterizer_asserts.h" #include "rasterizer_scene_gles2.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #ifndef GLES_OVER_GL #define glClearDepth glClearDepthf diff --git a/drivers/gles2/rasterizer_canvas_base_gles2.h b/drivers/gles2/rasterizer_canvas_base_gles2.h index 5798cecb1..cd15b043a 100644 --- a/drivers/gles2/rasterizer_canvas_base_gles2.h +++ b/drivers/gles2/rasterizer_canvas_base_gles2.h @@ -32,7 +32,7 @@ #include "drivers/gles_common/rasterizer_array.h" #include "rasterizer_storage_gles2.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" #include "shaders/canvas.glsl.gen.h" #include "shaders/lens_distorted.glsl.gen.h" diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 67247d5ac..624fa30ca 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -35,7 +35,7 @@ #include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles_common/rasterizer_asserts.h" #include "rasterizer_scene_gles2.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" static const GLenum gl_primitive[] = { GL_POINTS, diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h index 413428563..707f7e9ce 100644 --- a/drivers/gles2/rasterizer_gles2.h +++ b/drivers/gles2/rasterizer_gles2.h @@ -33,7 +33,7 @@ #include "rasterizer_canvas_gles2.h" #include "rasterizer_scene_gles2.h" #include "rasterizer_storage_gles2.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" class RasterizerGLES2 : public Rasterizer { static Rasterizer *_create_current(); diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp index c49cf6c90..463317de7 100644 --- a/drivers/gles2/rasterizer_scene_gles2.cpp +++ b/drivers/gles2/rasterizer_scene_gles2.cpp @@ -36,7 +36,7 @@ #include "core/config/project_settings.h" #include "core/containers/vmap.h" #include "rasterizer_canvas_gles2.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #ifndef GLES_OVER_GL #define glClearDepth glClearDepthf diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index da9a0364e..1db66167f 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -34,7 +34,7 @@ #include "core/math/transform.h" #include "rasterizer_canvas_gles2.h" #include "rasterizer_scene_gles2.h" -#include "servers/visual/shader_language.h" +#include "servers/rendering/shader_language.h" GLuint RasterizerStorageGLES2::system_fbo = 0; diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index a2daf6eb2..9f8564aa4 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -33,8 +33,8 @@ #include "core/containers/pool_vector.h" #include "core/containers/self_list.h" #include "drivers/gles_common/rasterizer_asserts.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual/shader_language.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering/shader_language.h" #include "shader_compiler_gles2.h" #include "shader_gles2.h" diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index d22731f0d..1d957b8b6 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -32,9 +32,9 @@ #include "core/containers/pair.h" #include "core/string/string_builder.h" -#include "servers/visual/shader_language.h" -#include "servers/visual/shader_types.h" -#include "servers/visual_server.h" +#include "servers/rendering/shader_language.h" +#include "servers/rendering/shader_types.h" +#include "servers/rendering_server.h" class ShaderCompilerGLES2 { public: diff --git a/drivers/gles2/shader_gles2.h b/drivers/gles2/shader_gles2.h index 18fff3b60..491a11b30 100644 --- a/drivers/gles2/shader_gles2.h +++ b/drivers/gles2/shader_gles2.h @@ -43,7 +43,7 @@ #include "core/math/projection.h" #include "core/containers/pair.h" #include "core/variant/variant.h" -#include "servers/visual/shader_language.h" +#include "servers/rendering/shader_language.h" #include diff --git a/drivers/gles_common/rasterizer_canvas_batcher.h b/drivers/gles_common/rasterizer_canvas_batcher.h index 4aa3c4543..f73392d22 100644 --- a/drivers/gles_common/rasterizer_canvas_batcher.h +++ b/drivers/gles_common/rasterizer_canvas_batcher.h @@ -35,7 +35,7 @@ #include "rasterizer_array.h" #include "rasterizer_asserts.h" #include "rasterizer_storage_common.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" // We are using the curiously recurring template pattern // https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 719a776a6..64f21952b 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -37,7 +37,7 @@ #include "drivers/unix/file_access_unix.h" #include "drivers/unix/net_socket_posix.h" #include "drivers/unix/thread_posix.h" -#include "servers/visual_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 f29469d12..394913e2b 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/resources/animation.h" #include "scene/resources/font.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" /// BOOL /// int AnimationTrackEditBool::get_key_height() const { diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 610e1a167..8ab5b896e 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -66,7 +66,7 @@ #include "scene/resources/font.h" #include "scene/resources/packed_scene.h" #include "scene/resources/style_box.h" -#include "servers/visual_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 786a3dd58..f6b844dac 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -193,7 +193,7 @@ #include "servers/navigation_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Camera; diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 64c093343..076a1a6a2 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -41,7 +41,7 @@ #include "plugins/spatial_editor_plugin.h" #include "scene/3d/camera.h" #include "scene/gui/popup_menu.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "core/object/class_db.h" #include "core/math/color.h" #include "core/io/image.h" diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 667b73809..3d63cf83b 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/gui/control.h" -#include "servers/visual_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/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index be523dc25..342f005fb 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -42,7 +42,7 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/main/viewport.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "core/variant/array.h" #include "core/object/class_db.h" #include "core/math/color.h" diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp index cd468117f..185600760 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/plugins/audio_stream_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "servers/audio/audio_stream.h" void AudioStreamEditor::_notification(int p_what) { diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index bc0145258..64df1b1b7 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -93,7 +93,7 @@ #include "scene/resources/font.h" #include "scene/resources/packed_scene.h" #include "scene/resources/theme.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" // Min and Max are power of two in order to play nicely with successive increment. // That way, we can naturally reach a 100% zoom from boundaries. diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 6c8a3d1f9..07171a860 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -65,7 +65,7 @@ #include "scene/resources/shader.h" #include "scene/resources/texture.h" #include "servers/audio_server.h" -#include "servers/visual_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/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index b9a8bddbd..614f4966a 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/resources/mesh.h" #include "scene/resources/shader.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class EditorNode; diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 08e84f028..359b534b6 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -71,7 +71,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class EditorNode; class Node2D; diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index f48370ac7..e28891aac 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -61,9 +61,9 @@ #include "scene/gui/popup_menu.h" #include "scene/gui/text_edit.h" #include "scene/gui/tool_button.h" -#include "servers/visual/shader_language.h" -#include "servers/visual/shader_types.h" -#include "servers/visual_server.h" +#include "servers/rendering/shader_language.h" +#include "servers/rendering/shader_types.h" +#include "servers/rendering_server.h" struct ScriptCodeCompletionOption; diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 00de5492b..a109bb8c1 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -62,7 +62,7 @@ #include "scene/gui/spin_box.h" #include "scene/gui/tool_button.h" #include "scene/main/node.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" /** @author Mariano Suligoy diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 0f9a67fce..256b2fc90 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -97,7 +97,7 @@ #include "scene/resources/font.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" -#include "servers/visual_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 34c5bfe7b..a08881235 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -104,7 +104,7 @@ #include "scene/resources/sphere_shape.h" #include "scene/resources/surface_tool.h" #include "scene/resources/world.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #define HANDLE_HALF_SIZE 9.5 diff --git a/main/input_default.cpp b/main/input_default.cpp index a06540b5d..727e2bcd1 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -34,7 +34,7 @@ #include "core/input/input_map.h" #include "core/os/os.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" void InputDefault::SpeedTrack::update(const Vector2 &p_delta_p) { uint64_t tick = OS::get_singleton()->get_ticks_usec(); diff --git a/main/main.cpp b/main/main.cpp index 17cfda8d2..e244e289f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -68,7 +68,7 @@ #include "servers/physics_2d_server.h" #include "servers/physics_server.h" #include "servers/register_server_types.h" -#include "servers/visual_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" #ifdef TOOLS_ENABLED #include "editor/doc/doc_data.h" @@ -107,7 +107,7 @@ static MessageQueue *message_queue = nullptr; static AudioServer *audio_server = nullptr; static PhysicsServer *physics_server = nullptr; static Physics2DServer *physics_2d_server = nullptr; -static RenderingServerCallbacks *visual_server_callbacks = nullptr; +static RenderingServerCallbacks *rendering_server_callbacks = nullptr; static NavigationServer *navigation_server = nullptr; static Navigation2DServer *navigation_2d_server = nullptr; @@ -1359,7 +1359,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { audio_server = memnew(AudioServer); audio_server->init(); - // and finally setup this property under visual_server + // and finally setup this property under rendering_server RenderingServer::get_singleton()->set_render_loop_enabled(!disable_render_loop); register_core_singletons(); @@ -1540,8 +1540,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) { script_debugger->profiling_start(); } - visual_server_callbacks = memnew(RenderingServerCallbacks); - RenderingServer::get_singleton()->callbacks_register(visual_server_callbacks); + rendering_server_callbacks = memnew(RenderingServerCallbacks); + RenderingServer::get_singleton()->callbacks_register(rendering_server_callbacks); _start_success = true; @@ -2255,7 +2255,7 @@ bool Main::iteration() { if (OS::get_singleton()->get_main_loop()->idle(step * time_scale)) { exit = true; } - visual_server_callbacks->flush(); + rendering_server_callbacks->flush(); message_queue->flush(); RenderingServer::get_singleton()->sync(); //sync if still drawing from previous frames. @@ -2461,8 +2461,8 @@ void Main::cleanup(bool p_force) { message_queue->flush(); memdelete(message_queue); - if (visual_server_callbacks) { - memdelete(visual_server_callbacks); + if (rendering_server_callbacks) { + memdelete(rendering_server_callbacks); } unregister_core_driver_types(); diff --git a/main/performance.cpp b/main/performance.cpp index 1fc30dfa6..f4e521380 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -37,7 +37,7 @@ #include "servers/audio_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" Performance *Performance::singleton = nullptr; diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 5c9479f21..6ba7e8063 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -43,7 +43,7 @@ #include "core/containers/vmap.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/visual/shader_language.h" +#include "servers/rendering/shader_language.h" #include "core/variant/method_ptrcall.h" diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 3cf9ee84e..1842c87c9 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -37,7 +37,7 @@ #include "core/os/os.h" #include "core/string/print_string.h" #include "servers/physics_server.h" -#include "servers/visual_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 50679edc6..3ead6e6b5 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -36,7 +36,7 @@ #include "core/string/print_string.h" #include "scene/resources/texture.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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 8f165586c..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 "servers/visual_server.h" +#include "servers/rendering_server.h" #define OBJECT_COUNT 50 diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index 9f8a179fb..04986d522 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -38,8 +38,8 @@ #include "scene/gui/control.h" #include "core/input/shortcut.h" #include "scene/gui/text_edit.h" -#include "servers/visual/shader_language.h" -#include "servers/visual/shader_types.h" +#include "servers/rendering/shader_language.h" +#include "servers/rendering/shader_types.h" typedef ShaderLanguage SL; diff --git a/modules/mesh_utils/mesh_utils.cpp b/modules/mesh_utils/mesh_utils.cpp index 37ca54bff..d6c146274 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.h" -#include "servers/visual_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 772e67948..44e6737bc 100644 --- a/modules/mesh_utils/simplify.h +++ b/modules/mesh_utils/simplify.h @@ -27,7 +27,7 @@ #include #include -#include "servers/visual_server.h" +#include "servers/rendering_server.h" namespace Simplify { diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp index 30cead994..7b2d4897a 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.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "core/config/engine.h" @@ -16,7 +16,7 @@ } \ return r; -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #if MESH_DATA_RESOURCE_PRESENT //define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling, diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index 0df470103..f53d3eede 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -15,7 +15,7 @@ } \ return r; -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #if MESH_DATA_RESOURCE_PRESENT //define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling, diff --git a/modules/terraman/meshers/default/terrain_mesher_default.cpp b/modules/terraman/meshers/default/terrain_mesher_default.cpp index b09f862cd..32b2c8a9f 100644 --- a/modules/terraman/meshers/default/terrain_mesher_default.cpp +++ b/modules/terraman/meshers/default/terrain_mesher_default.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "servers/visual_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 7de1f0d07..02f2984e3 100644 --- a/modules/terraman/world/default/terrain_chunk_default.cpp +++ b/modules/terraman/world/default/terrain_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/visual_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_2d/meshers/default/terrain_2d_mesher_default.cpp b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp index 26a8e30d9..86d7a7011 100644 --- a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp +++ b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "../../defines.h" #include "scene/3d/mesh_instance.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "scene/resources/world_2d.h" #include "servers/physics_2d_server.h" diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp index 159f19db5..2f651fd77 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/terrain_2d_mesher_default.h" diff --git a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp index 616dcc6d0..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 "servers/visual_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 d43169108..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 "servers/visual_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 65cea7607..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 "servers/visual_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 2a4e56ae1..31c069077 100644 --- a/modules/voxelman/world/default/voxel_chunk_default.cpp +++ b/modules/voxelman/world/default/voxel_chunk_default.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "../../defines.h" #include "servers/physics_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "../../../opensimplex/open_simplex_noise.h" #include "../../meshers/default/voxel_mesher_default.h" diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 437e6d1c9..b9fe675eb 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -37,8 +37,8 @@ #include "drivers/unix/file_access_unix.h" #include "main/main.h" #include "scene/main/scene_tree.h" -#include "servers/visual/visual_server_raster.h" -#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/rendering/rendering_server_raster.h" +#include "servers/rendering/rendering_server_wrap_mt.h" #include "dir_access_jandroid.h" #include "file_access_android.h" @@ -172,12 +172,12 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int video_driver_index = p_video_driver; - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(RenderingServerWrapMT(visual_server, false)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, false)); } - visual_server->init(); + rendering_server->init(); AudioDriverManager::initialize(p_audio_driver); diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 24a49dcec..aa68e827b 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -35,7 +35,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" class PandemoniumJavaWrapper; class PandemoniumIOJavaWrapper; @@ -46,7 +46,7 @@ class OS_Android : public OS_Unix { bool secondary_gl_available = false; - RenderingServer *visual_server; + RenderingServer *rendering_server; mutable String data_dir_cache; mutable String cache_dir_cache; diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index d161da58a..0ade2fcf6 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -35,10 +35,10 @@ #include "core/input/input.h" #include "core/os/file_access.h" #include "drivers/unix/os_unix.h" -#include "servers/visual_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering_server.h" +#include "servers/rendering/rasterizer.h" #include "servers/audio/audio_driver_dummy.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #include "drivers/alsa/audio_driver_alsa.h" #include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "main/main.h" @@ -132,7 +132,7 @@ private: Env *env; Vec2 screen_size; ContextGL *context_gl; - RenderingServer *visual_server; + RenderingServer *rendering_server; VideoMode current_videomode; int current_video_driver; List args; @@ -291,7 +291,7 @@ public: RasterizerGLES2::make_current(); current_video_driver = VIDEO_DRIVER_GLES2; - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); // TODO: Audio Module AudioDriverManagerSW::get_driver(audio_driver)->set_singleton(); @@ -309,10 +309,10 @@ public: } } - if (!visual_server) + if (!rendering_server) return FAILED; - visual_server->init(); + rendering_server->init(); input = memnew(InputDefault); @@ -331,7 +331,7 @@ public: for (int i = 0; i < get_audio_driver_count(); i++) AudioDriverManager::get_driver(i)->finish(); - memdelete(visual_server); + memdelete(rendering_server); #ifdef JOYDEV_ENABLED memdelete(joystick); diff --git a/platform/frt_sdl/frt_godot3.cc b/platform/frt_sdl/frt_godot3.cc index fd212ec0c..6171febe1 100644 --- a/platform/frt_sdl/frt_godot3.cc +++ b/platform/frt_sdl/frt_godot3.cc @@ -17,10 +17,10 @@ #pragma GCC diagnostic ignored "-Wvolatile" #include "servers/audio_server.h" #pragma GCC diagnostic pop -#include "servers/visual_server.h" -#include "servers/visual/visual_server_wrap_mt.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual/visual_server_raster.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" #include "main/main.h" namespace frt { @@ -90,19 +90,19 @@ private: bool quit_; OS_FRT os_; int video_driver_; - RenderingServer *visual_server_; + RenderingServer *rendering_server_; void init_video() { //if (video_driver_ == VIDEO_DRIVER_GLES2) { frt_resolve_symbols_gles2(get_proc_address); RasterizerGLES2::register_config(); RasterizerGLES2::make_current(); //} - visual_server_ = memnew(RenderingServerRaster); - visual_server_->init(); + rendering_server_ = memnew(RenderingServerRaster); + rendering_server_->init(); } void cleanup_video() { - visual_server_->finish(); - memdelete(visual_server_); + rendering_server_->finish(); + memdelete(rendering_server_); } AudioDriverSDL2 audio_driver_; void init_audio(int id) { diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index 0726fce50..d604df8f8 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -40,15 +40,15 @@ #include "ios.h" #include "main/input_default.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" class OSIPhone : public OS_Unix { private: static HashMap dynamic_symbol_lookup_table; friend void register_dynamic_symbol(char *name, void *address); - RenderingServer *visual_server; + RenderingServer *rendering_server; AudioDriverCoreAudio audio_driver; diff --git a/platform/iphone/os_iphone.mm b/platform/iphone/os_iphone.mm index fe2fc6b6e..b099a16f3 100644 --- a/platform/iphone/os_iphone.mm +++ b/platform/iphone/os_iphone.mm @@ -33,8 +33,8 @@ #include "os_iphone.h" #include "drivers/gles2/rasterizer_gles2.h" -#include "servers/visual/visual_server_raster.h" -#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/rendering/rendering_server_raster.h" +#include "servers/rendering/rendering_server_wrap_mt.h" #include "main/main.h" @@ -142,16 +142,16 @@ Error OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p } video_driver_index = p_video_driver; - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); // FIXME: Reimplement threaded rendering if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(RenderingServerWrapMT(visual_server, false)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, false)); } - visual_server->init(); - //visual_server->cursor_set_visible(false, 0); + rendering_server->init(); + //rendering_server->cursor_set_visible(false, 0); - // reset this to what it should be, it will have been set to 0 after visual_server->init() is called + // reset this to what it should be, it will have been set to 0 after rendering_server->init() is called //if (use_gl3) { // RasterizerStorageGLES3::system_fbo = gl_view_base_fb; //} else { @@ -323,8 +323,8 @@ void OSIPhone::finalize() { memdelete(ios); } - visual_server->finish(); - memdelete(visual_server); + rendering_server->finish(); + memdelete(rendering_server); // memdelete(rasterizer); } @@ -738,7 +738,7 @@ OSIPhone::OSIPhone(String p_data_dir, String p_cache_dir) { ios_init_callbacks_capacity = 0; main_loop = NULL; - visual_server = NULL; + rendering_server = NULL; offscreen_gl_context = NULL; // can't call set_data_dir from here, since it requires DirAccess diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 59cae86d8..4c3076ac3 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -35,9 +35,9 @@ #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "main/main.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #ifndef NO_THREADS -#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/rendering/rendering_server_wrap_mt.h" #endif #include "scene/resources/texture.h" @@ -729,9 +729,9 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, video_driver_index = p_video_driver; AudioDriverManager::initialize(p_audio_driver); - visual_server = memnew(RenderingServerRaster()); + rendering_server = memnew(RenderingServerRaster()); #ifndef NO_THREADS - visual_server = memnew(RenderingServerWrapMT(visual_server, false)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, false)); #endif input = memnew(InputDefault); @@ -755,7 +755,7 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, MainLoop::NOTIFICATION_WM_FOCUS_OUT); pandemonium_js_display_vk_cb(&input_text_callback); - visual_server->init(); + rendering_server->init(); return OK; } @@ -853,9 +853,9 @@ void OS_JavaScript::delete_main_loop() { void OS_JavaScript::finalize() { memdelete(input); - visual_server->finish(); + rendering_server->finish(); emscripten_webgl_commit_frame(); - memdelete(visual_server); + memdelete(rendering_server); emscripten_webgl_destroy_context(webgl_ctx); for (int i = 0; i < audio_drivers.size(); i++) { memdelete(audio_drivers[i]); @@ -1067,7 +1067,7 @@ OS_JavaScript::OS_JavaScript() { transparency_enabled = false; main_loop = NULL; - visual_server = NULL; + rendering_server = NULL; swap_ok_cancel = false; idb_available = pandemonium_js_os_fs_is_persistent() != 0; diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 1099b9604..ed1479106 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -34,7 +34,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" #include @@ -71,7 +71,7 @@ private: MainLoop *main_loop; int video_driver_index; List audio_drivers; - RenderingServer *visual_server; + RenderingServer *rendering_server; bool swap_ok_cancel; bool idb_available; diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 4d0c73351..88870fa5a 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -41,9 +41,9 @@ #include "main/input_default.h" #include "power_osx.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual/visual_server_wrap_mt.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering/rendering_server_wrap_mt.h" +#include "servers/rendering_server.h" #include #include @@ -82,7 +82,7 @@ public: bool is_resizing = false; // rasterizer seems to no longer be given to visual server, its using GLES3 directly? //Rasterizer *rasterizer; - RenderingServer *visual_server; + RenderingServer *rendering_server; List args; MainLoop *main_loop; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 70de3d01d..f746f8de8 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -38,7 +38,7 @@ #include "drivers/gles2/rasterizer_gles2.h" #include "main/main.h" #include "scene/resources/texture.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #include #include @@ -1777,12 +1777,12 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a video_driver_index = p_video_driver; - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(RenderingServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } - visual_server->init(); + rendering_server->init(); AudioDriverManager::initialize(p_audio_driver); input = memnew(InputDefault); @@ -1819,8 +1819,8 @@ void OS_OSX::finalize() { memdelete(input); cursors_cache.clear(); - visual_server->finish(); - memdelete(visual_server); + rendering_server->finish(); + memdelete(rendering_server); //memdelete(rasterizer); } diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index ea73c0546..7a8e50e66 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -33,7 +33,7 @@ #include "core/string/print_string.h" #include "drivers/dummy/rasterizer_dummy.h" #include "drivers/dummy/texture_loader_dummy.h" -#include "servers/visual/visual_server_raster.h" +#include "servers/rendering/rendering_server_raster.h" #include "main/main.h" @@ -75,8 +75,8 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int video_driver_index = p_video_driver; // unused in server platform, but should still be initialized - visual_server = memnew(RenderingServerRaster); - visual_server->init(); + rendering_server = memnew(RenderingServerRaster); + rendering_server->init(); AudioDriverManager::initialize(p_audio_driver); @@ -99,8 +99,8 @@ void OS_Server::finalize() { memdelete(main_loop); main_loop = NULL; - visual_server->finish(); - memdelete(visual_server); + rendering_server->finish(); + memdelete(rendering_server); memdelete(input); diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 4c1bcbcfa..131889e05 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -41,13 +41,13 @@ #include "platform/x11/power_x11.h" #endif #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" #undef CursorShape class OS_Server : public OS_Unix { - RenderingServer *visual_server; + RenderingServer *rendering_server; VideoMode current_videomode; List args; MainLoop *main_loop; diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 53dc771ba..d3b8051a7 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -42,8 +42,8 @@ #include "main/main.h" #include "scene/resources/texture.h" #include "servers/audio_server.h" -#include "servers/visual/visual_server_raster.h" -#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/rendering/rendering_server_raster.h" +#include "servers/rendering/rendering_server_wrap_mt.h" #include "windows_terminal_logger.h" #include @@ -1568,12 +1568,12 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int set_vsync_via_compositor(video_mode.vsync_via_compositor); #endif - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(RenderingServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } - visual_server->init(); + rendering_server->init(); input = memnew(InputDefault); joypad = memnew(JoypadWindows(input, &hWnd)); @@ -1746,8 +1746,8 @@ void OS_Windows::finalize() { icon.unref(); cursors_cache.clear(); - visual_server->finish(); - memdelete(visual_server); + rendering_server->finish(); + memdelete(rendering_server); #ifdef OPENGL_ENABLED if (gl_context) memdelete(gl_context); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index f3a8d24f4..9bd8ac2ac 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -42,8 +42,8 @@ #include "main/input_default.h" #include "power_windows.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" #endif @@ -319,7 +319,7 @@ class OS_Windows : public OS { #if defined(OPENGL_ENABLED) ContextGL_Windows *gl_context; #endif - RenderingServer *visual_server; + RenderingServer *rendering_server; int pressrc; HINSTANCE hInstance; // Holds The Instance Of The Application HWND hWnd; diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index a76237e6f..35cfe3801 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -38,8 +38,8 @@ #include "key_mapping_x11.h" #include "main/main.h" #include "scene/resources/texture.h" -#include "servers/visual/visual_server_raster.h" -#include "servers/visual/visual_server_wrap_mt.h" +#include "servers/rendering/rendering_server_raster.h" +#include "servers/rendering/rendering_server_wrap_mt.h" #ifdef HAVE_MNTENT #include @@ -355,9 +355,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a #endif - visual_server = memnew(RenderingServerRaster); + rendering_server = memnew(RenderingServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(RenderingServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } if (current_videomode.maximized) { @@ -411,7 +411,7 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a set_window_always_on_top(true); } - ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(!rendering_server, ERR_UNAVAILABLE); ERR_FAIL_COND_V(x11_window == 0, ERR_UNAVAILABLE); XSetWindowAttributes new_attr; @@ -577,7 +577,7 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a xdnd_selection = XInternAtom(x11_display, "XdndSelection", False); requested = None; - visual_server->init(); + rendering_server->init(); AudioDriverManager::initialize(p_audio_driver); @@ -835,8 +835,8 @@ void OS_X11::finalize() { memdelete(input); cursors_cache.clear(); - visual_server->finish(); - memdelete(visual_server); + rendering_server->finish(); + memdelete(rendering_server); //memdelete(rasterizer); memdelete(power_manager); diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index d6c8c2745..117a3f274 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -42,8 +42,8 @@ #include "main/input_default.h" #include "power_x11.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" #include #include @@ -93,7 +93,7 @@ class OS_X11 : public OS_Unix { ContextGL_X11 *context_gl; #endif //Rasterizer *rasterizer; - RenderingServer *visual_server; + RenderingServer *rendering_server; VideoMode current_videomode; List args; Window x11_window; diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index f6daf6faa..7703b6a67 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/scene_string_names.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" void Camera2D::_update_scroll() { if (!is_inside_tree()) { diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index f5f59081d..901481583 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -41,8 +41,8 @@ #include "scene/resources/world.h" #include "scene/resources/world_2d.h" #include "scene/scene_string_names.h" -#include "servers/visual/visual_server_raster.h" -#include "servers/visual_server.h" +#include "servers/rendering/rendering_server_raster.h" +#include "servers/rendering_server.h" #include "scene/main/scene_tree.h" #include "scene/resources/multimesh.h" diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 83c5a6a2b..39fffdf4d 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -35,7 +35,7 @@ #include "scene/2d/canvas_item.h" #include "scene/resources/particles_material.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" void CPUParticles2D::set_emitting(bool p_emitting) { if (emitting == p_emitting) { diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 574ced306..7f23dba5c 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -31,7 +31,7 @@ #include "light_2d.h" #include "core/config/engine.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Light2D::_edit_get_state() const { diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 2b8402091..6ba9c90a7 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -33,7 +33,7 @@ #include "core/object/message_queue.h" #include "scene/gui/control.h" #include "scene/main/viewport.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED Dictionary Node2D::_edit_get_state() const { diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 622bbd1f8..c136313a8 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -42,7 +42,7 @@ #include "scene/resources/ray_shape.h" #include "scene/resources/shape.h" #include "scene/resources/sphere_shape.h" -#include "servers/visual_server.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 22b36bc58..1781bc361 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -37,7 +37,7 @@ #include "scene/resources/gradient.h" #include "scene/resources/mesh.h" #include "scene/resources/particles_material.h" -#include "servers/visual_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 daa745fec..995a42b0d 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/3d/visual_instance.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Light : public VisualInstance { GDCLASS(Light, VisualInstance); diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index adaa4e8d9..6c1fca8e2 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -39,7 +39,7 @@ #include "scene/resources/mesh.h" #include "scene/resources/skin.h" #include "scene/scene_string_names.h" -#include "servers/visual/visual_server_globals.h" +#include "servers/rendering/rendering_server_globals.h" #include "skeleton.h" bool MeshInstance::_set(const StringName &p_name, const Variant &p_value) { @@ -213,7 +213,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s return; } - RenderingServer *visual_server = RenderingServer::get_singleton(); + RenderingServer *rendering_server = RenderingServer::get_singleton(); bool update_mesh = false; @@ -304,7 +304,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s // 1. Temporarily add surface with bone data to create the read buffer. software_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, read_arrays, Array(), format); - PoolByteArray buffer_read = visual_server->mesh_surface_get_array(mesh_rid, surface_index); + PoolByteArray buffer_read = rendering_server->mesh_surface_get_array(mesh_rid, surface_index); surface_data.source_buffer.append_array(buffer_read); surface_data.source_format = software_mesh->surface_get_format(surface_index); @@ -316,7 +316,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s Ref material = mesh->surface_get_material(surface_index); software_mesh->surface_set_material(surface_index, material); - surface_data.buffer = visual_server->mesh_surface_get_array(mesh_rid, surface_index); + surface_data.buffer = rendering_server->mesh_surface_get_array(mesh_rid, surface_index); surface_data.buffer_write = surface_data.buffer.write(); } @@ -325,7 +325,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s } if (p_call_attach_skeleton) { - visual_server->instance_attach_skeleton(get_instance(), RID()); + rendering_server->instance_attach_skeleton(get_instance(), RID()); } if (is_visible_in_tree() && (software_skinning_flags & SoftwareSkinning::FLAG_BONES_READY)) { @@ -339,7 +339,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s } if (p_call_attach_skeleton) { - visual_server->instance_attach_skeleton(get_instance(), skin_ref->get_skeleton()); + rendering_server->instance_attach_skeleton(get_instance(), skin_ref->get_skeleton()); } if (software_skinning) { @@ -350,7 +350,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s } } else { if (p_call_attach_skeleton) { - visual_server->instance_attach_skeleton(get_instance(), RID()); + rendering_server->instance_attach_skeleton(get_instance(), RID()); } if (software_skinning) { memdelete(software_skinning); @@ -367,7 +367,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s int surface_count = mesh->get_surface_count(); for (int surface_index = 0; surface_index < surface_count; ++surface_index) { if (materials[surface_index].is_valid()) { - visual_server->instance_set_surface_material(get_instance(), surface_index, materials[surface_index]->get_rid()); + rendering_server->instance_set_surface_material(get_instance(), surface_index, materials[surface_index]->get_rid()); } } } @@ -398,14 +398,14 @@ void MeshInstance::_update_skinning() { Vector3 aabb_min = Vector3(FLT_MAX, FLT_MAX, FLT_MAX); Vector3 aabb_max = Vector3(-FLT_MAX, -FLT_MAX, -FLT_MAX); - RenderingServer *visual_server = RenderingServer::get_singleton(); + RenderingServer *rendering_server = RenderingServer::get_singleton(); // Prepare bone transforms. - const int num_bones = visual_server->skeleton_get_bone_count(skeleton); + const int num_bones = rendering_server->skeleton_get_bone_count(skeleton); ERR_FAIL_COND(num_bones <= 0); Transform *bone_transforms = (Transform *)alloca(sizeof(Transform) * num_bones); for (int bone_index = 0; bone_index < num_bones; ++bone_index) { - bone_transforms[bone_index] = visual_server->skeleton_bone_get_transform(skeleton, bone_index); + bone_transforms[bone_index] = rendering_server->skeleton_bone_get_transform(skeleton, bone_index); } // Apply skinning. @@ -423,7 +423,7 @@ void MeshInstance::_update_skinning() { uint32_t array_offsets_write[Mesh::ARRAY_MAX]; uint32_t array_strides_write[Mesh::ARRAY_MAX]; - visual_server->mesh_surface_make_offsets_from_format(format_write, vertex_count_write, index_count_write, array_offsets_write, array_strides_write); + rendering_server->mesh_surface_make_offsets_from_format(format_write, vertex_count_write, index_count_write, array_offsets_write, array_strides_write); ERR_FAIL_COND(array_strides_write[Mesh::ARRAY_VERTEX] != array_strides_write[Mesh::ARRAY_NORMAL]); const uint32_t stride_write = array_strides_write[Mesh::ARRAY_VERTEX]; const uint32_t offset_vertices_write = array_offsets_write[Mesh::ARRAY_VERTEX]; @@ -445,7 +445,7 @@ void MeshInstance::_update_skinning() { uint32_t array_offsets[Mesh::ARRAY_MAX]; uint32_t array_strides[Mesh::ARRAY_MAX]; - visual_server->mesh_surface_make_offsets_from_format(format_read, vertex_count, index_count, array_offsets, array_strides); + rendering_server->mesh_surface_make_offsets_from_format(format_read, vertex_count, index_count, array_offsets, array_strides); ERR_FAIL_COND(array_strides[Mesh::ARRAY_VERTEX] != array_strides[Mesh::ARRAY_NORMAL]); const uint32_t stride = array_strides[Mesh::ARRAY_VERTEX]; const uint32_t offset_vertices = array_offsets[Mesh::ARRAY_VERTEX]; @@ -516,10 +516,10 @@ void MeshInstance::_update_skinning() { aabb_max.z = MAX(aabb_max.z, vertex.z); } - visual_server->mesh_surface_update_region(mesh_rid, surface_index, 0, buffer); + rendering_server->mesh_surface_update_region(mesh_rid, surface_index, 0, buffer); } - visual_server->mesh_set_custom_aabb(mesh_rid, AABB(aabb_min, aabb_max - aabb_min)); + rendering_server->mesh_set_custom_aabb(mesh_rid, AABB(aabb_min, aabb_max - aabb_min)); software_skinning_flags |= SoftwareSkinning::FLAG_BONES_READY; } diff --git a/scene/3d/occluder.cpp b/scene/3d/occluder.cpp index 8654e9ba3..d8896e55c 100644 --- a/scene/3d/occluder.cpp +++ b/scene/3d/occluder.cpp @@ -33,8 +33,8 @@ #include "core/config/engine.h" #include "scene/resources/occluder_shape.h" #include "scene/resources/world.h" -#include "servers/visual/portals/portal_occlusion_culler.h" -#include "servers/visual_server.h" +#include "servers/rendering/portals/portal_occlusion_culler.h" +#include "servers/rendering_server.h" void Occluder::resource_changed(RES res) { update_gizmos(); diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 4c6aef668..25f5d0aa0 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -38,7 +38,7 @@ #include "scene/main/viewport.h" #include "scene/resources/mesh.h" #include "scene/resources/world.h" -#include "servers/visual_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/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index 70b924990..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 "servers/visual_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 c73ec0a6b..2e7ff73bb 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.h" -#include "servers/visual_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 a24144171..4c290cf57 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.h" #include "scene/resources/world.h" -#include "servers/visual_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/soft_body.cpp b/scene/3d/soft_body.cpp index efa371415..fc41f2ee3 100644 --- a/scene/3d/soft_body.cpp +++ b/scene/3d/soft_body.cpp @@ -446,8 +446,8 @@ void SoftBody::_draw_soft_mesh() { PhysicsServer::get_singleton()->soft_body_set_mesh(physics_rid, mesh); } - if (!visual_server_handler.is_ready(mesh_rid)) { - visual_server_handler.prepare(mesh_rid, 0); + if (!rendering_server_handler.is_ready(mesh_rid)) { + rendering_server_handler.prepare(mesh_rid, 0); /// Necessary in order to render the mesh correctly (Soft body nodes are in global space) simulation_started = true; @@ -457,11 +457,11 @@ void SoftBody::_draw_soft_mesh() { _update_physics_server(); - visual_server_handler.open(); - PhysicsServer::get_singleton()->soft_body_update_visual_server(physics_rid, &visual_server_handler); - visual_server_handler.close(); + rendering_server_handler.open(); + PhysicsServer::get_singleton()->soft_body_update_rendering_server(physics_rid, &rendering_server_handler); + rendering_server_handler.close(); - visual_server_handler.commit_changes(); + rendering_server_handler.commit_changes(); } void SoftBody::_prepare_physics_server() { diff --git a/scene/3d/soft_body.h b/scene/3d/soft_body.h index c56047d92..90c9dd99e 100644 --- a/scene/3d/soft_body.h +++ b/scene/3d/soft_body.h @@ -77,7 +77,7 @@ public: }; private: - SoftBodyRenderingServerHandler visual_server_handler; + SoftBodyRenderingServerHandler rendering_server_handler; RID physics_rid; diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index aff57ae19..605ff9be5 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -37,7 +37,7 @@ #include "scene/main/viewport.h" #include "scene/resources/world.h" #include "scene/scene_string_names.h" -#include "servers/visual_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" /* diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index e342bb3a2..3c30bdada 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -33,7 +33,7 @@ #include "scene/resources/material.h" #include "scene/resources/world.h" #include "scene/scene_string_names.h" -#include "servers/visual_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 74903ba70..a321df8d3 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -34,7 +34,7 @@ #include "core/object/reference.h" #include "core/containers/rid.h" #include "scene/3d/cull_instance.h" -#include "servers/visual_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 415f6a080..f66ace9be 100644 --- a/scene/debugger/script_debugger_remote.cpp +++ b/scene/debugger/script_debugger_remote.cpp @@ -42,7 +42,7 @@ #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" -#include "servers/visual_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 2e53242af..739fc891f 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -31,7 +31,7 @@ #include "button.h" #include "core/string/translation.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" Size2 Button::get_minimum_size() const { Size2 minsize = get_theme_font("font")->get_string_size(xl_text); diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index 425135c08..14d8a5743 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -30,7 +30,7 @@ #include "check_box.h" -#include "servers/visual_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 bab8a545d..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 "servers/visual_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/control.cpp b/scene/gui/control.cpp index ad159b463..94b6fe51a 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -43,7 +43,7 @@ #include "scene/main/timer.h" #include "scene/main/viewport.h" #include "scene/scene_string_names.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index c38f02d60..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 "servers/visual_server.h" +#include "servers/rendering_server.h" void NinePatchRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index fe3d9da13..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 "servers/visual_server.h" +#include "servers/rendering_server.h" void TextureRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 33c8c55cb..11d264271 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -33,7 +33,7 @@ #include "core/math/transform_2d.h" #include "scene/main/node.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Camera; class Camera2D; diff --git a/scene/resources/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp index 3dbd12051..20b4ee476 100644 --- a/scene/resources/capsule_shape_2d.cpp +++ b/scene/resources/capsule_shape_2d.cpp @@ -31,7 +31,7 @@ #include "capsule_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" Vector CapsuleShape2D::_get_points() const { Vector points; diff --git a/scene/resources/circle_shape_2d.cpp b/scene/resources/circle_shape_2d.cpp index 1951ee919..af4e9d7eb 100644 --- a/scene/resources/circle_shape_2d.cpp +++ b/scene/resources/circle_shape_2d.cpp @@ -31,7 +31,7 @@ #include "circle_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp index d6f68166d..8157b76bb 100644 --- a/scene/resources/concave_polygon_shape_2d.cpp +++ b/scene/resources/concave_polygon_shape_2d.cpp @@ -31,7 +31,7 @@ #include "concave_polygon_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp index 4e7895c88..7231d2c9b 100644 --- a/scene/resources/convex_polygon_shape_2d.cpp +++ b/scene/resources/convex_polygon_shape_2d.cpp @@ -32,7 +32,7 @@ #include "core/math/geometry.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/environment.cpp b/scene/resources/environment.cpp index fd9a4e0ad..28d8b3df7 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -33,7 +33,7 @@ #include "core/config/project_settings.h" #include "scene/resources/sky.h" #include "scene/resources/texture.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "texture.h" RID Environment::get_rid() const { diff --git a/scene/resources/line_shape_2d.cpp b/scene/resources/line_shape_2d.cpp index 6c600af6d..e5b1ae919 100644 --- a/scene/resources/line_shape_2d.cpp +++ b/scene/resources/line_shape_2d.cpp @@ -31,7 +31,7 @@ #include "line_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/material.cpp b/scene/resources/material.cpp index 0cb82ae8d..a84341730 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -34,7 +34,7 @@ #include "core/config/project_settings.h" #include "core/version.h" #include "scene/resources/texture.h" -#include "servers/visual/shader_language.h" +#include "servers/rendering/shader_language.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/resources/material.h b/scene/resources/material.h index efa91933d..2d96a2348 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -33,7 +33,7 @@ #include "core/object/resource.h" #include "core/containers/self_list.h" #include "scene/resources/shader.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Texture; diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index d4142e896..0c4dba730 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -36,7 +36,7 @@ #include "scene/resources/material.h" #include "scene/resources/shape.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Mesh : public Resource { GDCLASS(Mesh, Resource); diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index f15651841..091b7c4be 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -30,7 +30,7 @@ #include "multimesh.h" -#include "servers/visual_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/multimesh.h b/scene/resources/multimesh.h index e38013b5e..18163d8f0 100644 --- a/scene/resources/multimesh.h +++ b/scene/resources/multimesh.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/resources/mesh.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class MultiMesh : public Resource { GDCLASS(MultiMesh, Resource); diff --git a/scene/resources/occluder_shape.cpp b/scene/resources/occluder_shape.cpp index 6278c570d..bd01ef40a 100644 --- a/scene/resources/occluder_shape.cpp +++ b/scene/resources/occluder_shape.cpp @@ -32,7 +32,7 @@ #include "core/config/engine.h" #include "core/math/transform.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED #include "editor/editor_node.h" @@ -92,7 +92,7 @@ AABB OccluderShapeSphere::get_fallback_gizmo_aabb() const { #endif -void OccluderShapeSphere::update_shape_to_visual_server() { +void OccluderShapeSphere::update_shape_to_rendering_server() { RenderingServer::get_singleton()->occluder_resource_spheres_update(get_shape(), _spheres); } @@ -205,7 +205,7 @@ void OccluderShapeSphere::set_spheres(const Vector &p_spheres) { _update_aabb(); #endif - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } @@ -217,7 +217,7 @@ void OccluderShapeSphere::set_sphere_position(int p_idx, const Vector3 &p_positi #ifdef TOOLS_ENABLED _update_aabb(); #endif - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } } @@ -230,7 +230,7 @@ void OccluderShapeSphere::set_sphere_radius(int p_idx, real_t p_radius) { #ifdef TOOLS_ENABLED _update_aabb(); #endif - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } } diff --git a/scene/resources/occluder_shape.h b/scene/resources/occluder_shape.h index f6b5d50d3..6afa05866 100644 --- a/scene/resources/occluder_shape.h +++ b/scene/resources/occluder_shape.h @@ -81,7 +81,7 @@ public: void set_sphere_position(int p_idx, const Vector3 &p_position); void set_sphere_radius(int p_idx, real_t p_radius); - void update_shape_to_visual_server(); + void update_shape_to_rendering_server(); virtual Transform center_node(const Transform &p_global_xform, const Transform &p_parent_xform, real_t p_snap); #ifdef TOOLS_ENABLED diff --git a/scene/resources/occluder_shape_polygon.cpp b/scene/resources/occluder_shape_polygon.cpp index 313563878..ce274b1b9 100644 --- a/scene/resources/occluder_shape_polygon.cpp +++ b/scene/resources/occluder_shape_polygon.cpp @@ -30,7 +30,7 @@ #include "occluder_shape_polygon.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED void OccluderShapePolygon::_update_aabb() { @@ -108,7 +108,7 @@ void OccluderShapePolygon::set_polygon_point(int p_idx, const Vector2 &p_point) _poly_pts_local_raw.set(p_idx, p_point); _sanitize_points(); - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } @@ -119,21 +119,21 @@ void OccluderShapePolygon::set_hole_point(int p_idx, const Vector2 &p_point) { _hole_pts_local_raw.set(p_idx, p_point); _sanitize_points(); - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } void OccluderShapePolygon::set_polygon_points(const PoolVector &p_points) { _poly_pts_local_raw = p_points; _sanitize_points(); - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } void OccluderShapePolygon::set_hole_points(const PoolVector &p_points) { _hole_pts_local_raw = p_points; _sanitize_points(); - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } @@ -145,7 +145,7 @@ PoolVector OccluderShapePolygon::get_hole_points() const { return _hole_pts_local_raw; } -void OccluderShapePolygon::update_shape_to_visual_server() { +void OccluderShapePolygon::update_shape_to_rendering_server() { if (_poly_pts_local.size() < 3) return; @@ -184,7 +184,7 @@ void OccluderShapePolygon::update_shape_to_visual_server() { void OccluderShapePolygon::set_two_way(bool p_two_way) { _settings_two_way = p_two_way; - update_shape_to_visual_server(); + update_shape_to_rendering_server(); notify_change_to_owners(); } diff --git a/scene/resources/occluder_shape_polygon.h b/scene/resources/occluder_shape_polygon.h index f4aa4e9b9..df0436d39 100644 --- a/scene/resources/occluder_shape_polygon.h +++ b/scene/resources/occluder_shape_polygon.h @@ -80,7 +80,7 @@ public: void clear(); - void update_shape_to_visual_server(); + void update_shape_to_rendering_server(); virtual Transform center_node(const Transform &p_global_xform, const Transform &p_parent_xform, real_t p_snap); #ifdef TOOLS_ENABLED diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 1fc620f96..81a4c6c53 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "primitive_meshes.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "core/core_string_names.h" #include "core/os/main_loop.h" diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp index a9ac420fc..ff5e2c6d4 100644 --- a/scene/resources/rectangle_shape_2d.cpp +++ b/scene/resources/rectangle_shape_2d.cpp @@ -31,7 +31,7 @@ #include "rectangle_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp index 08a657ea1..47f2b7100 100644 --- a/scene/resources/segment_shape_2d.cpp +++ b/scene/resources/segment_shape_2d.cpp @@ -31,7 +31,7 @@ #include "segment_shape_2d.h" #include "servers/physics_2d_server.h" -#include "servers/visual_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/scene/resources/shader.cpp b/scene/resources/shader.cpp index 0a277a1f0..3773404f2 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -31,8 +31,8 @@ #include "shader.h" #include "core/os/file_access.h" #include "scene/scene_string_names.h" -#include "servers/visual/shader_language.h" -#include "servers/visual_server.h" +#include "servers/rendering/shader_language.h" +#include "servers/rendering_server.h" #include "texture.h" Shader::Mode Shader::get_mode() const { diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 13501deeb..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 "servers/visual_server.h" +#include "servers/rendering_server.h" class CanvasItem; diff --git a/scene/resources/texture.h b/scene/resources/texture.h index eff7556a5..fcb97768a 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -38,7 +38,7 @@ #include "core/object/resource.h" #include "scene/resources/curve.h" #include "scene/resources/gradient.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Texture : public Resource { GDCLASS(Texture, Resource); diff --git a/scene/resources/world.h b/scene/resources/world.h index 28aaf916d..1276ebc81 100644 --- a/scene/resources/world.h +++ b/scene/resources/world.h @@ -33,7 +33,7 @@ #include "core/object/resource.h" #include "scene/resources/environment.h" #include "servers/physics_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class Camera; class VisibilityNotifier; diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index 9f4c01dac..06704df2d 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -36,7 +36,7 @@ #include "scene/main/viewport.h" #include "servers/navigation_2d_server.h" #include "servers/physics_2d_server.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" struct SpatialIndexer2D { struct CellRef { diff --git a/servers/SCsub b/servers/SCsub index f58a213cb..2d99f6844 100644 --- a/servers/SCsub +++ b/servers/SCsub @@ -7,7 +7,7 @@ env.add_source_files(env.servers_sources, "*.cpp") SConscript("physics/SCsub") SConscript("physics_2d/SCsub") -SConscript("visual/SCsub") +SConscript("rendering/SCsub") SConscript("audio/SCsub") lib = env.add_library("servers", env.servers_sources) diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index 05d0c316e..cf72c9559 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -239,7 +239,7 @@ public: virtual RID soft_body_create(bool p_init_sleeping = false) { return RID(); } - virtual void soft_body_update_visual_server(RID p_body, class SoftBodyRenderingServerHandler *p_visual_server_handler) {} + virtual void soft_body_update_rendering_server(RID p_body, class SoftBodyRenderingServerHandler *p_rendering_server_handler) {} virtual void soft_body_set_space(RID p_body, RID p_space) {} virtual RID soft_body_get_space(RID p_body) const { return RID(); } diff --git a/servers/physics_server.h b/servers/physics_server.h index a9b491a91..439cc3392 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -492,7 +492,7 @@ public: virtual RID soft_body_create(bool p_init_sleeping = false) = 0; - virtual void soft_body_update_visual_server(RID p_body, class SoftBodyRenderingServerHandler *p_visual_server_handler) = 0; + virtual void soft_body_update_rendering_server(RID p_body, class SoftBodyRenderingServerHandler *p_rendering_server_handler) = 0; virtual void soft_body_set_space(RID p_body, RID p_space) = 0; virtual RID soft_body_get_space(RID p_body) const = 0; diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 94e0671c7..1bbebd773 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -60,8 +60,8 @@ #include "physics_2d_server.h" #include "physics_server.h" #include "scene/debugger/script_debugger_remote.h" -#include "visual/shader_types.h" -#include "visual_server.h" +#include "rendering/shader_types.h" +#include "rendering_server.h" static void _debugger_get_resource_usage(List *r_usage) { List tinfo; diff --git a/servers/visual/SCsub b/servers/rendering/SCsub similarity index 100% rename from servers/visual/SCsub rename to servers/rendering/SCsub diff --git a/servers/visual/portals/SCsub b/servers/rendering/portals/SCsub similarity index 100% rename from servers/visual/portals/SCsub rename to servers/rendering/portals/SCsub diff --git a/servers/visual/portals/portal_defines.h b/servers/rendering/portals/portal_defines.h similarity index 100% rename from servers/visual/portals/portal_defines.h rename to servers/rendering/portals/portal_defines.h diff --git a/servers/visual/portals/portal_gameplay_monitor.cpp b/servers/rendering/portals/portal_gameplay_monitor.cpp similarity index 99% rename from servers/visual/portals/portal_gameplay_monitor.cpp rename to servers/rendering/portals/portal_gameplay_monitor.cpp index 81c409cf6..a8ebc3abe 100644 --- a/servers/visual/portals/portal_gameplay_monitor.cpp +++ b/servers/rendering/portals/portal_gameplay_monitor.cpp @@ -32,8 +32,8 @@ #include "portal_renderer.h" #include "portal_types.h" -#include "servers/visual/visual_server_globals.h" -#include "servers/visual/visual_server_scene.h" +#include "servers/rendering/rendering_server_globals.h" +#include "servers/rendering/rendering_server_scene.h" PortalGameplayMonitor::PortalGameplayMonitor() { _active_moving_pool_ids_prev = &_active_moving_pool_ids[0]; diff --git a/servers/visual/portals/portal_gameplay_monitor.h b/servers/rendering/portals/portal_gameplay_monitor.h similarity index 99% rename from servers/visual/portals/portal_gameplay_monitor.h rename to servers/rendering/portals/portal_gameplay_monitor.h index b837b987a..272532e33 100644 --- a/servers/visual/portals/portal_gameplay_monitor.h +++ b/servers/rendering/portals/portal_gameplay_monitor.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/local_vector.h" -#include "servers/visual_server_callbacks.h" +#include "servers/rendering_server_callbacks.h" #include diff --git a/servers/visual/portals/portal_occlusion_culler.cpp b/servers/rendering/portals/portal_occlusion_culler.cpp similarity index 99% rename from servers/visual/portals/portal_occlusion_culler.cpp rename to servers/rendering/portals/portal_occlusion_culler.cpp index 56b66a7b8..de4ff9022 100644 --- a/servers/visual/portals/portal_occlusion_culler.cpp +++ b/servers/rendering/portals/portal_occlusion_culler.cpp @@ -34,8 +34,8 @@ #include "core/math/aabb.h" #include "core/config/project_settings.h" #include "portal_renderer.h" -#include "servers/visual/visual_server_globals.h" -#include "servers/visual/visual_server_scene.h" +#include "servers/rendering/rendering_server_globals.h" +#include "servers/rendering/rendering_server_scene.h" #define _log(a, b) ; //#define _log_prepare(a) log(a, 0) diff --git a/servers/visual/portals/portal_occlusion_culler.h b/servers/rendering/portals/portal_occlusion_culler.h similarity index 100% rename from servers/visual/portals/portal_occlusion_culler.h rename to servers/rendering/portals/portal_occlusion_culler.h diff --git a/servers/visual/portals/portal_pvs.cpp b/servers/rendering/portals/portal_pvs.cpp similarity index 100% rename from servers/visual/portals/portal_pvs.cpp rename to servers/rendering/portals/portal_pvs.cpp diff --git a/servers/visual/portals/portal_pvs.h b/servers/rendering/portals/portal_pvs.h similarity index 100% rename from servers/visual/portals/portal_pvs.h rename to servers/rendering/portals/portal_pvs.h diff --git a/servers/visual/portals/portal_pvs_builder.cpp b/servers/rendering/portals/portal_pvs_builder.cpp similarity index 100% rename from servers/visual/portals/portal_pvs_builder.cpp rename to servers/rendering/portals/portal_pvs_builder.cpp diff --git a/servers/visual/portals/portal_pvs_builder.h b/servers/rendering/portals/portal_pvs_builder.h similarity index 100% rename from servers/visual/portals/portal_pvs_builder.h rename to servers/rendering/portals/portal_pvs_builder.h diff --git a/servers/visual/portals/portal_renderer.cpp b/servers/rendering/portals/portal_renderer.cpp similarity index 99% rename from servers/visual/portals/portal_renderer.cpp rename to servers/rendering/portals/portal_renderer.cpp index bedc5355c..de7574aa3 100644 --- a/servers/visual/portals/portal_renderer.cpp +++ b/servers/rendering/portals/portal_renderer.cpp @@ -31,8 +31,8 @@ #include "portal_renderer.h" #include "portal_pvs_builder.h" -#include "servers/visual/visual_server_globals.h" -#include "servers/visual/visual_server_scene.h" +#include "servers/rendering/rendering_server_globals.h" +#include "servers/rendering/rendering_server_scene.h" #include "core/config/project_settings.h" bool PortalRenderer::use_occlusion_culling = true; diff --git a/servers/visual/portals/portal_renderer.h b/servers/rendering/portals/portal_renderer.h similarity index 100% rename from servers/visual/portals/portal_renderer.h rename to servers/rendering/portals/portal_renderer.h diff --git a/servers/visual/portals/portal_resources.cpp b/servers/rendering/portals/portal_resources.cpp similarity index 100% rename from servers/visual/portals/portal_resources.cpp rename to servers/rendering/portals/portal_resources.cpp diff --git a/servers/visual/portals/portal_resources.h b/servers/rendering/portals/portal_resources.h similarity index 100% rename from servers/visual/portals/portal_resources.h rename to servers/rendering/portals/portal_resources.h diff --git a/servers/visual/portals/portal_rooms_bsp.cpp b/servers/rendering/portals/portal_rooms_bsp.cpp similarity index 100% rename from servers/visual/portals/portal_rooms_bsp.cpp rename to servers/rendering/portals/portal_rooms_bsp.cpp diff --git a/servers/visual/portals/portal_rooms_bsp.h b/servers/rendering/portals/portal_rooms_bsp.h similarity index 100% rename from servers/visual/portals/portal_rooms_bsp.h rename to servers/rendering/portals/portal_rooms_bsp.h diff --git a/servers/visual/portals/portal_tracer.cpp b/servers/rendering/portals/portal_tracer.cpp similarity index 99% rename from servers/visual/portals/portal_tracer.cpp rename to servers/rendering/portals/portal_tracer.cpp index 395691db3..e30a1f9ca 100644 --- a/servers/visual/portals/portal_tracer.cpp +++ b/servers/rendering/portals/portal_tracer.cpp @@ -31,8 +31,8 @@ #include "portal_tracer.h" #include "portal_renderer.h" -#include "servers/visual/visual_server_globals.h" -#include "servers/visual/visual_server_scene.h" +#include "servers/rendering/rendering_server_globals.h" +#include "servers/rendering/rendering_server_scene.h" PortalTracer::PlanesPool::PlanesPool() { reset(); diff --git a/servers/visual/portals/portal_tracer.h b/servers/rendering/portals/portal_tracer.h similarity index 100% rename from servers/visual/portals/portal_tracer.h rename to servers/rendering/portals/portal_tracer.h diff --git a/servers/visual/portals/portal_types.cpp b/servers/rendering/portals/portal_types.cpp similarity index 100% rename from servers/visual/portals/portal_types.cpp rename to servers/rendering/portals/portal_types.cpp diff --git a/servers/visual/portals/portal_types.h b/servers/rendering/portals/portal_types.h similarity index 100% rename from servers/visual/portals/portal_types.h rename to servers/rendering/portals/portal_types.h diff --git a/servers/visual/rasterizer.cpp b/servers/rendering/rasterizer.cpp similarity index 100% rename from servers/visual/rasterizer.cpp rename to servers/rendering/rasterizer.cpp diff --git a/servers/visual/rasterizer.h b/servers/rendering/rasterizer.h similarity index 99% rename from servers/visual/rasterizer.h rename to servers/rendering/rasterizer.h index 43d6740b1..4cb1658a9 100644 --- a/servers/visual/rasterizer.h +++ b/servers/rendering/rasterizer.h @@ -32,7 +32,7 @@ #include "core/math/projection.h" #include "core/math/transform_interpolator.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "core/containers/self_list.h" diff --git a/servers/visual/visual_server_canvas.cpp b/servers/rendering/rendering_server_canvas.cpp similarity index 99% rename from servers/visual/visual_server_canvas.cpp rename to servers/rendering/rendering_server_canvas.cpp index 77b404941..40c2fa255 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/rendering/rendering_server_canvas.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_canvas.cpp */ +/* rendering_server_canvas.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_canvas.h" -#include "visual_server_globals.h" -#include "visual_server_raster.h" -#include "visual_server_viewport.h" +#include "rendering_server_canvas.h" +#include "rendering_server_globals.h" +#include "rendering_server_raster.h" +#include "rendering_server_viewport.h" static const int z_range = RS::CANVAS_ITEM_Z_MAX - RS::CANVAS_ITEM_Z_MIN + 1; diff --git a/servers/visual/visual_server_canvas.h b/servers/rendering/rendering_server_canvas.h similarity index 98% rename from servers/visual/visual_server_canvas.h rename to servers/rendering/rendering_server_canvas.h index 8ffd7a30c..2ccb17c54 100644 --- a/servers/visual/visual_server_canvas.h +++ b/servers/rendering/rendering_server_canvas.h @@ -1,7 +1,7 @@ -#ifndef VISUALSERVERCANVAS_H -#define VISUALSERVERCANVAS_H +#ifndef RENDERINGSERVERCANVAS_H +#define RENDERINGSERVERCANVAS_H /*************************************************************************/ -/* visual_server_canvas.h */ +/* rendering_server_canvas.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -31,7 +31,7 @@ /*************************************************************************/ #include "rasterizer.h" -#include "visual_server_viewport.h" +#include "rendering_server_viewport.h" class RenderingServerCanvas { public: @@ -256,4 +256,4 @@ public: ~RenderingServerCanvas(); }; -#endif // VISUALSERVERCANVAS_H +#endif // RENDERINGSERVERCANVAS_H diff --git a/servers/visual/visual_server_globals.cpp b/servers/rendering/rendering_server_globals.cpp similarity index 95% rename from servers/visual/visual_server_globals.cpp rename to servers/rendering/rendering_server_globals.cpp index f51448492..27411b678 100644 --- a/servers/visual/visual_server_globals.cpp +++ b/servers/rendering/rendering_server_globals.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_globals.cpp */ +/* rendering_server_globals.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_globals.h" +#include "rendering_server_globals.h" RasterizerStorage *RenderingServerGlobals::storage = nullptr; RasterizerCanvas *RenderingServerGlobals::canvas_render = nullptr; diff --git a/servers/visual/visual_server_globals.h b/servers/rendering/rendering_server_globals.h similarity index 93% rename from servers/visual/visual_server_globals.h rename to servers/rendering/rendering_server_globals.h index ab70292db..7a079c05f 100644 --- a/servers/visual/visual_server_globals.h +++ b/servers/rendering/rendering_server_globals.h @@ -1,7 +1,7 @@ -#ifndef VISUAL_SERVER_GLOBALS_H -#define VISUAL_SERVER_GLOBALS_H +#ifndef RENDERING_SERVER_GLOBALS_H +#define RENDERING_SERVER_GLOBALS_H /*************************************************************************/ -/* visual_server_globals.h */ +/* rendering_server_globals.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -50,4 +50,4 @@ public: #define RSG RenderingServerGlobals -#endif // VISUAL_SERVER_GLOBALS_H +#endif // RENDERING_SERVER_GLOBALS_H diff --git a/servers/visual/visual_server_raster.cpp b/servers/rendering/rendering_server_raster.cpp similarity index 97% rename from servers/visual/visual_server_raster.cpp rename to servers/rendering/rendering_server_raster.cpp index 7aabee660..09e6c0848 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/rendering/rendering_server_raster.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_raster.cpp */ +/* rendering_server_raster.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,15 +28,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_raster.h" +#include "rendering_server_raster.h" #include "core/config/project_settings.h" #include "core/containers/sort_array.h" #include "core/io/marshalls.h" #include "core/os/os.h" -#include "visual_server_canvas.h" -#include "visual_server_globals.h" -#include "visual_server_scene.h" +#include "rendering_server_canvas.h" +#include "rendering_server_globals.h" +#include "rendering_server_scene.h" // careful, these may run in different threads than the visual server diff --git a/servers/visual/visual_server_raster.h b/servers/rendering/rendering_server_raster.h similarity index 98% rename from servers/visual/visual_server_raster.h rename to servers/rendering/rendering_server_raster.h index 9fe2e9818..6565513d6 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/rendering/rendering_server_raster.h @@ -1,7 +1,7 @@ -#ifndef VISUAL_SERVER_RASTER_H -#define VISUAL_SERVER_RASTER_H +#ifndef RENDERING_SERVER_RASTER_H +#define RENDERING_SERVER_RASTER_H /*************************************************************************/ -/* visual_server_raster.h */ +/* rendering_server_raster.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -31,12 +31,12 @@ /*************************************************************************/ #include "core/math/octree.h" -#include "servers/visual/rasterizer.h" -#include "servers/visual_server.h" -#include "visual_server_canvas.h" -#include "visual_server_globals.h" -#include "visual_server_scene.h" -#include "visual_server_viewport.h" +#include "servers/rendering/rasterizer.h" +#include "servers/rendering_server.h" +#include "rendering_server_canvas.h" +#include "rendering_server_globals.h" +#include "rendering_server_scene.h" +#include "rendering_server_viewport.h" class RenderingServerRaster : public RenderingServer { enum { diff --git a/servers/visual/visual_server_scene.cpp b/servers/rendering/rendering_server_scene.cpp similarity index 99% rename from servers/visual/visual_server_scene.cpp rename to servers/rendering/rendering_server_scene.cpp index a755be778..cf207979e 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/rendering/rendering_server_scene.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_scene.cpp */ +/* rendering_server_scene.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,13 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_scene.h" +#include "rendering_server_scene.h" #include "core/math/transform_interpolator.h" #include "core/os/os.h" #include "core/config/project_settings.h" -#include "visual_server_globals.h" -#include "visual_server_raster.h" +#include "rendering_server_globals.h" +#include "rendering_server_raster.h" #include @@ -1475,7 +1475,7 @@ Geometry::MeshData RenderingServerScene::occlusion_debug_get_current_polys(RID p // Rooms void RenderingServerScene::callbacks_register(RenderingServerCallbacks *p_callbacks) { - _visual_server_callbacks = p_callbacks; + _rendering_server_callbacks = p_callbacks; } // the room has to be associated with a scenario, this is assumed to be @@ -2941,7 +2941,7 @@ RenderingServerScene::RenderingServerScene() { GLOBAL_DEF("rendering/quality/spatial_partitioning/bvh_collision_margin", 0.1); ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/spatial_partitioning/bvh_collision_margin", PropertyInfo(Variant::REAL, "rendering/quality/spatial_partitioning/bvh_collision_margin", PROPERTY_HINT_RANGE, "0.0,2.0,0.01")); - _visual_server_callbacks = nullptr; + _rendering_server_callbacks = nullptr; } RenderingServerScene::~RenderingServerScene() { diff --git a/servers/visual/visual_server_scene.h b/servers/rendering/rendering_server_scene.h similarity index 98% rename from servers/visual/visual_server_scene.h rename to servers/rendering/rendering_server_scene.h index fcb2b1f65..b86407df4 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/rendering/rendering_server_scene.h @@ -1,7 +1,7 @@ -#ifndef VISUALSERVERSCENE_H -#define VISUALSERVERSCENE_H +#ifndef RENDERINGSERVERSCENE_H +#define RENDERINGSERVERSCENE_H /*************************************************************************/ -/* visual_server_scene.h */ +/* rendering_server_scene.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" #include "core/math/bvh.h" #include "core/math/geometry.h" @@ -679,7 +679,7 @@ public: virtual bool rooms_is_loaded(RID p_scenario) const; virtual void callbacks_register(RenderingServerCallbacks *p_callbacks); - RenderingServerCallbacks *get_callbacks() const { return _visual_server_callbacks; } + RenderingServerCallbacks *get_callbacks() const { return _rendering_server_callbacks; } // don't use these in a game! virtual Vector instances_cull_aabb(const AABB &p_aabb, RID p_scenario = RID()) const; @@ -719,7 +719,7 @@ public: private: bool _use_bvh; - RenderingServerCallbacks *_visual_server_callbacks; + RenderingServerCallbacks *_rendering_server_callbacks; PortalResources _portal_resources; public: @@ -727,4 +727,4 @@ public: virtual ~RenderingServerScene(); }; -#endif // VISUALSERVERSCENE_H +#endif // RENDERINGSERVERSCENE_H diff --git a/servers/visual/visual_server_viewport.cpp b/servers/rendering/rendering_server_viewport.cpp similarity index 99% rename from servers/visual/visual_server_viewport.cpp rename to servers/rendering/rendering_server_viewport.cpp index 25f4b61df..6d681e435 100644 --- a/servers/visual/visual_server_viewport.cpp +++ b/servers/rendering/rendering_server_viewport.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_viewport.cpp */ +/* rendering_server_viewport.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,12 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_viewport.h" +#include "rendering_server_viewport.h" #include "core/config/project_settings.h" -#include "visual_server_canvas.h" -#include "visual_server_globals.h" -#include "visual_server_scene.h" +#include "rendering_server_canvas.h" +#include "rendering_server_globals.h" +#include "rendering_server_scene.h" static Transform2D _canvas_get_transform(RenderingServerViewport::Viewport *p_viewport, RenderingServerCanvas::Canvas *p_canvas, RenderingServerViewport::Viewport::CanvasData *p_canvas_data, const Vector2 &p_vp_size) { Transform2D xf = p_viewport->global_transform; diff --git a/servers/visual/visual_server_viewport.h b/servers/rendering/rendering_server_viewport.h similarity index 97% rename from servers/visual/visual_server_viewport.h rename to servers/rendering/rendering_server_viewport.h index 4eeaf8eae..467a2797b 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/rendering/rendering_server_viewport.h @@ -1,7 +1,7 @@ -#ifndef VISUALSERVERVIEWPORT_H -#define VISUALSERVERVIEWPORT_H +#ifndef RENDERINGSERVERVIEWPORT_H +#define RENDERINGSERVERVIEWPORT_H /*************************************************************************/ -/* visual_server_viewport.h */ +/* rendering_server_viewport.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -32,7 +32,7 @@ #include "core/containers/self_list.h" #include "rasterizer.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class RenderingServerViewport { public: @@ -198,4 +198,4 @@ public: virtual ~RenderingServerViewport() {} }; -#endif // VISUALSERVERVIEWPORT_H +#endif // RENDERINGSERVERVIEWPORT_H diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/rendering/rendering_server_wrap_mt.cpp similarity index 91% rename from servers/visual/visual_server_wrap_mt.cpp rename to servers/rendering/rendering_server_wrap_mt.cpp index f3ef1a607..ade60b354 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/rendering/rendering_server_wrap_mt.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_wrap_mt.cpp */ +/* rendering_server_wrap_mt.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_wrap_mt.h" +#include "rendering_server_wrap_mt.h" #include "core/os/os.h" #include "core/config/project_settings.h" @@ -38,19 +38,19 @@ void RenderingServerWrapMT::thread_exit() { void RenderingServerWrapMT::thread_scenario_tick(RID p_scenario) { if (!draw_pending.decrement()) { - visual_server->scenario_tick(p_scenario); + rendering_server->scenario_tick(p_scenario); } } void RenderingServerWrapMT::thread_scenario_pre_draw(RID p_scenario, bool p_will_draw) { if (!draw_pending.decrement()) { - visual_server->scenario_pre_draw(p_scenario, p_will_draw); + rendering_server->scenario_pre_draw(p_scenario, p_will_draw); } } void RenderingServerWrapMT::thread_draw(bool p_swap_buffers, double frame_step) { if (!draw_pending.decrement()) { - visual_server->draw(p_swap_buffers, frame_step); + rendering_server->draw(p_swap_buffers, frame_step); } } @@ -69,7 +69,7 @@ void RenderingServerWrapMT::thread_loop() { OS::get_singleton()->make_rendering_thread(); - visual_server->init(); + rendering_server->init(); exit.clear(); draw_thread_up.set(); @@ -80,7 +80,7 @@ void RenderingServerWrapMT::thread_loop() { command_queue.flush_all(); // flush all - visual_server->finish(); + rendering_server->finish(); } /* EVENT QUEUING */ @@ -99,7 +99,7 @@ void RenderingServerWrapMT::scenario_tick(RID p_scenario) { draw_pending.increment(); command_queue.push(this, &RenderingServerWrapMT::thread_scenario_tick, p_scenario); } else { - visual_server->scenario_tick(p_scenario); + rendering_server->scenario_tick(p_scenario); } } @@ -108,7 +108,7 @@ void RenderingServerWrapMT::scenario_pre_draw(RID p_scenario, bool p_will_draw) draw_pending.increment(); command_queue.push(this, &RenderingServerWrapMT::thread_scenario_pre_draw, p_scenario, p_will_draw); } else { - visual_server->scenario_pre_draw(p_scenario, p_will_draw); + rendering_server->scenario_pre_draw(p_scenario, p_will_draw); } } @@ -117,7 +117,7 @@ void RenderingServerWrapMT::draw(bool p_swap_buffers, double frame_step) { draw_pending.increment(); command_queue.push(this, &RenderingServerWrapMT::thread_draw, p_swap_buffers, frame_step); } else { - visual_server->draw(p_swap_buffers, frame_step); + rendering_server->draw(p_swap_buffers, frame_step); } } @@ -134,7 +134,7 @@ void RenderingServerWrapMT::init() { } print_verbose("RenderingServerWrapMT: Finished render thread"); } else { - visual_server->init(); + rendering_server->init(); } } @@ -143,7 +143,7 @@ void RenderingServerWrapMT::finish() { command_queue.push(this, &RenderingServerWrapMT::thread_exit); thread.wait_to_finish(); } else { - visual_server->finish(); + rendering_server->finish(); } texture_free_cached_ids(); @@ -186,7 +186,7 @@ RenderingServerWrapMT::RenderingServerWrapMT(RenderingServer *p_contained, bool singleton_mt = this; OS::switch_vsync_function = set_use_vsync_callback; //as this goes to another thread, make sure it goes properly - visual_server = p_contained; + rendering_server = p_contained; create_thread = p_create_thread; pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); @@ -198,6 +198,6 @@ RenderingServerWrapMT::RenderingServerWrapMT(RenderingServer *p_contained, bool } RenderingServerWrapMT::~RenderingServerWrapMT() { - memdelete(visual_server); + memdelete(rendering_server); //finish(); } diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/rendering/rendering_server_wrap_mt.h similarity index 97% rename from servers/visual/visual_server_wrap_mt.h rename to servers/rendering/rendering_server_wrap_mt.h index cb960a83c..f47e5475c 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/rendering/rendering_server_wrap_mt.h @@ -1,7 +1,7 @@ -#ifndef VISUAL_SERVER_WRAP_MT_H -#define VISUAL_SERVER_WRAP_MT_H +#ifndef RENDERING_SERVER_WRAP_MT_H +#define RENDERING_SERVER_WRAP_MT_H /*************************************************************************/ -/* visual_server_wrap_mt.h */ +/* rendering_server_wrap_mt.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -33,11 +33,11 @@ #include "core/containers/command_queue_mt.h" #include "core/os/thread.h" #include "core/os/safe_refcount.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" class RenderingServerWrapMT : public RenderingServer { // the real visual server - mutable RenderingServer *visual_server; + mutable RenderingServer *rendering_server; mutable CommandQueueMT command_queue; @@ -75,7 +75,7 @@ class RenderingServerWrapMT : public RenderingServer { public: #define ServerName RenderingServer #define ServerNameWrapMT RenderingServerWrapMT -#define server_name visual_server +#define server_name rendering_server #include "servers/server_wrap_mt_common.h" /* EVENT QUEUING */ @@ -345,7 +345,7 @@ public: //this passes directly to avoid stalling, but it's pretty dangerous, so don't call after freeing a viewport virtual int viewport_get_render_info(RID p_viewport, ViewportRenderInfo p_info) { - return visual_server->viewport_get_render_info(p_viewport, p_info); + return rendering_server->viewport_get_render_info(p_viewport, p_info); } FUNC2(viewport_set_debug_draw, RID, ViewportDebugDraw) @@ -589,15 +589,15 @@ public: //this passes directly to avoid stalling virtual uint64_t get_render_info(RenderInfo p_info) { - return visual_server->get_render_info(p_info); + return rendering_server->get_render_info(p_info); } virtual String get_video_adapter_name() const { - return visual_server->get_video_adapter_name(); + return rendering_server->get_video_adapter_name(); } virtual String get_video_adapter_vendor() const { - return visual_server->get_video_adapter_vendor(); + return rendering_server->get_video_adapter_vendor(); } FUNC4(set_boot_image, const Ref &, const Color &, bool, bool) @@ -608,15 +608,15 @@ public: FUNC1(set_debug_generate_wireframes, bool) - virtual bool has_feature(Features p_feature) const { return visual_server->has_feature(p_feature); } - virtual bool has_os_feature(const String &p_feature) const { return visual_server->has_os_feature(p_feature); } + virtual bool has_feature(Features p_feature) const { return rendering_server->has_feature(p_feature); } + virtual bool has_os_feature(const String &p_feature) const { return rendering_server->has_os_feature(p_feature); } FUNC1(call_set_use_vsync, bool) static void set_use_vsync_callback(bool p_enable); virtual bool is_low_end() const { - return visual_server->is_low_end(); + return rendering_server->is_low_end(); } RenderingServerWrapMT(RenderingServer *p_contained, bool p_create_thread); diff --git a/servers/visual/shader_language.cpp b/servers/rendering/shader_language.cpp similarity index 99% rename from servers/visual/shader_language.cpp rename to servers/rendering/shader_language.cpp index 2fe17da51..bd607353b 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -31,7 +31,7 @@ #include "shader_language.h" #include "core/os/os.h" #include "core/string/print_string.h" -#include "servers/visual_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/visual/shader_language.h b/servers/rendering/shader_language.h similarity index 100% rename from servers/visual/shader_language.h rename to servers/rendering/shader_language.h diff --git a/servers/visual/shader_types.cpp b/servers/rendering/shader_types.cpp similarity index 100% rename from servers/visual/shader_types.cpp rename to servers/rendering/shader_types.cpp diff --git a/servers/visual/shader_types.h b/servers/rendering/shader_types.h similarity index 98% rename from servers/visual/shader_types.h rename to servers/rendering/shader_types.h index 6679d0722..f3deaf371 100644 --- a/servers/visual/shader_types.h +++ b/servers/rendering/shader_types.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/ordered_hash_map.h" -#include "servers/visual_server.h" +#include "servers/rendering_server.h" #include "shader_language.h" class ShaderTypes { diff --git a/servers/visual_server.cpp b/servers/rendering_server.cpp similarity index 99% rename from servers/visual_server.cpp rename to servers/rendering_server.cpp index 116a7f387..78d2db5ba 100644 --- a/servers/visual_server.cpp +++ b/servers/rendering_server.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server.cpp */ +/* rendering_server.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server.h" +#include "rendering_server.h" #include "core/config/engine.h" #include "core/object/method_bind_ext.gen.inc" diff --git a/servers/visual_server.h b/servers/rendering_server.h similarity index 99% rename from servers/visual_server.h rename to servers/rendering_server.h index 8cfbc9ed4..5835947e2 100644 --- a/servers/visual_server.h +++ b/servers/rendering_server.h @@ -1,7 +1,7 @@ -#ifndef VISUAL_SERVER_H -#define VISUAL_SERVER_H +#ifndef RENDERING_SERVER_H +#define RENDERING_SERVER_H /*************************************************************************/ -/* visual_server.h */ +/* rendering_server.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/servers/visual_server_callbacks.cpp b/servers/rendering_server_callbacks.cpp similarity index 95% rename from servers/visual_server_callbacks.cpp rename to servers/rendering_server_callbacks.cpp index 62ede15bf..3e1f56c03 100644 --- a/servers/visual_server_callbacks.cpp +++ b/servers/rendering_server_callbacks.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_server_callbacks.cpp */ +/* rendering_server_callbacks.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "visual_server_callbacks.h" +#include "rendering_server_callbacks.h" #include "core/object/object.h" diff --git a/servers/visual_server_callbacks.h b/servers/rendering_server_callbacks.h similarity index 93% rename from servers/visual_server_callbacks.h rename to servers/rendering_server_callbacks.h index 5d6ad00e8..de0b6d729 100644 --- a/servers/visual_server_callbacks.h +++ b/servers/rendering_server_callbacks.h @@ -1,7 +1,7 @@ -#ifndef VISUAL_SERVER_CALLBACKS_H -#define VISUAL_SERVER_CALLBACKS_H +#ifndef RENDERING_SERVER_CALLBACKS_H +#define RENDERING_SERVER_CALLBACKS_H /*************************************************************************/ -/* visual_server_callbacks.h */ +/* rendering_server_callbacks.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -62,4 +62,4 @@ private: Mutex mutex; }; -#endif // VISUAL_SERVER_CALLBACKS_H +#endif // RENDERING_SERVER_CALLBACKS_H