Persson-dev/Tower-Defense2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send world to client

Browse Source
This commit is contained in:
Simon Pribylski
2025-08-22 11:41:58 +02:00
parent 20acbc0499
commit 7d58b881b2
22 changed files with 217 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/server/IServerSocket.h
View File

@@ -12,8 +12,8 @@ class IServerSocket {
using PlayerPacketHandlerType = std::unique_ptr<protocol::PacketHandler>(PlayerID);
using PlayerPacketHandler = std::function<PlayerPacketHandlerType>;
utils::Signal<PlayerID, const PlayerInfo&> OnPlayerJoin;
utils::Signal<PlayerID> OnPlayerLeave;
utils::Signal<PlayerID> OnPlayerConnect;
utils::Signal<PlayerID> OnPlayerDisconnect;
utils::Signal<PlayerID, const protocol::PacketBase&> OnReceive;
void Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet);

13
include/server/PlayerManager.h
View File

@@ -1,5 +1,6 @@
#pragma once
#include <td/misc/Signal.h>
#include <td/protocol/packet/Packets.h>
namespace td {
@@ -13,6 +14,9 @@ class PlayerManager {
std::shared_ptr<IServerSocket> m_Socket;
public:
utils::Signal<PlayerID, const PlayerInfo&> OnPlayerJoin;
utils::Signal<PlayerID> OnPlayerLeave;
PlayerManager(const std::shared_ptr<IServerSocket>& a_Socket);
~PlayerManager();
@@ -20,20 +24,19 @@ class PlayerManager {
PlayerInfo GetPlayer(PlayerID a_Player);
private:
void Disconnect(PlayerID a_Player);
class ConnectionHandler : public protocol::PacketHandler {
private:
std::map<PlayerID, PlayerInfo>& m_Players;
IServerSocket& m_Socket;
PlayerManager& m_PlayerManager;
PlayerID m_Player;
public:
ConnectionHandler(std::map<PlayerID, PlayerInfo>& a_Players, IServerSocket& a_Socket, PlayerID a_Player);
ConnectionHandler(PlayerManager& a_PlayerManager, PlayerID a_Player);
~ConnectionHandler() = default;
virtual void Handle(const protocol::packets::PlayerLoginPacket& a_Packet) override;
virtual void Handle(const protocol::packets::DisconnectPacket& a_Packet) override;
static void Disconnect(std::map<PlayerID, PlayerInfo>&, IServerSocket& m_Socket, PlayerID m_Player);
};
};

4
include/server/Server.h
View File

@@ -20,6 +20,10 @@ class Server : public StateMachine<Server, void, float> {
virtual void Update(float a_Delta);
const PlayerManager& GetPlayers() const {
return m_Players;
}
friend class ServerState;
};

4
include/server/state/LobbyState.h
View File

@@ -10,9 +10,11 @@ class LobbyState : public ServerState {
private:
std::shared_ptr<game::World> m_World;
public:
LobbyState(Server& a_Server, const std::shared_ptr<game::World>& a_World);
LobbyState(Server& a_Server);
~LobbyState() {}
virtual void OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) override;
virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
virtual void Update(float a_Delta) override;
};