godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Move server files into their subfolders

Browse Source
This commit is contained in:
Aaron Franke
2024-03-11 20:27:45 -07:00
parent d705613db3
commit 3d1c9fd5de
393 changed files with 600 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/main.cpp
View File

@@ -67,39 +67,39 @@
#include "scene/resources/packed_scene.h"
#include "scene/theme/theme_db.h"
#include "servers/audio/audio_driver_dummy.h"
#include "servers/audio_server.h"
#include "servers/camera_server.h"
#include "servers/display_server.h"
#include "servers/audio/audio_server.h"
#include "servers/camera/camera_server.h"
#include "servers/display/display_server.h"
#include "servers/movie_writer/movie_writer.h"
#include "servers/register_server_types.h"
#include "servers/rendering/rendering_server_default.h"
#include "servers/text/text_server.h"
#include "servers/text/text_server_dummy.h"
#include "servers/text_server.h"
// 2D
#ifndef NAVIGATION_2D_DISABLED
#include "servers/navigation_server_2d.h"
#include "servers/navigation_server_2d_dummy.h"
#include "servers/navigation_2d/navigation_server_2d.h"
#include "servers/navigation_2d/navigation_server_2d_dummy.h"
#endif // NAVIGATION_2D_DISABLED
#ifndef PHYSICS_2D_DISABLED
#include "servers/physics_server_2d.h"
#include "servers/physics_server_2d_dummy.h"
#include "servers/physics_2d/physics_server_2d.h"
#include "servers/physics_2d/physics_server_2d_dummy.h"
#endif // PHYSICS_2D_DISABLED
// 3D
#ifndef NAVIGATION_3D_DISABLED
#include "servers/navigation_server_3d.h"
#include "servers/navigation_server_3d_dummy.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d_dummy.h"
#endif // NAVIGATION_3D_DISABLED
#ifndef PHYSICS_3D_DISABLED
#include "servers/physics_server_3d.h"
#include "servers/physics_server_3d_dummy.h"
#include "servers/physics_3d/physics_server_3d.h"
#include "servers/physics_3d/physics_server_3d_dummy.h"
#endif // PHYSICS_3D_DISABLED
#ifndef XR_DISABLED
#include "servers/xr_server.h"
#include "servers/xr/xr_server.h"
#endif // XR_DISABLED
#ifdef TESTS_ENABLED

2
main/main_timer_sync.cpp
View File

@@ -31,7 +31,7 @@
#include "main_timer_sync.h"
#include "core/os/os.h"
#include "servers/display_server.h"
#include "servers/display/display_server.h"
void MainFrameTime::clamp_process_step(double min_process_step, double max_process_step) {
if (process_step < min_process_step) {

17
main/performance.cpp
View File

@@ -34,21 +34,23 @@
#include "core/variant/typed_array.h"
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
#include "servers/audio_server.h"
#include "servers/audio/audio_server.h"
#include "servers/rendering/rendering_server.h"
#ifndef NAVIGATION_2D_DISABLED
#include "servers/navigation_server_2d.h"
#include "servers/navigation_2d/navigation_server_2d.h"
#endif // NAVIGATION_2D_DISABLED
#ifndef NAVIGATION_3D_DISABLED
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#endif // NAVIGATION_3D_DISABLED
#include "servers/rendering_server.h"
#ifndef PHYSICS_2D_DISABLED
#include "servers/physics_server_2d.h"
#include "servers/physics_2d/physics_server_2d.h"
#endif // PHYSICS_2D_DISABLED
#ifndef PHYSICS_3D_DISABLED
#include "servers/physics_server_3d.h"
#include "servers/physics_3d/physics_server_3d.h"
#endif // PHYSICS_3D_DISABLED
Performance *Performance::singleton = nullptr;
@@ -307,6 +309,7 @@ double Performance::get_monitor(Monitor p_monitor) const {
case AUDIO_OUTPUT_LATENCY:
return AudioServer::get_singleton()->get_output_latency();
// Deprecated, use the 2D/3D specific ones instead.
case NAVIGATION_ACTIVE_MAPS:
#ifndef NAVIGATION_2D_DISABLED
info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS);
@@ -503,6 +506,7 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
#ifndef _3D_DISABLED
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
@@ -513,6 +517,7 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
MONITOR_TYPE_QUANTITY,
#endif // _3D_DISABLED
};
static_assert((sizeof(types) / sizeof(MonitorType)) == MONITOR_MAX);

3
main/performance.h
View File

@@ -91,6 +91,7 @@ public:
PHYSICS_3D_COLLISION_PAIRS,
PHYSICS_3D_ISLAND_COUNT,
AUDIO_OUTPUT_LATENCY,
// Deprecated, use the 2D/3D specific ones instead.
NAVIGATION_ACTIVE_MAPS,
NAVIGATION_REGION_COUNT,
NAVIGATION_AGENT_COUNT,
@@ -116,6 +117,7 @@ public:
NAVIGATION_2D_EDGE_CONNECTION_COUNT,
NAVIGATION_2D_EDGE_FREE_COUNT,
NAVIGATION_2D_OBSTACLE_COUNT,
#ifndef _3D_DISABLED
NAVIGATION_3D_ACTIVE_MAPS,
NAVIGATION_3D_REGION_COUNT,
NAVIGATION_3D_AGENT_COUNT,
@@ -126,6 +128,7 @@ public:
NAVIGATION_3D_EDGE_CONNECTION_COUNT,
NAVIGATION_3D_EDGE_FREE_COUNT,
NAVIGATION_3D_OBSTACLE_COUNT,
#endif // _3D_DISABLED
MONITOR_MAX
};