server state test

include/server/IServerState.h

@@ -18,16 +18,13 @@ class IServerState {
 	virtual void OnPlayerJoin(PlayerID a_Id) = 0;
 	virtual void OnPlayerLeave(PlayerID a_Id) = 0;
 
-	IServerState(IServerSocket& a_Server);
-	virtual ~IServerState() {}
+	IServerState();
+	virtual ~IServerState();
 
   private:
-	IServerSocket& m_Socket;
 	Server* m_Server;
 
-	void SetServer(Server* a_Server) {
-		m_Server = a_Server;
-	}
+	void SetServer(Server* a_Server);
 
 	friend class Server;
 };

include/server/Server.h

@@ -9,11 +9,11 @@ namespace server {
 
 class Server {
   private:
+	std::shared_ptr<IServerSocket> m_Socket;
 	std::shared_ptr<IServerState> m_State;
-	std::unique_ptr<IServerSocket> m_Socket;
 
   public:
-	Server(std::unique_ptr<IServerSocket>&& a_Socket) : m_Socket(std::move(a_Socket)) {}
+	Server(const std::shared_ptr<IServerSocket>& a_Socket) : m_Socket(a_Socket) {}
 
 	void Update(float a_Delta) {
 		m_State->Update(a_Delta);
@@ -24,6 +24,7 @@ class Server {
 		m_State->SetServer(this);
 	}
 
+	friend class IServerState;
 };
 
 }  // namespace server

include/server/socket/TcpSocket.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <server/IServerSocket.h>
+
+namespace td {
+namespace server {
+
+class TcpSocket : public IServerSocket {
+  private:
+	/* data */
+  public:
+	TcpSocket(/* args */) {}
+	~TcpSocket() {}
+
+	virtual void Send(PlayerID, const protocol::PacketBase&) {}
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/EndGameState.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <server/IServerState.h>
+
+namespace td {
+namespace server {
+
+class EndGameState : public IServerState {
+  private:
+	/* data */
+  public:
+	EndGameState(/* args */) {}
+	~EndGameState() {}
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/GameState.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <server/IServerState.h>
+
+namespace td {
+namespace server {
+
+class GameState : public IServerState{
+  private:
+	/* data */
+  public:
+	GameState(/* args */) {}
+	~GameState() {}
+
+	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
+	virtual void Update(float a_Delta) override;
+	virtual void OnPlayerJoin(PlayerID a_Id) override;
+	virtual void OnPlayerLeave(PlayerID a_Id) override;
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/LobbyState.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <server/IServerState.h>
+
+namespace td {
+namespace server {
+
+class LobbyState : public IServerState {
+  private:
+	/* data */
+  public:
+	LobbyState(/* args */) {}
+	~LobbyState() {}
+
+	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
+	virtual void Update(float a_Delta) override;
+	virtual void OnPlayerJoin(PlayerID a_Id) override;
+	virtual void OnPlayerLeave(PlayerID a_Id) override;
+};
+
+}  // namespace server
+}  // namespace td

include/td/misc/Signal.h

@@ -11,7 +11,8 @@ namespace utils {
 template <typename... Args>
 class Signal : private NonCopyable {
   private:
-	using CallBack = std::function<void(Args...)>;
+	using FnType = void(Args...);
+	using CallBack = std::function<FnType>;
 
 	std::vector<CallBack> m_Callbacks;
 
@@ -20,6 +21,12 @@ class Signal : private NonCopyable {
 		m_Callbacks.push_back(std::move(a_Callback));
 	}
 
+	void Disconnect(const CallBack& a_Callback) {
+		auto it = std::find_if(m_Callbacks.begin(), m_Callbacks.end(),
+			[&a_Callback](CallBack& callback) { return a_Callback.template target<FnType>() == callback.template target<FnType>(); });
+		m_Callbacks.erase(it);
+	}
+
 	void operator()(Args... args) const {
 		for (const CallBack& callback : m_Callbacks) {
 			callback(args...);