Blitz/Blitz2
3
0
Fork 0
Code Issues Pull Requests Activity

more use of DeclareAllPacket

Browse Source
This commit is contained in:
Simon Pribylski
2024-07-19 20:22:12 +02:00
parent 7abb31c2e1
commit f9f5f60049
6 changed files with 108 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/blitz/network/EnetConnexion.h
View File

@@ -1,9 +1,15 @@
#pragma once
#include <Nazara/Network/ENetPeer.hpp>
#include <NazaraUtils/Signal.hpp>
#include <blitz/protocol/PacketSerializer.h>
#include <blitz/protocol/Packets.h>
namespace Nz {
class ENetPeer;
} // namespace Nz
namespace blitz {
namespace network {
@@ -12,11 +18,10 @@ 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&)
#define DeclarePacket(PacketName, ...) \
void Send##PacketName(const blitz::protocol::data::PacketName& a_##PacketName) const; \
\
NazaraSignal(On##PacketName, const blitz::protocol::data::PacketName&);
@@ -26,22 +31,18 @@ class EnetConnexion {
public:
EnetConnexion(Nz::ENetPeer* a_Peer = nullptr);
bool IsConnected() const {
if (!m_Peer)
return false;
return m_Peer->IsConnected();
}
bool IsConnected() const;
DeclareAllPacket()
DeclareAllPacket()
private:
Nz::ENetPeer* m_Peer;
private :
Nz::ENetPeer* m_Peer;
void Recieve(Nz::ByteArray&);
void SetPeer(Nz::ENetPeer* a_Peer);
void SetPeer(Nz::ENetPeer* a_Peer);
friend class EnetClient;
friend class EnetServer;
friend class EnetClient;
friend class EnetServer;
};
#undef DeclarePacket

53
include/blitz/protocol/PacketDeclare.h
View File

@@ -1,19 +1,40 @@
#pragma once
namespace blitz {
namespace protocol {
enum class PacketSender {
/** Sent by clients and server */
Both,
/** Sent by clients to the server */
Client,
/** Sent by server to the clients */
Server,
};
/**
* \def DeclareAllPacket
* \brief Avoids repetitive operations on packets
*/
#define DeclareAllPacket() \
DeclarePacket(PlayerLogin, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(UpdateHealth, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(LoggingSuccess, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerDeath, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerJoin, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerLeave, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerStats, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerList, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(ServerConfig, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(ServerTps, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(UpdateGameState, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(KeepAlive, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(Disconnect, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(ChatMessage, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerPositionAndRotation, Nz::ENetPacketFlag::Reliable); \
DeclarePacket(PlayerShoot, Nz::ENetPacketFlag::Reliable);
DeclarePacket(ChatMessage, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Both) \
DeclarePacket(Disconnect, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Both) \
DeclarePacket(KeepAlive, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Both) \
DeclarePacket(LoggingSuccess, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(PlayerDeath, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(PlayerJoin, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(PlayerLeave, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(PlayerList, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(PlayerLogin, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Client) \
DeclarePacket(PlayerPositionAndRotation, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Both) \
DeclarePacket(PlayerShoot, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Both) \
DeclarePacket(PlayerStats, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(ServerConfig, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(ServerTps, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(UpdateGameState, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Server) \
DeclarePacket(UpdateHealth, Nz::ENetPacketFlag::Reliable, blitz::protocol::PacketSender::Client)
} // namespace protocol
} // namespace blitz

34
include/blitz/protocol/Packets.h
View File

@@ -11,37 +11,17 @@ class PacketVisitor;
using PacketID = std::uint8_t;
#define DeclarePacket(PacketName, ...) PacketName,
enum class PacketType : PacketID {
// client --> server
PlayerLogin = 0,
UpdateHealth,
// client <-- server
LoggingSuccess,
PlayerDeath,
PlayerJoin,
PlayerLeave,
PlayerList,
PlayerStats,
ServerConfig,
ServerTps,
UpdateGameState,
// client <--> server
KeepAlive,
Disconnect,
ChatMessage,
PlayerPositionAndRotation,
PlayerShoot,
DeclareAllPacket()
PACKET_COUNT
};
#undef DeclarePacket
class Packet {
@@ -59,7 +39,7 @@ namespace packets {
/**
* \tparam PT The packet type
* \tparam Data The structure holding the data of the packet
* \tparam Data The structure holding the data of the packet (in blitz::protocol::data namespace)
*/
template <PacketType PT, typename Data>
class ConcretePacket : public Packet {
@@ -90,9 +70,9 @@ class ConcretePacket : public Packet {
#ifdef BLITZ_INSTANCIATE_PACKETS
#define DeclarePacket(PacketName, ...) \
using PacketName = ConcretePacket<PacketType::PacketName, data::PacketName>; \
template class ConcretePacket<PacketType::PacketName, data::PacketName>
template class ConcretePacket<PacketType::PacketName, data::PacketName>;
#else
#define DeclarePacket(PacketName, ...) using PacketName = ConcretePacket<PacketType::PacketName, data::PacketName>
#define DeclarePacket(PacketName, ...) using PacketName = ConcretePacket<PacketType::PacketName, data::PacketName>;
#endif
DeclareAllPacket()