From a6f3bc7c696af03e3875f78e098d2476e409d15e Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 27 Mar 2020 15:21:27 -0300 Subject: Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files. --- platform/android/os_android.cpp | 12 ++++++------ platform/android/os_android.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'platform/android') diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index e3792b1f31..537230826c 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -39,8 +39,8 @@ #include "drivers/unix/file_access_unix.h" #include "file_access_android.h" #include "main/main.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_jandroid.h" @@ -146,12 +146,12 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int video_driver_index = p_video_driver; - visual_server = memnew(VisualServerRaster); + rendering_server = memnew(RenderingServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { - visual_server = memnew(VisualServerWrapMT(visual_server, false)); + rendering_server = memnew(RenderingServerWrapMT(rendering_server, false)); } - visual_server->init(); + rendering_server->init(); AudioDriverManager::initialize(p_audio_driver); @@ -759,7 +759,7 @@ OS_Android::OS_Android(GodotJavaWrapper *p_godot_java, GodotIOJavaWrapper *p_god //rasterizer = NULL; use_gl2 = false; - visual_server = NULL; + rendering_server = NULL; godot_java = p_godot_java; godot_io_java = p_godot_io_java; diff --git a/platform/android/os_android.h b/platform/android/os_android.h index d09f4e10d6..8a91412ef6 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -37,7 +37,7 @@ #include "core/os/main_loop.h" #include "drivers/unix/os_unix.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/rendering/rasterizer.h" class GodotJavaWrapper; class GodotIOJavaWrapper; @@ -75,7 +75,7 @@ private: bool use_16bits_fbo; - VisualServer *visual_server; + RenderingServer *rendering_server; mutable String data_dir_cache; -- cgit v1.2.3