add StateMachine

src/server/IServerState.cpp

@@ -1,33 +0,0 @@
-#include <server/IServerState.h>
-#include <server/Server.h>
-
-namespace td {
-namespace server {
-
-void IServerState::SetServer(Server* a_Server) {
-	assert(a_Server);
-	m_Server = a_Server;
-	Connect(m_Server->m_Socket->OnConnect, std::bind(&IServerState::OnPlayerJoin, this, std::placeholders::_1));
-	Connect(m_Server->m_Socket->OnDisconnect, std::bind(&IServerState::OnPlayerLeave, this, std::placeholders::_1));
-	Connect(m_Server->m_Socket->OnReceive, std::bind(&IServerState::HandlePacket, this, std::placeholders::_1, std::placeholders::_2));
-	Init();
-}
-
-IServerState::IServerState() : m_Server(nullptr) {}
-
-IServerState::~IServerState() {}
-
-void IServerState::SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
-	m_Server->m_Socket->Send(a_Id, a_Packet);
-}
-
-void IServerState::BroadcastPacket(const protocol::PacketBase& a_Packet) {
-	m_Server->m_Socket->Broadcast(a_Packet);
-}
-
-void IServerState::SetNewState(const std::shared_ptr<IServerState>& a_NewState) {
-	m_Server->UpdateState(a_NewState);
-}
-
-}  // namespace server
-}  // namespace td

src/server/Server.cpp

@@ -3,22 +3,7 @@
 namespace td {
 namespace server {
 
-void Server::Update() {
-	auto timeElapsed = std::chrono::system_clock::now() - m_LastTime;
-	float timeSeconds = std::chrono::duration<float, std::chrono::seconds::period>(timeElapsed).count();
-	Update(timeSeconds);
-	m_LastTime = std::chrono::system_clock::now();
-}
 
-void Server::UpdateState(const std::shared_ptr<IServerState>& a_State) {
-	m_State = a_State;
-	m_State->SetServer(this);
-}
-
-void Server::Update(float a_Delta) {
-	assert(m_State);
-	m_State->Update(a_Delta);
-}
 
 }  // namespace server
 }  // namespace td

src/server/ServerState.cpp

@@ -0,0 +1,24 @@
+#include <server/ServerState.h>
+#include <server/Server.h>
+
+#include <td/common/StateMachine.h>
+
+namespace td {
+namespace server {
+
+ServerState::ServerState(Server& a_Server) : Server::State(a_Server) {
+	Connect(m_StateMachine.m_Socket->OnReceive, std::bind(&ServerState::HandlePacket, this, std::placeholders::_1, std::placeholders::_2));
+}
+
+ServerState::~ServerState() {}
+
+void ServerState::SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+	m_StateMachine.m_Socket->Send(a_Id, a_Packet);
+}
+
+void ServerState::BroadcastPacket(const protocol::PacketBase& a_Packet) {
+	m_StateMachine.m_Socket->Broadcast(a_Packet);
+}
+
+}  // namespace server
+}  // namespace 

src/server/state/GameState.cpp

@@ -6,9 +6,7 @@
 namespace td {
 namespace server {
 
-GameState::GameState(const std::shared_ptr<game::World>& a_World) : m_World(a_World), m_Simulation(*m_World, STEP_TIME), m_Time(0) {}
-
-void GameState::Init() {
+GameState::GameState(Server& a_Server, const std::shared_ptr<game::World>& a_World) : ServerState(a_Server), m_World(a_World), m_Simulation(*m_World, STEP_TIME), m_Time(0) {
 	std::cout << "Switched to Game state !\n";
 	BroadcastPacket(m_Simulation.MakePacket());
 }
@@ -28,9 +26,5 @@ void GameState::Update(float a_Delta) {
 	}
 }
 
-void GameState::OnPlayerJoin(PlayerID a_Id) {}
-
-void GameState::OnPlayerLeave(PlayerID a_Id) {}
-
 }  // namespace server
 }  // namespace td

src/server/state/LobbyState.cpp

@@ -11,15 +11,7 @@ void LobbyState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packe
 }
 
 void LobbyState::Update(float a_Delta) {
-	SetNewState(std::make_shared<GameState>(m_World));
-}
-
-void LobbyState::OnPlayerJoin(PlayerID a_Id) {
-
-}
-
-void LobbyState::OnPlayerLeave(PlayerID a_Id) {
-
+	m_StateMachine.ChangeState<GameState>(m_World);
 }
 
 }  // namespace server