From 5c1793c1e74cb55763c58b18b104637fed0d4b54 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Mon, 19 Aug 2024 14:37:36 +0200 Subject: [PATCH] move files into client folder --- {src => include/client}/FirstPersonPlayer.h | 2 +- {src => include/client}/Lobby.h | 2 +- {src => include/client}/Main.h | 0 {src => include/client}/MainMenu.h | 0 {src => include/client}/NetworkInterface.h | 0 {src => include/client}/Player.h | 0 {src => include/client}/Server.h | 0 {src => include/client}/World.h | 0 src/{ => client}/FirstPersonPlayer.cpp | 2 +- src/{ => client}/Lobby.cpp | 2 +- src/{ => client}/Main.cpp | 6 ++--- src/{ => client}/MainMenu.cpp | 2 +- src/{ => client}/NetworkInterface.cpp | 2 +- src/{ => client}/Player.cpp | 2 +- src/{ => client}/Server.cpp | 6 ++--- src/{ => client}/World.cpp | 8 +++---- src/{ => client}/register_types.cpp | 26 ++++++++++----------- src/register_types.h | 11 --------- 18 files changed, 29 insertions(+), 42 deletions(-) rename {src => include/client}/FirstPersonPlayer.h (96%) rename {src => include/client}/Lobby.h (94%) rename {src => include/client}/Main.h (100%) rename {src => include/client}/MainMenu.h (100%) rename {src => include/client}/NetworkInterface.h (100%) rename {src => include/client}/Player.h (100%) rename {src => include/client}/Server.h (100%) rename {src => include/client}/World.h (100%) rename src/{ => client}/FirstPersonPlayer.cpp (99%) rename src/{ => client}/Lobby.cpp (99%) rename src/{ => client}/Main.cpp (90%) rename src/{ => client}/MainMenu.cpp (98%) rename src/{ => client}/NetworkInterface.cpp (97%) rename src/{ => client}/Player.cpp (98%) rename src/{ => client}/Server.cpp (92%) rename src/{ => client}/World.cpp (97%) rename src/{ => client}/register_types.cpp (66%) delete mode 100644 src/register_types.h diff --git a/src/FirstPersonPlayer.h b/include/client/FirstPersonPlayer.h similarity index 96% rename from src/FirstPersonPlayer.h rename to include/client/FirstPersonPlayer.h index c1edd84..f5d2f89 100644 --- a/src/FirstPersonPlayer.h +++ b/include/client/FirstPersonPlayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Player.h" +#include #include namespace blitz { diff --git a/src/Lobby.h b/include/client/Lobby.h similarity index 94% rename from src/Lobby.h rename to include/client/Lobby.h index 58d6a72..f612a6b 100644 --- a/src/Lobby.h +++ b/include/client/Lobby.h @@ -1,7 +1,7 @@ #pragma once #include -#include "NetworkInterface.h" +#include namespace blitz { diff --git a/src/Main.h b/include/client/Main.h similarity index 100% rename from src/Main.h rename to include/client/Main.h diff --git a/src/MainMenu.h b/include/client/MainMenu.h similarity index 100% rename from src/MainMenu.h rename to include/client/MainMenu.h diff --git a/src/NetworkInterface.h b/include/client/NetworkInterface.h similarity index 100% rename from src/NetworkInterface.h rename to include/client/NetworkInterface.h diff --git a/src/Player.h b/include/client/Player.h similarity index 100% rename from src/Player.h rename to include/client/Player.h diff --git a/src/Server.h b/include/client/Server.h similarity index 100% rename from src/Server.h rename to include/client/Server.h diff --git a/src/World.h b/include/client/World.h similarity index 100% rename from src/World.h rename to include/client/World.h diff --git a/src/FirstPersonPlayer.cpp b/src/client/FirstPersonPlayer.cpp similarity index 99% rename from src/FirstPersonPlayer.cpp rename to src/client/FirstPersonPlayer.cpp index f7fe3b6..2d65420 100644 --- a/src/FirstPersonPlayer.cpp +++ b/src/client/FirstPersonPlayer.cpp @@ -1,4 +1,4 @@ -#include "FirstPersonPlayer.h" +#include #include #include diff --git a/src/Lobby.cpp b/src/client/Lobby.cpp similarity index 99% rename from src/Lobby.cpp rename to src/client/Lobby.cpp index db517dd..07f2ccb 100644 --- a/src/Lobby.cpp +++ b/src/client/Lobby.cpp @@ -1,4 +1,4 @@ -#include "Lobby.h" +#include #include #include diff --git a/src/Main.cpp b/src/client/Main.cpp similarity index 90% rename from src/Main.cpp rename to src/client/Main.cpp index 2d1f63b..057fc23 100644 --- a/src/Main.cpp +++ b/src/client/Main.cpp @@ -1,4 +1,4 @@ -#include "Main.h" +#include #include #include @@ -7,8 +7,8 @@ #include #include -#include "Lobby.h" -#include "World.h" +#include +#include using namespace godot; diff --git a/src/MainMenu.cpp b/src/client/MainMenu.cpp similarity index 98% rename from src/MainMenu.cpp rename to src/client/MainMenu.cpp index 0f4d289..f2de218 100644 --- a/src/MainMenu.cpp +++ b/src/client/MainMenu.cpp @@ -1,4 +1,4 @@ -#include "MainMenu.h" +#include #include #include diff --git a/src/NetworkInterface.cpp b/src/client/NetworkInterface.cpp similarity index 97% rename from src/NetworkInterface.cpp rename to src/client/NetworkInterface.cpp index f01efa2..357f17c 100644 --- a/src/NetworkInterface.cpp +++ b/src/client/NetworkInterface.cpp @@ -1,4 +1,4 @@ -#include "NetworkInterface.h" +#include #include #include diff --git a/src/Player.cpp b/src/client/Player.cpp similarity index 98% rename from src/Player.cpp rename to src/client/Player.cpp index 4bb3bb1..b3711d7 100644 --- a/src/Player.cpp +++ b/src/client/Player.cpp @@ -1,4 +1,4 @@ -#include "Player.h" +#include #include #include diff --git a/src/Server.cpp b/src/client/Server.cpp similarity index 92% rename from src/Server.cpp rename to src/client/Server.cpp index b6ee784..cdb395a 100644 --- a/src/Server.cpp +++ b/src/client/Server.cpp @@ -1,7 +1,7 @@ -#include "Server.h" +#include -#include "Lobby.h" -#include "NetworkInterface.h" +#include +#include #include using namespace godot; diff --git a/src/World.cpp b/src/client/World.cpp similarity index 97% rename from src/World.cpp rename to src/client/World.cpp index f9f4bc7..a8d0532 100644 --- a/src/World.cpp +++ b/src/client/World.cpp @@ -1,8 +1,8 @@ -#include "World.h" +#include -#include "FirstPersonPlayer.h" -#include "NetworkInterface.h" -#include "Player.h" +#include +#include +#include #include #include #include diff --git a/src/register_types.cpp b/src/client/register_types.cpp similarity index 66% rename from src/register_types.cpp rename to src/client/register_types.cpp index 343ac20..334ef00 100644 --- a/src/register_types.cpp +++ b/src/client/register_types.cpp @@ -1,13 +1,11 @@ -#include "register_types.h" - -#include "FirstPersonPlayer.h" -#include "Lobby.h" -#include "Main.h" -#include "MainMenu.h" -#include "NetworkInterface.h" -#include "Player.h" -#include "Server.h" -#include "World.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -26,7 +24,7 @@ static void RegisterClasses() { GDREGISTER_CLASS(blitz::Server); } -void initialize_example_module(ModuleInitializationLevel p_level) { +static void initialize_blitz_module(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { return; } @@ -34,7 +32,7 @@ void initialize_example_module(ModuleInitializationLevel p_level) { RegisterClasses(); } -void uninitialize_example_module(ModuleInitializationLevel p_level) { +static void uninitialize_blitz_module(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { return; } @@ -44,8 +42,8 @@ extern "C" GDExtensionBool GDE_EXPORT library_init(GDExtensionInterfaceGetProcAd const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { godot::GDExtensionBinding::InitObject init_obj(p_get_proc, p_library, r_initialization); - init_obj.register_initializer(initialize_example_module); - init_obj.register_terminator(uninitialize_example_module); + init_obj.register_initializer(initialize_blitz_module); + init_obj.register_terminator(uninitialize_blitz_module); init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE); return init_obj.init(); diff --git a/src/register_types.h b/src/register_types.h deleted file mode 100644 index 938f7a1..0000000 --- a/src/register_types.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GDEXAMPLE_REGISTER_TYPES_H -#define GDEXAMPLE_REGISTER_TYPES_H - -#include - -using namespace godot; - -void initialize_example_module(ModuleInitializationLevel p_level); -void uninitialize_example_module(ModuleInitializationLevel p_level); - -#endif \ No newline at end of file