Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-21 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also renamed the files.

Browse Source
This commit is contained in:
Relintai 2022-08-19 21:24:36 +02:00
parent cffe742085
commit e2d42db711
161 changed files with 339 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/bvh.h
View File

@ -39,7 +39,7 @@
// Some notes on the use of BVH / Octree from Godot 3.2. // Some notes on the use of BVH / Octree from Godot 3.2.
// This is not well explained elsewhere. // This is not well explained elsewhere.
// The rendering tree mask and types that are sent to the BVH are NOT layer masks. // 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. // 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 // Layer masks are implemented in the renderers as a later step, and light_cull_mask appears to be

4
drivers/dummy/rasterizer_dummy.h
View File

@ -33,8 +33,8 @@
#include "core/math/projection.h" #include "core/math/projection.h"
#include "core/containers/self_list.h" #include "core/containers/self_list.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class RasterizerSceneDummy : public RasterizerScene { class RasterizerSceneDummy : public RasterizerScene {
public: public:

2
drivers/gles2/rasterizer_canvas_base_gles2.cpp
View File

@ -34,7 +34,7 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "drivers/gles_common/rasterizer_asserts.h" #include "drivers/gles_common/rasterizer_asserts.h"
#include "rasterizer_scene_gles2.h" #include "rasterizer_scene_gles2.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#ifndef GLES_OVER_GL #ifndef GLES_OVER_GL
#define glClearDepth glClearDepthf #define glClearDepth glClearDepthf

2
drivers/gles2/rasterizer_canvas_base_gles2.h
View File

@ -32,7 +32,7 @@
#include "drivers/gles_common/rasterizer_array.h" #include "drivers/gles_common/rasterizer_array.h"
#include "rasterizer_storage_gles2.h" #include "rasterizer_storage_gles2.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "shaders/canvas.glsl.gen.h" #include "shaders/canvas.glsl.gen.h"
#include "shaders/lens_distorted.glsl.gen.h" #include "shaders/lens_distorted.glsl.gen.h"

2
drivers/gles2/rasterizer_canvas_gles2.cpp
View File

@ -35,7 +35,7 @@
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#include "drivers/gles_common/rasterizer_asserts.h" #include "drivers/gles_common/rasterizer_asserts.h"
#include "rasterizer_scene_gles2.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[] = { static const GLenum gl_primitive[] = {
GL_POINTS, GL_POINTS,

2
drivers/gles2/rasterizer_gles2.h
View File

