Skip to content

Commit a6f3bc7

Browse files
committed
Renaming of servers for coherency.
VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
1 parent 307b1b3 commit a6f3bc7

File tree

390 files changed

+10763
-10764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

390 files changed

+10763
-10764
lines changed

core/debugger/debugger_marshalls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ bool DebuggerMarshalls::VisualProfilerFrame::deserialize(const Array &p_arr) {
317317
CHECK_SIZE(p_arr, size, "VisualProfilerFrame");
318318
int idx = 2;
319319
areas.resize(size / 3);
320-
VS::FrameProfileArea *w = areas.ptrw();
320+
RS::FrameProfileArea *w = areas.ptrw();
321321
for (int i = 0; i < size / 3; i++) {
322322
w[i].name = p_arr[idx];
323323
w[i].cpu_msec = p_arr[idx + 1];

core/debugger/debugger_marshalls.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define DEBUGGER_MARSHARLLS_H
3333

3434
#include "core/script_language.h"
35-
#include "servers/visual_server.h"
35+
#include "servers/rendering_server.h"
3636

3737
struct DebuggerMarshalls {
3838

@@ -165,7 +165,7 @@ struct DebuggerMarshalls {
165165
// Visual Profiler
166166
struct VisualProfilerFrame {
167167
uint64_t frame_number;
168-
Vector<VS::FrameProfileArea> areas;
168+
Vector<RS::FrameProfileArea> areas;
169169

170170
Array serialize();
171171
bool deserialize(const Array &p_arr);

core/debugger/remote_debugger.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -354,18 +354,18 @@ struct RemoteDebugger::VisualProfiler {
354354
Map<StringName, ServerInfo> server_data;
355355

356356
void toggle(bool p_enable, const Array &p_opts) {
357-
VS::get_singleton()->set_frame_profiling_enabled(p_enable);
357+
RS::get_singleton()->set_frame_profiling_enabled(p_enable);
358358
}
359359

360360
void add(const Array &p_data) {}
361361

362362
void tick(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time) {
363-
Vector<VS::FrameProfileArea> profile_areas = VS::get_singleton()->get_frame_profile();
363+
Vector<RS::FrameProfileArea> profile_areas = RS::get_singleton()->get_frame_profile();
364364
DebuggerMarshalls::VisualProfilerFrame frame;
365365
if (!profile_areas.size())
366366
return;
367367

368-
frame.frame_number = VS::get_singleton()->get_frame_profile_frame();
368+
frame.frame_number = RS::get_singleton()->get_frame_profile_frame();
369369
frame.areas.append_array(profile_areas);
370370
EngineDebugger::get_singleton()->send_message("visual:profile_frame", frame.serialize());
371371
}
@@ -404,10 +404,10 @@ void RemoteDebugger::_send_resource_usage() {
404404

405405
DebuggerMarshalls::ResourceUsage usage;
406406

407-
List<VS::TextureInfo> tinfo;
408-
VS::get_singleton()->texture_debug_usage(&tinfo);
407+
List<RS::TextureInfo> tinfo;
408+
RS::get_singleton()->texture_debug_usage(&tinfo);
409409

410-
for (List<VS::TextureInfo>::Element *E = tinfo.front(); E; E = E->next()) {
410+
for (List<RS::TextureInfo>::Element *E = tinfo.front(); E; E = E->next()) {
411411

412412
DebuggerMarshalls::ResourceInfo info;
413413
info.path = E->get().path;
@@ -771,9 +771,9 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
771771

772772
// This is for the camera override to stay live even when the game is paused from the editor
773773
loop_time_sec = (OS::get_singleton()->get_ticks_usec() - loop_begin_usec) / 1000000.0f;
774-
VisualServer::get_singleton()->sync();
775-
if (VisualServer::get_singleton()->has_changed()) {
776-
VisualServer::get_singleton()->draw(true, loop_time_sec * Engine::get_singleton()->get_time_scale());
774+
RenderingServer::get_singleton()->sync();
775+
if (RenderingServer::get_singleton()->has_changed()) {
776+
RenderingServer::get_singleton()->draw(true, loop_time_sec * Engine::get_singleton()->get_time_scale());
777777
}
778778
}
779779

drivers/dummy/rasterizer_dummy.h

Lines changed: 61 additions & 61 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)