improve packet interface

include/blitz/network/EnetClient.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <Nazara/Network/ENetHost.hpp>
+#include <blitz/common/NonCopyable.h>
+#include <blitz/network/EnetConnexion.h>
+#include <thread>
+
+namespace blitz {
+namespace network {
+
+class EnetClient : private NonCopyable {
+  public:
+	EnetClient(const Nz::IpAddress& address);
+	~EnetClient();
+
+	void Disconnect();
+
+	NazaraSignal(OnConnect);
+	NazaraSignal(OnDisconnect);
+	NazaraSignal(OnDisconnectTimeout);
+
+	const EnetConnexion& GetConnexion() const {
+		return m_Connexion;
+	}
+
+  private:
+	EnetConnexion m_Connexion;
+	Nz::ENetHost m_Host;
+	Nz::ENetPeer* m_Peer;
+	std::thread m_Thread;
+	bool m_Running;
+
+	void Update();
+	void WorkerThread();
+};
+
+}  // namespace network
+}  // namespace blitz

include/blitz/network/EnetConnexion.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <Nazara/Network/ENetPeer.hpp>
+#include <blitz/protocol/PacketSerializer.h>
+#include <blitz/protocol/Packets.h>
+
+namespace blitz {
+namespace network {
+
+class EnetClient;
+class EnetServer;
+
+
+
+#define DeclarePacket(Name, NFlag)                                                                                                    \
+	void Send##Name(const blitz::protocol::data::Name& a_##Name) const {                                                                                      \
+		m_Peer->Send(0, NFlag, protocol::PacketSerializer::Serialize(protocol::packets::Name(a_##Name)));                             \
+	}                                                                                                                                 \
+	NazaraSignal(On##Name, const blitz::protocol::data::Name&)
+
+
+
+
+
+class EnetConnexion {
+  public:
+	EnetConnexion(Nz::ENetPeer* a_Peer = nullptr);
+
+	bool IsConnected() const {
+        if (!m_Peer)
+            return false;
+		return m_Peer->IsConnected();
+	}
+
+    DeclareAllPacket()
+
+  private:
+	Nz::ENetPeer* m_Peer;
+
+	void Recieve(Nz::ByteArray&);
+    void SetPeer(Nz::ENetPeer* a_Peer);
+
+    friend class EnetClient;
+    friend class EnetServer;
+};
+
+#undef DeclarePacket
+
+}  // namespace network
+}  // namespace blitz

include/blitz/network/EnetServer.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <Nazara/Core/ThreadExt.hpp>
+#include <Nazara/Network/ENetHost.hpp>
+#include <blitz/common/NonCopyable.h>
+#include <blitz/network/EnetConnexion.h>
+#include <blitz/protocol/Packets.h>
+#include <cstdint>
+#include <map>
+#include <thread>
+
+namespace blitz {
+namespace network {
+
+class EnetServer : private NonCopyable {
+  public:
+	EnetServer(std::uint16_t port);
+	~EnetServer();
+
+	void Destroy();
+
+	void BroadcastPacket(const protocol::Packet& a_Packet, Nz::ENetPacketFlags a_Flags);
+
+	EnetConnexion* GetConnexion(std::uint16_t a_PeerId);
+
+	NazaraSignal(OnClientConnect, EnetConnexion& /*a_Peer*/);
+	NazaraSignal(OnClientDisconnect, EnetConnexion& /*a_Peer*/);
+	NazaraSignal(OnClientDisconnectTimeout, EnetConnexion& /*a_Peer*/);
+
+  private:
+	void Update();
+	void WorkerThread();
+
+	void RemoveConnexion(std::uint16_t a_PeerId);
+
+	Nz::ENetHost m_Host;
+	bool m_Running;
+	std::thread m_Thread;
+	std::map<std::uint16_t, EnetConnexion> m_Connexion;
+};
+
+}  // namespace network
+}  // namespace blitz