Moved Config and Scheduler to the base game class

Hasan-Jawaheri · Jan 19, 2020 · 17e8708 · 17e8708
1 parent 0b23557
commit 17e8708
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/include/WasabiGame/Main.hpp b/include/WasabiGame/Main.hpp
@@ -6,6 +6,7 @@
 #include "WasabiGame/Maps/MapLoader.hpp"
 #include "WasabiGame/Units/UnitsManager.hpp"
 #include "WasabiGame/Utilities/Scheduler.hpp"
+#include "WasabiGame/Utilities/Config.hpp"
 
 
 namespace WasabiGame {
@@ -35,6 +36,8 @@ namespace WasabiGame {
 		virtual WError SetupRenderer();
 		virtual WPhysicsComponent* CreatePhysicsComponent();
 
+		std::shared_ptr<GameScheduler> Scheduler;
+		std::shared_ptr<GameConfig> Config;
 		std::shared_ptr<ResourceManager> Resources;
 		std::shared_ptr<UserInterface> UI;
 		std::shared_ptr<MapLoader> Maps;

diff --git a/include/WasabiGame/Networking/NetworkListener.hpp b/include/WasabiGame/Networking/NetworkListener.hpp
@@ -148,7 +148,7 @@ namespace WasabiGame {
 		} m_UDPServer;
 
 	public:
-		NetworkListener(CreateNetworkClientFunction createClient) : Config(), Scheduler() {
+		NetworkListener(CreateNetworkClientFunction createClient, std::shared_ptr<GameConfig> config, std::shared_ptr<GameScheduler> scheduler) : Config(config), Scheduler(scheduler) {
 			m_isRunning = true;
 			m_createClient = createClient;
 			m_clientConnected = nullptr;
@@ -160,8 +160,8 @@ namespace WasabiGame {
 		virtual ~NetworkListener() {
 		}
 
-		WasabiGame::Scheduler Scheduler;
-		WasabiGame::Config Config;
+		std::shared_ptr<GameConfig> Config;
+		std::shared_ptr<GameScheduler> Scheduler;
 
 		void RegisterSelectable(Selectable* client, bool deleteOnDisconnect = true) {
 			ClientMetadata meta;
@@ -179,20 +179,20 @@ namespace WasabiGame {
 				return;
 			}
 
-			m_TCPServer.port = Config.Get<int>("tcpPort");
-			m_UDPServer.port = Config.Get<int>("udpPort");
+			m_TCPServer.port = Config->Get<int>("tcpPort");
+			m_UDPServer.port = Config->Get<int>("udpPort");
 
-			strcpy_s(m_TCPServer.host, sizeof(m_TCPServer.host), Config.Get<char*>("hostname"));
-			strcpy_s(m_UDPServer.host, sizeof(m_UDPServer.host), Config.Get<char*>("hostname"));
+			strcpy_s(m_TCPServer.host, sizeof(m_TCPServer.host), Config->Get<char*>("hostname"));
+			strcpy_s(m_UDPServer.host, sizeof(m_UDPServer.host), Config->Get<char*>("hostname"));
 
 			if (m_TCPServer.port <= 0 || m_TCPServer.Initialize() == 0) {
 				if (m_UDPServer.port <= 0 || m_UDPServer.Initialize() == 0) {
-					Scheduler.LaunchWorkers(Config.Get<int>("numWorkers"));
-					Scheduler.LaunchThread("selectables-loop", [this]() {
+					Scheduler->LaunchWorkers(Config->Get<int>("numWorkers"));
+					Scheduler->LaunchThread("selectables-loop", [this]() {
 						this->SelectablesLoop();
-						this->Scheduler.Stop();
+						this->Scheduler->Stop();
 					});
-					Scheduler.Run();
+					Scheduler->Run();
 
 					for (auto client : m_clients) {
 						if (client.second.deleteOnDisconnect) {
@@ -239,7 +239,7 @@ namespace WasabiGame {
 
 		void SelectablesLoop() {
 			std::vector<std::pair<Selectable*, ClientMetadata>> clientsToDelete;
-			while (m_isRunning && Scheduler.IsRunning()) {
+			while (m_isRunning && Scheduler->IsRunning()) {
 				fd_set readFDs, writeFDs;
 				int maxFDs = 0;
 

diff --git a/include/WasabiGame/Utilities/Config.hpp b/include/WasabiGame/Utilities/Config.hpp
@@ -6,11 +6,11 @@
 
 namespace WasabiGame {
 
-	class Config {
+	class GameConfig {
 		std::unordered_map<std::string, void*> m_configTable;
 
 	public:
-		Config() {
+		GameConfig() {
 			m_configTable = {
 				{"numWorkers", (void*)8},
 				{"tcpPort", (void*)9965},

diff --git a/include/WasabiGame/Utilities/Scheduler.hpp b/include/WasabiGame/Utilities/Scheduler.hpp
@@ -15,10 +15,10 @@
 namespace WasabiGame {
 
 	class SchedulerThread {
-		friend class Scheduler;
+		friend class GameScheduler;
 
 	protected:
-		class WasabiGame::Scheduler* m_scheduler;
+		class WasabiGame::GameScheduler* m_scheduler;
 		bool m_isRunning;
 
 	public:
@@ -38,7 +38,7 @@ namespace WasabiGame {
 		virtual void Run() = 0;
 	};
 
-	class Scheduler {
+	class GameScheduler {
 		bool m_isRunning;
 		std::mutex m_threadsLock;
 		std::unordered_map<std::string, std::pair<std::thread*, SchedulerThread*>> m_threads;
@@ -60,7 +60,7 @@ namespace WasabiGame {
 
 			virtual void Run() {
 				while (m_isRunning) {
-					WasabiGame::Scheduler::WorkUnit w = m_scheduler->GetWork();
+					WasabiGame::GameScheduler::WorkUnit w = m_scheduler->GetWork();
 					if (w.perform) {
 						void* result = w.perform();
 						if (w.callback)
@@ -89,7 +89,7 @@ namespace WasabiGame {
 		}
 
 	public:
-		Scheduler() {
+		GameScheduler() {
 			m_isRunning = true;
 		}
 

diff --git a/src/WasabiGame/Main.cpp b/src/WasabiGame/Main.cpp
@@ -23,6 +23,8 @@ WasabiGame::WasabiBaseGame::WasabiBaseGame() : Wasabi(), std::enable_shared_from
 	m_settings.fullscreen = true;
 #endif
 
+	Config = std::make_shared<GameConfig>();
+	Scheduler = std::make_shared<GameScheduler>();
 	Resources = std::make_shared<ResourceManager>(shared_from_this());
 	UI = std::make_shared<UserInterface>(shared_from_this());
 	Maps = std::make_shared<MapLoader>(shared_from_this(), Resources);