@ -33,7 +33,7 @@
#include "rasterizer_canvas_gles2.h" #include "rasterizer_canvas_gles2.h"
#include "rasterizer_scene_gles2.h" #include "rasterizer_scene_gles2.h"
#include "rasterizer_storage_gles2.h" #include "rasterizer_storage_gles2.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
class RasterizerGLES2 : public Rasterizer { class RasterizerGLES2 : public Rasterizer {
static Rasterizer *_create_current(); static Rasterizer *_create_current();

2
drivers/gles2/rasterizer_scene_gles2.cpp
View File

@ -36,7 +36,7 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/containers/vmap.h" #include "core/containers/vmap.h"
#include "rasterizer_canvas_gles2.h" #include "rasterizer_canvas_gles2.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#ifndef GLES_OVER_GL #ifndef GLES_OVER_GL
#define glClearDepth glClearDepthf #define glClearDepth glClearDepthf

2
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -34,7 +34,7 @@
#include "core/math/transform.h" #include "core/math/transform.h"
#include "rasterizer_canvas_gles2.h" #include "rasterizer_canvas_gles2.h"
#include "rasterizer_scene_gles2.h" #include "rasterizer_scene_gles2.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
GLuint RasterizerStorageGLES2::system_fbo = 0; GLuint RasterizerStorageGLES2::system_fbo = 0;

4
drivers/gles2/rasterizer_storage_gles2.h
View File

@ -33,8 +33,8 @@
#include "core/containers/pool_vector.h" #include "core/containers/pool_vector.h"
#include "core/containers/self_list.h" #include "core/containers/self_list.h"
#include "drivers/gles_common/rasterizer_asserts.h" #include "drivers/gles_common/rasterizer_asserts.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include "shader_compiler_gles2.h" #include "shader_compiler_gles2.h"
#include "shader_gles2.h" #include "shader_gles2.h"

6
drivers/gles2/shader_compiler_gles2.h
View File

@ -32,9 +32,9 @@
#include "core/containers/pair.h" #include "core/containers/pair.h"
#include "core/string/string_builder.h" #include "core/string/string_builder.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include "servers/visual/shader_types.h" #include "servers/rendering/shader_types.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class ShaderCompilerGLES2 { class ShaderCompilerGLES2 {
public: public:

2
drivers/gles2/shader_gles2.h
View File

@ -43,7 +43,7 @@
#include "core/math/projection.h" #include "core/math/projection.h"
#include "core/containers/pair.h" #include "core/containers/pair.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include <stdio.h> #include <stdio.h>

2
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -35,7 +35,7 @@
#include "rasterizer_array.h" #include "rasterizer_array.h"
#include "rasterizer_asserts.h" #include "rasterizer_asserts.h"
#include "rasterizer_storage_common.h" #include "rasterizer_storage_common.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
// We are using the curiously recurring template pattern // We are using the curiously recurring template pattern
// https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern // https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern

2
drivers/unix/os_unix.cpp
View File

@ -37,7 +37,7 @@
#include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix.h"
#include "drivers/unix/net_socket_posix.h" #include "drivers/unix/net_socket_posix.h"
#include "drivers/unix/thread_posix.h" #include "drivers/unix/thread_posix.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach-o/dyld.h> #include <mach-o/dyld.h>

2
editor/animation_track_editor_plugins.cpp
View File

@ -52,7 +52,7 @@
#include "core/containers/vector.h" #include "core/containers/vector.h"
#include "scene/resources/animation.h" #include "scene/resources/animation.h"
#include "scene/resources/font.h" #include "scene/resources/font.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
/// BOOL /// /// BOOL ///
int AnimationTrackEditBool::get_key_height() const { int AnimationTrackEditBool::get_key_height() const {

2
editor/editor_inspector.cpp
View File

@ -66,7 +66,7 @@
#include "scene/resources/font.h" #include "scene/resources/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Size2 EditorProperty::get_minimum_size() const { Size2 EditorProperty::get_minimum_size() const {
Size2 ms; Size2 ms;

2
editor/editor_node.cpp
View File

@ -193,7 +193,7 @@
#include "servers/navigation_server.h" #include "servers/navigation_server.h"
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Camera; class Camera;

2
editor/editor_plugin.cpp
View File

@ -41,7 +41,7 @@
#include "plugins/spatial_editor_plugin.h" #include "plugins/spatial_editor_plugin.h"
#include "scene/3d/camera.h" #include "scene/3d/camera.h"
#include "scene/gui/popup_menu.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/object/class_db.h"
#include "core/math/color.h" #include "core/math/color.h"
#include "core/io/image.h" #include "core/io/image.h"

2
editor/editor_resource_preview.cpp
View File

@ -49,7 +49,7 @@
#include "core/object/script_language.h" #include "core/object/script_language.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
bool EditorResourcePreviewGenerator::handles(const String &p_type) const { bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
if (get_script_instance() && get_script_instance()->has_method("handles")) { if (get_script_instance() && get_script_instance()->has_method("handles")) {

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -42,7 +42,7 @@
#include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/canvas_item_editor_plugin.h"
#include "editor/plugins/spatial_editor_plugin.h" #include "editor/plugins/spatial_editor_plugin.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "core/variant/array.h" #include "core/variant/array.h"
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "core/math/color.h" #include "core/math/color.h"

2
editor/plugins/audio_stream_editor_plugin.cpp
View File

@ -52,7 +52,7 @@
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"
void AudioStreamEditor::_notification(int p_what) { void AudioStreamEditor::_notification(int p_what) {

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -93,7 +93,7 @@
#include "scene/resources/font.h" #include "scene/resources/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/theme.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. // 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. // That way, we can naturally reach a 100% zoom from boundaries.

2
editor/plugins/editor_preview_plugins.cpp
View File

@ -65,7 +65,7 @@
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void post_process_preview(Ref<Image> p_image) { void post_process_preview(Ref<Image> p_image) {
if (p_image->get_format() != Image::FORMAT_RGBA8) { if (p_image->get_format() != Image::FORMAT_RGBA8) {

2
editor/plugins/material_editor_plugin.cpp
View File

@ -61,7 +61,7 @@
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class EditorNode; class EditorNode;

2
editor/plugins/polygon_2d_editor_plugin.cpp
View File

@ -71,7 +71,7 @@
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class EditorNode; class EditorNode;
class Node2D; class Node2D;

6
editor/plugins/shader_editor_plugin.cpp
View File

@ -61,9 +61,9 @@
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/text_edit.h" #include "scene/gui/text_edit.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include "servers/visual/shader_types.h" #include "servers/rendering/shader_types.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
struct ScriptCodeCompletionOption; struct ScriptCodeCompletionOption;

2
editor/plugins/texture_region_editor_plugin.cpp
View File

@ -62,7 +62,7 @@
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
/** /**
@author Mariano Suligoy @author Mariano Suligoy

2
editor/property_editor.cpp
View File

@ -97,7 +97,7 @@
#include "scene/resources/font.h" #include "scene/resources/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void EditorResourceConversionPlugin::_bind_methods() { void EditorResourceConversionPlugin::_bind_methods() {
MethodInfo mi; MethodInfo mi;

2
editor/spatial_editor_gizmos.cpp
View File

@ -104,7 +104,7 @@
#include "scene/resources/sphere_shape.h" #include "scene/resources/sphere_shape.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#define HANDLE_HALF_SIZE 9.5 #define HANDLE_HALF_SIZE 9.5

2
main/input_default.cpp
View File

@ -34,7 +34,7 @@
#include "core/input/input_map.h" #include "core/input/input_map.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "scene/resources/texture.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) { void InputDefault::SpeedTrack::update(const Vector2 &p_delta_p) {
uint64_t tick = OS::get_singleton()->get_ticks_usec(); uint64_t tick = OS::get_singleton()->get_ticks_usec();

16
main/main.cpp
View File

@ -68,7 +68,7 @@
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/register_server_types.h" #include "servers/register_server_types.h"
#include "servers/visual_server_callbacks.h" #include "servers/rendering_server_callbacks.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/doc/doc_data.h" #include "editor/doc/doc_data.h"
@ -107,7 +107,7 @@ static MessageQueue *message_queue = nullptr;
static AudioServer *audio_server = nullptr; static AudioServer *audio_server = nullptr;
static PhysicsServer *physics_server = nullptr; static PhysicsServer *physics_server = nullptr;
static Physics2DServer *physics_2d_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 NavigationServer *navigation_server = nullptr;
static Navigation2DServer *navigation_2d_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 = memnew(AudioServer);
audio_server->init(); 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); RenderingServer::get_singleton()->set_render_loop_enabled(!disable_render_loop);
register_core_singletons(); register_core_singletons();
@ -1540,8 +1540,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
script_debugger->profiling_start(); script_debugger->profiling_start();
} }
visual_server_callbacks = memnew(RenderingServerCallbacks); rendering_server_callbacks = memnew(RenderingServerCallbacks);
RenderingServer::get_singleton()->callbacks_register(visual_server_callbacks); RenderingServer::get_singleton()->callbacks_register(rendering_server_callbacks);
_start_success = true; _start_success = true;
@ -2255,7 +2255,7 @@ bool Main::iteration() {
if (OS::get_singleton()->get_main_loop()->idle(step * time_scale)) { if (OS::get_singleton()->get_main_loop()->idle(step * time_scale)) {
exit = true; exit = true;
} }
visual_server_callbacks->flush(); rendering_server_callbacks->flush();
message_queue->flush(); message_queue->flush();
RenderingServer::get_singleton()->sync(); //sync if still drawing from previous frames. RenderingServer::get_singleton()->sync(); //sync if still drawing from previous frames.
@ -2461,8 +2461,8 @@ void Main::cleanup(bool p_force) {
message_queue->flush(); message_queue->flush();
memdelete(message_queue); memdelete(message_queue);
if (visual_server_callbacks) { if (rendering_server_callbacks) {
memdelete(visual_server_callbacks); memdelete(rendering_server_callbacks);
} }
unregister_core_driver_types(); unregister_core_driver_types();

2
main/performance.cpp
View File

@ -37,7 +37,7 @@
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Performance *Performance::singleton = nullptr; Performance *Performance::singleton = nullptr;

2
main/tests/test_math.cpp
View File

@ -43,7 +43,7 @@
#include "core/containers/vmap.h" #include "core/containers/vmap.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include "core/variant/method_ptrcall.h" #include "core/variant/method_ptrcall.h"

2
main/tests/test_physics.cpp
View File

@ -37,7 +37,7 @@
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class TestPhysicsMainLoop : public MainLoop { class TestPhysicsMainLoop : public MainLoop {
GDCLASS(TestPhysicsMainLoop, MainLoop); GDCLASS(TestPhysicsMainLoop, MainLoop);

2
main/tests/test_physics_2d.cpp
View File

File diff suppressed because one or more lines are too long

2
main/tests/test_render.cpp
View File

@ -36,7 +36,7 @@
#include "core/os/main_loop.h" #include "core/os/main_loop.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#define OBJECT_COUNT 50 #define OBJECT_COUNT 50

4
main/tests/test_shader_lang.cpp
View File

@ -38,8 +38,8 @@
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "core/input/shortcut.h" #include "core/input/shortcut.h"
#include "scene/gui/text_edit.h" #include "scene/gui/text_edit.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#include "servers/visual/shader_types.h" #include "servers/rendering/shader_types.h"
typedef ShaderLanguage SL; typedef ShaderLanguage SL;

2
modules/mesh_utils/mesh_utils.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "xatlas/xatlas.h" #include "xatlas/xatlas.h"

2
modules/mesh_utils/simplify.h
View File

@ -27,7 +27,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include "servers/visual_server.h" #include "servers/rendering_server.h"
namespace Simplify { namespace Simplify {

4
modules/props/prop_instance_merger.cpp
View File

@ -5,7 +5,7 @@
//#include "../thread_pool/thread_pool.h" //#include "../thread_pool/thread_pool.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "core/config/engine.h" #include "core/config/engine.h"
@ -16,7 +16,7 @@
} \ } \
return r; return r;
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
//define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling, //define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling,

2
modules/props_2d/prop_2d_instance_merger.cpp
View File

@ -15,7 +15,7 @@
} \ } \
return r; return r;
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
//define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling, //define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling,

2
modules/terraman/meshers/default/terrain_mesher_default.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "scene/3d/mesh_instance.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 { _FORCE_INLINE_ int TerrainMesherDefault::get_build_flags() const {
return _build_flags; return _build_flags;

2
modules/terraman/world/default/terrain_chunk_default.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h" #include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/terrain_mesher_default.h" #include "../../meshers/default/terrain_mesher_default.h"

2
modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"

2
modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h" #include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/terrain_2d_mesher_default.h" #include "../../meshers/default/terrain_2d_mesher_default.h"

2
modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void VoxelMesherCubic::_add_chunk(Ref<VoxelChunk> p_chunk) { void VoxelMesherCubic::_add_chunk(Ref<VoxelChunk> p_chunk) {
Ref<VoxelChunkDefault> chunk = p_chunk; Ref<VoxelChunkDefault> chunk = p_chunk;

2
modules/voxelman/meshers/default/voxel_mesher_default.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "scene/3d/mesh_instance.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 { _FORCE_INLINE_ int VoxelMesherDefault::get_build_flags() const {
return _build_flags; return _build_flags;

2
modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../world/jobs/voxel_job.h" #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<VoxelChunk> chunk, const int x, const int y, const int z, const int size) { void VoxelMesherMarchingCubes::get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size) {
uint8_t *channel_type = chunk->channel_get(_channel_index_type); uint8_t *channel_type = chunk->channel_get(_channel_index_type);

2
modules/voxelman/world/default/voxel_chunk_default.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "../../defines.h" #include "../../defines.h"
#include "servers/physics_server.h" #include "servers/physics_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h" #include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/voxel_mesher_default.h" #include "../../meshers/default/voxel_mesher_default.h"

10
platform/android/os_android.cpp
View File

@ -37,8 +37,8 @@
#include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix.h"
#include "main/main.h" #include "main/main.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include "dir_access_jandroid.h" #include "dir_access_jandroid.h"
#include "file_access_android.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; video_driver_index = p_video_driver;
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { 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); AudioDriverManager::initialize(p_audio_driver);

4
platform/android/os_android.h
View File

@ -35,7 +35,7 @@
#include "drivers/unix/os_unix.h" #include "drivers/unix/os_unix.h"
#include "main/input_default.h" #include "main/input_default.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
class PandemoniumJavaWrapper; class PandemoniumJavaWrapper;
class PandemoniumIOJavaWrapper; class PandemoniumIOJavaWrapper;
@ -46,7 +46,7 @@ class OS_Android : public OS_Unix {
bool secondary_gl_available = false; bool secondary_gl_available = false;
RenderingServer *visual_server; RenderingServer *rendering_server;
mutable String data_dir_cache; mutable String data_dir_cache;
mutable String cache_dir_cache; mutable String cache_dir_cache;

16
platform/frt/os_frt.cpp
View File

@ -35,10 +35,10 @@
#include "core/input/input.h" #include "core/input/input.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "drivers/unix/os_unix.h" #include "drivers/unix/os_unix.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/audio/audio_driver_dummy.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/alsa/audio_driver_alsa.h"
#include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "drivers/pulseaudio/audio_driver_pulseaudio.h"
#include "main/main.h" #include "main/main.h"
@ -132,7 +132,7 @@ private:
Env *env; Env *env;
Vec2 screen_size; Vec2 screen_size;
ContextGL *context_gl; ContextGL *context_gl;
RenderingServer *visual_server; RenderingServer *rendering_server;
VideoMode current_videomode; VideoMode current_videomode;
int current_video_driver; int current_video_driver;
List<String> args; List<String> args;
@ -291,7 +291,7 @@ public:
RasterizerGLES2::make_current(); RasterizerGLES2::make_current();
current_video_driver = VIDEO_DRIVER_GLES2; current_video_driver = VIDEO_DRIVER_GLES2;
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
// TODO: Audio Module // TODO: Audio Module
AudioDriverManagerSW::get_driver(audio_driver)->set_singleton(); AudioDriverManagerSW::get_driver(audio_driver)->set_singleton();
@ -309,10 +309,10 @@ public:
} }
} }
if (!visual_server) if (!rendering_server)
return FAILED; return FAILED;
visual_server->init(); rendering_server->init();
input = memnew(InputDefault); input = memnew(InputDefault);
@ -331,7 +331,7 @@ public:
for (int i = 0; i < get_audio_driver_count(); i++) for (int i = 0; i < get_audio_driver_count(); i++)
AudioDriverManager::get_driver(i)->finish(); AudioDriverManager::get_driver(i)->finish();
memdelete(visual_server); memdelete(rendering_server);
#ifdef JOYDEV_ENABLED #ifdef JOYDEV_ENABLED
memdelete(joystick); memdelete(joystick);

18
platform/frt_sdl/frt_godot3.cc
View File

@ -17,10 +17,10 @@
#pragma GCC diagnostic ignored "-Wvolatile" #pragma GCC diagnostic ignored "-Wvolatile"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "main/main.h" #include "main/main.h"
namespace frt { namespace frt {
@ -90,19 +90,19 @@ private:
bool quit_; bool quit_;
OS_FRT os_; OS_FRT os_;
int video_driver_; int video_driver_;
RenderingServer *visual_server_; RenderingServer *rendering_server_;
void init_video() { void init_video() {
//if (video_driver_ == VIDEO_DRIVER_GLES2) { //if (video_driver_ == VIDEO_DRIVER_GLES2) {
frt_resolve_symbols_gles2(get_proc_address); frt_resolve_symbols_gles2(get_proc_address);
RasterizerGLES2::register_config(); RasterizerGLES2::register_config();
RasterizerGLES2::make_current(); RasterizerGLES2::make_current();
//} //}
visual_server_ = memnew(RenderingServerRaster); rendering_server_ = memnew(RenderingServerRaster);
visual_server_->init(); rendering_server_->init();
} }
void cleanup_video() { void cleanup_video() {
visual_server_->finish(); rendering_server_->finish();
memdelete(visual_server_); memdelete(rendering_server_);
} }
AudioDriverSDL2 audio_driver_; AudioDriverSDL2 audio_driver_;
void init_audio(int id) { void init_audio(int id) {

6
platform/iphone/os_iphone.h
View File

@ -40,15 +40,15 @@
#include "ios.h" #include "ios.h"
#include "main/input_default.h" #include "main/input_default.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class OSIPhone : public OS_Unix { class OSIPhone : public OS_Unix {
private: private:
static HashMap<String, void *> dynamic_symbol_lookup_table; static HashMap<String, void *> dynamic_symbol_lookup_table;
friend void register_dynamic_symbol(char *name, void *address); friend void register_dynamic_symbol(char *name, void *address);
RenderingServer *visual_server; RenderingServer *rendering_server;
AudioDriverCoreAudio audio_driver; AudioDriverCoreAudio audio_driver;

20
platform/iphone/os_iphone.mm
View File

@ -33,8 +33,8 @@
#include "os_iphone.h" #include "os_iphone.h"
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include "main/main.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; video_driver_index = p_video_driver;
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
// FIXME: Reimplement threaded rendering // FIXME: Reimplement threaded rendering
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { 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();
//visual_server->cursor_set_visible(false, 0); //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) { //if (use_gl3) {
// RasterizerStorageGLES3::system_fbo = gl_view_base_fb; // RasterizerStorageGLES3::system_fbo = gl_view_base_fb;
//} else { //} else {
@ -323,8 +323,8 @@ void OSIPhone::finalize() {
memdelete(ios); memdelete(ios);
} }
visual_server->finish(); rendering_server->finish();
memdelete(visual_server); memdelete(rendering_server);
// memdelete(rasterizer); // memdelete(rasterizer);
} }
@ -738,7 +738,7 @@ OSIPhone::OSIPhone(String p_data_dir, String p_cache_dir) {
ios_init_callbacks_capacity = 0; ios_init_callbacks_capacity = 0;
main_loop = NULL; main_loop = NULL;
visual_server = NULL; rendering_server = NULL;
offscreen_gl_context = NULL; offscreen_gl_context = NULL;
// can't call set_data_dir from here, since it requires DirAccess // can't call set_data_dir from here, since it requires DirAccess

16
platform/javascript/os_javascript.cpp
View File

@ -35,9 +35,9 @@
#include "drivers/unix/dir_access_unix.h" #include "drivers/unix/dir_access_unix.h"
#include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix.h"
#include "main/main.h" #include "main/main.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#ifndef NO_THREADS #ifndef NO_THREADS
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#endif #endif
#include "scene/resources/texture.h" #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; video_driver_index = p_video_driver;
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
visual_server = memnew(RenderingServerRaster()); rendering_server = memnew(RenderingServerRaster());
#ifndef NO_THREADS #ifndef NO_THREADS
visual_server = memnew(RenderingServerWrapMT(visual_server, false)); rendering_server = memnew(RenderingServerWrapMT(rendering_server, false));
#endif #endif
input = memnew(InputDefault); input = memnew(InputDefault);
@ -755,7 +755,7 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
MainLoop::NOTIFICATION_WM_FOCUS_OUT); MainLoop::NOTIFICATION_WM_FOCUS_OUT);
pandemonium_js_display_vk_cb(&input_text_callback); pandemonium_js_display_vk_cb(&input_text_callback);
visual_server->init(); rendering_server->init();
return OK; return OK;
} }
@ -853,9 +853,9 @@ void OS_JavaScript::delete_main_loop() {
void OS_JavaScript::finalize() { void OS_JavaScript::finalize() {
memdelete(input); memdelete(input);
visual_server->finish(); rendering_server->finish();
emscripten_webgl_commit_frame(); emscripten_webgl_commit_frame();
memdelete(visual_server); memdelete(rendering_server);
emscripten_webgl_destroy_context(webgl_ctx); emscripten_webgl_destroy_context(webgl_ctx);
for (int i = 0; i < audio_drivers.size(); i++) { for (int i = 0; i < audio_drivers.size(); i++) {
memdelete(audio_drivers[i]); memdelete(audio_drivers[i]);
@ -1067,7 +1067,7 @@ OS_JavaScript::OS_JavaScript() {
transparency_enabled = false; transparency_enabled = false;
main_loop = NULL; main_loop = NULL;
visual_server = NULL; rendering_server = NULL;
swap_ok_cancel = false; swap_ok_cancel = false;
idb_available = pandemonium_js_os_fs_is_persistent() != 0; idb_available = pandemonium_js_os_fs_is_persistent() != 0;

4
platform/javascript/os_javascript.h
View File

@ -34,7 +34,7 @@
#include "drivers/unix/os_unix.h" #include "drivers/unix/os_unix.h"
#include "main/input_default.h" #include "main/input_default.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include <emscripten/html5.h> #include <emscripten/html5.h>
@ -71,7 +71,7 @@ private:
MainLoop *main_loop; MainLoop *main_loop;
int video_driver_index; int video_driver_index;
List<AudioDriverJavaScript *> audio_drivers; List<AudioDriverJavaScript *> audio_drivers;
RenderingServer *visual_server; RenderingServer *rendering_server;
bool swap_ok_cancel; bool swap_ok_cancel;
bool idb_available; bool idb_available;

8
platform/osx/os_osx.h
View File

@ -41,9 +41,9 @@
#include "main/input_default.h" #include "main/input_default.h"
#include "power_osx.h" #include "power_osx.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <AppKit/NSCursor.h> #include <AppKit/NSCursor.h>
@ -82,7 +82,7 @@ public:
bool is_resizing = false; bool is_resizing = false;
// rasterizer seems to no longer be given to visual server, its using GLES3 directly? // rasterizer seems to no longer be given to visual server, its using GLES3 directly?
//Rasterizer *rasterizer; //Rasterizer *rasterizer;
RenderingServer *visual_server; RenderingServer *rendering_server;
List<String> args; List<String> args;
MainLoop *main_loop; MainLoop *main_loop;

12
platform/osx/os_osx.mm
View File

@ -38,7 +38,7 @@
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#include "main/main.h" #include "main/main.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include <os/log.h> #include <os/log.h>
@ -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; video_driver_index = p_video_driver;
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { 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); AudioDriverManager::initialize(p_audio_driver);
input = memnew(InputDefault); input = memnew(InputDefault);
@ -1819,8 +1819,8 @@ void OS_OSX::finalize() {
memdelete(input); memdelete(input);
cursors_cache.clear(); cursors_cache.clear();
visual_server->finish(); rendering_server->finish();
memdelete(visual_server); memdelete(rendering_server);
//memdelete(rasterizer); //memdelete(rasterizer);
} }

10
platform/server/os_server.cpp
View File

@ -33,7 +33,7 @@
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "drivers/dummy/rasterizer_dummy.h" #include "drivers/dummy/rasterizer_dummy.h"
#include "drivers/dummy/texture_loader_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" #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 video_driver_index = p_video_driver; // unused in server platform, but should still be initialized
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
visual_server->init(); rendering_server->init();
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
@ -99,8 +99,8 @@ void OS_Server::finalize() {
memdelete(main_loop); memdelete(main_loop);
main_loop = NULL; main_loop = NULL;
visual_server->finish(); rendering_server->finish();
memdelete(visual_server); memdelete(rendering_server);
memdelete(input); memdelete(input);

6
platform/server/os_server.h
View File

@ -41,13 +41,13 @@
#include "platform/x11/power_x11.h" #include "platform/x11/power_x11.h"
#endif #endif
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#undef CursorShape #undef CursorShape
class OS_Server : public OS_Unix { class OS_Server : public OS_Unix {
RenderingServer *visual_server; RenderingServer *rendering_server;
VideoMode current_videomode; VideoMode current_videomode;
List<String> args; List<String> args;
MainLoop *main_loop; MainLoop *main_loop;

14
platform/windows/os_windows.cpp
View File

@ -42,8 +42,8 @@
#include "main/main.h" #include "main/main.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include "windows_terminal_logger.h" #include "windows_terminal_logger.h"
#include <avrt.h> #include <avrt.h>
@ -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); set_vsync_via_compositor(video_mode.vsync_via_compositor);
#endif #endif
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { 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); input = memnew(InputDefault);
joypad = memnew(JoypadWindows(input, &hWnd)); joypad = memnew(JoypadWindows(input, &hWnd));
@ -1746,8 +1746,8 @@ void OS_Windows::finalize() {
icon.unref(); icon.unref();
cursors_cache.clear(); cursors_cache.clear();
visual_server->finish(); rendering_server->finish();
memdelete(visual_server); memdelete(rendering_server);
#ifdef OPENGL_ENABLED #ifdef OPENGL_ENABLED
if (gl_context) if (gl_context)
memdelete(gl_context); memdelete(gl_context);

6
platform/windows/os_windows.h
View File

@ -42,8 +42,8 @@
#include "main/input_default.h" #include "main/input_default.h"
#include "power_windows.h" #include "power_windows.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#ifdef XAUDIO2_ENABLED #ifdef XAUDIO2_ENABLED
#include "drivers/xaudio2/audio_driver_xaudio2.h" #include "drivers/xaudio2/audio_driver_xaudio2.h"
#endif #endif
@ -319,7 +319,7 @@ class OS_Windows : public OS {
#if defined(OPENGL_ENABLED) #if defined(OPENGL_ENABLED)
ContextGL_Windows *gl_context; ContextGL_Windows *gl_context;
#endif #endif
RenderingServer *visual_server; RenderingServer *rendering_server;
int pressrc; int pressrc;
HINSTANCE hInstance; // Holds The Instance Of The Application HINSTANCE hInstance; // Holds The Instance Of The Application
HWND hWnd; HWND hWnd;

16
platform/x11/os_x11.cpp
View File

@ -38,8 +38,8 @@
#include "key_mapping_x11.h" #include "key_mapping_x11.h"
#include "main/main.h" #include "main/main.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#ifdef HAVE_MNTENT #ifdef HAVE_MNTENT
#include <mntent.h> #include <mntent.h>
@ -355,9 +355,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
#endif #endif
visual_server = memnew(RenderingServerRaster); rendering_server = memnew(RenderingServerRaster);
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { 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) { 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); 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); ERR_FAIL_COND_V(x11_window == 0, ERR_UNAVAILABLE);
XSetWindowAttributes new_attr; 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); xdnd_selection = XInternAtom(x11_display, "XdndSelection", False);
requested = None; requested = None;
visual_server->init(); rendering_server->init();
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
@ -835,8 +835,8 @@ void OS_X11::finalize() {
memdelete(input); memdelete(input);
cursors_cache.clear(); cursors_cache.clear();
visual_server->finish(); rendering_server->finish();
memdelete(visual_server); memdelete(rendering_server);
//memdelete(rasterizer); //memdelete(rasterizer);
memdelete(power_manager); memdelete(power_manager);

6
platform/x11/os_x11.h
View File

@ -42,8 +42,8 @@
#include "main/input_default.h" #include "main/input_default.h"
#include "power_x11.h" #include "power_x11.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h" #include "servers/rendering/rasterizer.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include <X11/Xcursor/Xcursor.h> #include <X11/Xcursor/Xcursor.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -93,7 +93,7 @@ class OS_X11 : public OS_Unix {
ContextGL_X11 *context_gl; ContextGL_X11 *context_gl;
#endif #endif
//Rasterizer *rasterizer; //Rasterizer *rasterizer;
RenderingServer *visual_server; RenderingServer *rendering_server;
VideoMode current_videomode; VideoMode current_videomode;
List<String> args; List<String> args;
Window x11_window; Window x11_window;

2
scene/2d/camera_2d.cpp
View File

@ -34,7 +34,7 @@
#include "core/math/math_funcs.h" #include "core/math/math_funcs.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void Camera2D::_update_scroll() { void Camera2D::_update_scroll() {
if (!is_inside_tree()) { if (!is_inside_tree()) {

4
scene/2d/canvas_item.cpp
View File

@ -41,8 +41,8 @@
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"

2
scene/2d/cpu_particles_2d.cpp
View File

@ -35,7 +35,7 @@
#include "scene/2d/canvas_item.h" #include "scene/2d/canvas_item.h"
#include "scene/resources/particles_material.h" #include "scene/resources/particles_material.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void CPUParticles2D::set_emitting(bool p_emitting) { void CPUParticles2D::set_emitting(bool p_emitting) {
if (emitting == p_emitting) { if (emitting == p_emitting) {

2
scene/2d/light_2d.cpp
View File

@ -31,7 +31,7 @@
#include "light_2d.h" #include "light_2d.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Dictionary Light2D::_edit_get_state() const { Dictionary Light2D::_edit_get_state() const {

2
scene/2d/node_2d.cpp
View File

@ -33,7 +33,7 @@
#include "core/object/message_queue.h" #include "core/object/message_queue.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Dictionary Node2D::_edit_get_state() const { Dictionary Node2D::_edit_get_state() const {

2
scene/3d/collision_shape.cpp
View File

@ -42,7 +42,7 @@
#include "scene/resources/ray_shape.h" #include "scene/resources/ray_shape.h"
#include "scene/resources/shape.h" #include "scene/resources/shape.h"
#include "scene/resources/sphere_shape.h" #include "scene/resources/sphere_shape.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void CollisionShape::make_convex_from_brothers() { void CollisionShape::make_convex_from_brothers() {
Node *p = get_parent(); Node *p = get_parent();

2
scene/3d/cpu_particles.cpp
View File

@ -37,7 +37,7 @@
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/particles_material.h" #include "scene/resources/particles_material.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
AABB CPUParticles::get_aabb() const { AABB CPUParticles::get_aabb() const {
return AABB(); return AABB();

2
scene/3d/light.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/ /*************************************************************************/
#include "scene/3d/visual_instance.h" #include "scene/3d/visual_instance.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Light : public VisualInstance { class Light : public VisualInstance {
GDCLASS(Light, VisualInstance); GDCLASS(Light, VisualInstance);

30
scene/3d/mesh_instance.cpp
View File

@ -39,7 +39,7 @@
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/skin.h" #include "scene/resources/skin.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual/visual_server_globals.h" #include "servers/rendering/rendering_server_globals.h"
#include "skeleton.h" #include "skeleton.h"
bool MeshInstance::_set(const StringName &p_name, const Variant &p_value) { 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; return;
} }
RenderingServer *visual_server = RenderingServer::get_singleton(); RenderingServer *rendering_server = RenderingServer::get_singleton();
bool update_mesh = false; 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. // 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); 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_buffer.append_array(buffer_read);
surface_data.source_format = software_mesh->surface_get_format(surface_index); 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> material = mesh->surface_get_material(surface_index); Ref<Material> material = mesh->surface_get_material(surface_index);
software_mesh->surface_set_material(surface_index, material); 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(); 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) { 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)) { 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) { 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) { if (software_skinning) {
@ -350,7 +350,7 @@ void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_s
} }
} else { } else {
if (p_call_attach_skeleton) { if (p_call_attach_skeleton) {
visual_server->instance_attach_skeleton(get_instance(), RID()); rendering_server->instance_attach_skeleton(get_instance(), RID());
} }
if (software_skinning) { if (software_skinning) {
memdelete(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(); int surface_count = mesh->get_surface_count();
for (int surface_index = 0; surface_index < surface_count; ++surface_index) { for (int surface_index = 0; surface_index < surface_count; ++surface_index) {
if (materials[surface_index].is_valid()) { 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_min = Vector3(FLT_MAX, FLT_MAX, FLT_MAX);
Vector3 aabb_max = 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. // 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); ERR_FAIL_COND(num_bones <= 0);
Transform *bone_transforms = (Transform *)alloca(sizeof(Transform) * num_bones); Transform *bone_transforms = (Transform *)alloca(sizeof(Transform) * num_bones);
for (int bone_index = 0; bone_index < num_bones; ++bone_index) { 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. // Apply skinning.
@ -423,7 +423,7 @@ void MeshInstance::_update_skinning() {
uint32_t array_offsets_write[Mesh::ARRAY_MAX]; uint32_t array_offsets_write[Mesh::ARRAY_MAX];
uint32_t array_strides_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]); 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 stride_write = array_strides_write[Mesh::ARRAY_VERTEX];
const uint32_t offset_vertices_write = array_offsets_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_offsets[Mesh::ARRAY_MAX];
uint32_t array_strides[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]); 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 stride = array_strides[Mesh::ARRAY_VERTEX];
const uint32_t offset_vertices = array_offsets[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); 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; software_skinning_flags |= SoftwareSkinning::FLAG_BONES_READY;
} }

4
scene/3d/occluder.cpp
View File

@ -33,8 +33,8 @@
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/resources/occluder_shape.h" #include "scene/resources/occluder_shape.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "servers/visual/portals/portal_occlusion_culler.h" #include "servers/rendering/portals/portal_occlusion_culler.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void Occluder::resource_changed(RES res) { void Occluder::resource_changed(RES res) {
update_gizmos(); update_gizmos();

2
scene/3d/portal.cpp
View File

@ -38,7 +38,7 @@
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
bool Portal::_portal_plane_convention = false; bool Portal::_portal_plane_convention = false;
bool Portal::_settings_gizmo_show_margins = true; bool Portal::_settings_gizmo_show_margins = true;

2
scene/3d/reflection_probe.cpp
View File

@ -31,7 +31,7 @@
#include "reflection_probe.h" #include "reflection_probe.h"
#include "scene/resources/sky.h" #include "scene/resources/sky.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void ReflectionProbe::set_intensity(float p_intensity) { void ReflectionProbe::set_intensity(float p_intensity) {
intensity = p_intensity; intensity = p_intensity;

2
scene/3d/room.cpp
View File

@ -34,7 +34,7 @@
#include "room_group.h" #include "room_group.h"
#include "room_manager.h" #include "room_manager.h"
#include "scene/resources/world.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) { void Room::SimplifyInfo::set_simplify(real_t p_value, real_t p_room_size) {
_plane_simplify = CLAMP(p_value, 0.0, 1.0); _plane_simplify = CLAMP(p_value, 0.0, 1.0);

2
scene/3d/room_group.cpp
View File

@ -35,7 +35,7 @@
#include "room_manager.h" #include "room_manager.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void RoomGroup::_bind_methods() { void RoomGroup::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_roomgroup_priority", "p_priority"), &RoomGroup::set_roomgroup_priority); ClassDB::bind_method(D_METHOD("set_roomgroup_priority", "p_priority"), &RoomGroup::set_roomgroup_priority);

12
scene/3d/soft_body.cpp
View File

@ -446,8 +446,8 @@ void SoftBody::_draw_soft_mesh() {
PhysicsServer::get_singleton()->soft_body_set_mesh(physics_rid, mesh); PhysicsServer::get_singleton()->soft_body_set_mesh(physics_rid, mesh);
} }
if (!visual_server_handler.is_ready(mesh_rid)) { if (!rendering_server_handler.is_ready(mesh_rid)) {
visual_server_handler.prepare(mesh_rid, 0); rendering_server_handler.prepare(mesh_rid, 0);
/// Necessary in order to render the mesh correctly (Soft body nodes are in global space) /// Necessary in order to render the mesh correctly (Soft body nodes are in global space)
simulation_started = true; simulation_started = true;
@ -457,11 +457,11 @@ void SoftBody::_draw_soft_mesh() {
_update_physics_server(); _update_physics_server();
visual_server_handler.open(); rendering_server_handler.open();
PhysicsServer::get_singleton()->soft_body_update_visual_server(physics_rid, &visual_server_handler); PhysicsServer::get_singleton()->soft_body_update_rendering_server(physics_rid, &rendering_server_handler);
visual_server_handler.close(); rendering_server_handler.close();
visual_server_handler.commit_changes(); rendering_server_handler.commit_changes();
} }
void SoftBody::_prepare_physics_server() { void SoftBody::_prepare_physics_server() {

2
scene/3d/soft_body.h
View File

@ -77,7 +77,7 @@ public:
}; };
private: private:
SoftBodyRenderingServerHandler visual_server_handler; SoftBodyRenderingServerHandler rendering_server_handler;
RID physics_rid; RID physics_rid;

2
scene/3d/spatial.cpp
View File

@ -37,7 +37,7 @@
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual_server_callbacks.h" #include "servers/rendering_server_callbacks.h"
/* /*

2
scene/3d/visual_instance.cpp
View File

@ -33,7 +33,7 @@
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/world.h" #include "scene/resources/world.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "skeleton.h" #include "skeleton.h"
AABB VisualInstance::get_transformed_aabb() const { AABB VisualInstance::get_transformed_aabb() const {

2
scene/3d/visual_instance.h
View File

@ -34,7 +34,7 @@
#include "core/object/reference.h" #include "core/object/reference.h"
#include "core/containers/rid.h" #include "core/containers/rid.h"
#include "scene/3d/cull_instance.h" #include "scene/3d/cull_instance.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Material; class Material;

2
scene/debugger/script_debugger_remote.cpp
View File

@ -42,7 +42,7 @@
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void ScriptDebuggerRemote::_send_video_memory() { void ScriptDebuggerRemote::_send_video_memory() {
List<ResourceUsage> usage; List<ResourceUsage> usage;

2
scene/gui/button.cpp
View File

@ -31,7 +31,7 @@
#include "button.h" #include "button.h"
#include "core/string/translation.h" #include "core/string/translation.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Size2 Button::get_minimum_size() const { Size2 Button::get_minimum_size() const {
Size2 minsize = get_theme_font("font")->get_string_size(xl_text); Size2 minsize = get_theme_font("font")->get_string_size(xl_text);

2
scene/gui/check_box.cpp
View File

@ -30,7 +30,7 @@
#include "check_box.h" #include "check_box.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Size2 CheckBox::get_icon_size() const { Size2 CheckBox::get_icon_size() const {
Ref<Texture> checked = Control::get_theme_icon("checked"); Ref<Texture> checked = Control::get_theme_icon("checked");

2
scene/gui/check_button.cpp
View File

@ -31,7 +31,7 @@
#include "check_button.h" #include "check_button.h"
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Size2 CheckButton::get_icon_size() const { Size2 CheckButton::get_icon_size() const {
Ref<Texture> on = Control::get_theme_icon(is_disabled() ? "on_disabled" : "on"); Ref<Texture> on = Control::get_theme_icon(is_disabled() ? "on_disabled" : "on");

2
scene/gui/control.cpp
View File

@ -43,7 +43,7 @@
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/editor_settings.h" #include "editor/editor_settings.h"

2
scene/gui/nine_patch_rect.cpp
View File

@ -31,7 +31,7 @@
#include "nine_patch_rect.h" #include "nine_patch_rect.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void NinePatchRect::_notification(int p_what) { void NinePatchRect::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) { if (p_what == NOTIFICATION_DRAW) {

2
scene/gui/texture_rect.cpp
View File

@ -30,7 +30,7 @@
#include "texture_rect.h" #include "texture_rect.h"
#include "core/core_string_names.h" #include "core/core_string_names.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
void TextureRect::_notification(int p_what) { void TextureRect::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) { if (p_what == NOTIFICATION_DRAW) {

2
scene/main/viewport.h
View File

@ -33,7 +33,7 @@
#include "core/math/transform_2d.h" #include "core/math/transform_2d.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Camera; class Camera;
class Camera2D; class Camera2D;

2
scene/resources/capsule_shape_2d.cpp
View File

@ -31,7 +31,7 @@
#include "capsule_shape_2d.h" #include "capsule_shape_2d.h"
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
Vector<Vector2> CapsuleShape2D::_get_points() const { Vector<Vector2> CapsuleShape2D::_get_points() const {
Vector<Vector2> points; Vector<Vector2> points;

2
scene/resources/circle_shape_2d.cpp
View File

@ -31,7 +31,7 @@
#include "circle_shape_2d.h" #include "circle_shape_2d.h"
#include "servers/physics_2d_server.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 { bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
return p_point.length() < get_radius() + p_tolerance; return p_point.length() < get_radius() + p_tolerance;

2
scene/resources/concave_polygon_shape_2d.cpp
View File

@ -31,7 +31,7 @@
#include "concave_polygon_shape_2d.h" #include "concave_polygon_shape_2d.h"
#include "servers/physics_2d_server.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 { bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
PoolVector<Vector2> s = get_segments(); PoolVector<Vector2> s = get_segments();

2
scene/resources/convex_polygon_shape_2d.cpp
View File

@ -32,7 +32,7 @@
#include "core/math/geometry.h" #include "core/math/geometry.h"
#include "servers/physics_2d_server.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 { bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
return Geometry::is_point_in_polygon(p_point, points); return Geometry::is_point_in_polygon(p_point, points);

2
scene/resources/environment.cpp
View File

@ -33,7 +33,7 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "scene/resources/sky.h" #include "scene/resources/sky.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
#include "texture.h" #include "texture.h"
RID Environment::get_rid() const { RID Environment::get_rid() const {

2
scene/resources/line_shape_2d.cpp
View File

@ -31,7 +31,7 @@
#include "line_shape_2d.h" #include "line_shape_2d.h"
#include "servers/physics_2d_server.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 { bool LineShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
Vector2 point = get_d() * get_normal(); Vector2 point = get_d() * get_normal();

2
scene/resources/material.cpp
View File

@ -34,7 +34,7 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/version.h" #include "core/version.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/visual/shader_language.h" #include "servers/rendering/shader_language.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/editor_settings.h" #include "editor/editor_settings.h"

2
scene/resources/material.h
View File

@ -33,7 +33,7 @@
#include "core/object/resource.h" #include "core/object/resource.h"
#include "core/containers/self_list.h" #include "core/containers/self_list.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Texture; class Texture;

2
scene/resources/mesh.h
View File

@ -36,7 +36,7 @@
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/shape.h" #include "scene/resources/shape.h"
#include "servers/visual_server.h" #include "servers/rendering_server.h"
class Mesh : public Resource { class Mesh : public Resource {
GDCLASS(Mesh, Resource); GDCLASS(Mesh, Resource);

Some files were not shown because too many files have changed in this diff Show More