diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2022-10-01 16:02:46 -0500 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2024-04-13 02:56:50 -0700 |
| commit | 6dd4a687972fbb53e53aba008cc4fbea2c87d6af (patch) | |
| tree | 8a4f313b1e31bf7a1c1fcf2f83f62082c67da24a /main | |
| parent | 2886511c181402f77d28e286efd25124354eb258 (diff) | |
| download | redot-engine-6dd4a687972fbb53e53aba008cc4fbea2c87d6af.tar.gz | |
Reorganize some code to have 2D things grouped together
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 14 | ||||
| -rw-r--r-- | main/performance.cpp | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/main/main.cpp b/main/main.cpp index 357033b6d8..abe15a9984 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -69,16 +69,18 @@ #include "servers/display_server.h" #include "servers/movie_writer/movie_writer.h" #include "servers/movie_writer/movie_writer_mjpeg.h" -#include "servers/navigation_server_2d.h" -#include "servers/navigation_server_2d_dummy.h" #include "servers/navigation_server_3d.h" #include "servers/navigation_server_3d_dummy.h" -#include "servers/physics_server_2d.h" #include "servers/register_server_types.h" #include "servers/rendering/rendering_server_default.h" #include "servers/text/text_server_dummy.h" #include "servers/text_server.h" +// 2D +#include "servers/navigation_server_2d.h" +#include "servers/navigation_server_2d_dummy.h" +#include "servers/physics_server_2d.h" + #ifndef _3D_DISABLED #include "servers/physics_server_3d.h" #include "servers/xr_server.h" @@ -143,15 +145,15 @@ static MessageQueue *message_queue = nullptr; // Initialized in setup2() static AudioServer *audio_server = nullptr; +static CameraServer *camera_server = nullptr; static DisplayServer *display_server = nullptr; static RenderingServer *rendering_server = nullptr; -static CameraServer *camera_server = nullptr; static TextServerManager *tsman = nullptr; +static ThemeDB *theme_db = nullptr; +static NavigationServer2D *navigation_server_2d = nullptr; static PhysicsServer2DManager *physics_server_2d_manager = nullptr; static PhysicsServer2D *physics_server_2d = nullptr; static NavigationServer3D *navigation_server_3d = nullptr; -static NavigationServer2D *navigation_server_2d = nullptr; -static ThemeDB *theme_db = nullptr; #ifndef _3D_DISABLED static PhysicsServer3DManager *physics_server_3d_manager = nullptr; static PhysicsServer3D *physics_server_3d = nullptr; diff --git a/main/performance.cpp b/main/performance.cpp index e8d519bb46..9d4e2ae9d5 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -36,9 +36,11 @@ #include "scene/main/scene_tree.h" #include "servers/audio_server.h" #include "servers/navigation_server_3d.h" -#include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +// 2D +#include "servers/physics_server_2d.h" + #ifndef _3D_DISABLED #include "servers/physics_server_3d.h" #endif // _3D_DISABLED |