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

18
src/blitz/network/EnetConnexion.cpp
View File

@@ -1,5 +1,6 @@
#include <blitz/network/EnetConnexion.h>
#include <Nazara/Network/ENetPeer.hpp>
#include <blitz/protocol/PacketSerializer.h>
#include <blitz/protocol/PacketVisitor.h>
@@ -20,12 +21,14 @@ class PacketDispatcher : public protocol::PacketVisitor {
public:
PacketDispatcher(EnetConnexion& a_Connexion) : m_Connexion(a_Connexion) {}
DeclareAllPacket();
DeclareAllPacket()
private:
EnetConnexion& m_Connexion;
};
#undef DeclarePacket
@@ -36,6 +39,12 @@ void EnetConnexion::SetPeer(Nz::ENetPeer* a_Peer) {
m_Peer = a_Peer;
}
bool EnetConnexion::IsConnected() const {
if (!m_Peer)
return false;
return m_Peer->IsConnected();
}
void EnetConnexion::Recieve(Nz::ByteArray& a_Data) {
auto packet = protocol::PacketSerializer::Deserialize(a_Data);
if (!packet)
@@ -44,5 +53,12 @@ void EnetConnexion::Recieve(Nz::ByteArray& a_Data) {
dispatcher.Check(*packet.get());
}
#define DeclarePacket(Name, NFlag, ...) \
void EnetConnexion::Send##Name(const blitz::protocol::data::Name& a_##Name) const { \
m_Peer->Send(0, NFlag, protocol::PacketSerializer::Serialize(protocol::packets::Name(a_##Name))); \
}
DeclareAllPacket()
} // namespace network
} // namespace blitz

25
src/blitz/protocol/PacketFactory.cpp
View File

@@ -9,29 +9,18 @@ namespace PacketFactory {
using PacketCreator = std::function<std::unique_ptr<Packet>()>;
#define DeclarePacket(PacketName, ...) std::make_unique<packets::PacketName>(),
static const std::array<std::unique_ptr<Packet>, static_cast<std::size_t>(PacketType::PACKET_COUNT)> Packets = {
std::make_unique<packets::PlayerLogin>(),
std::make_unique<packets::UpdateHealth>(),
std::make_unique<packets::LoggingSuccess>(),
std::make_unique<packets::PlayerDeath>(),
std::make_unique<packets::PlayerJoin>(),
std::make_unique<packets::PlayerLeave>(),
std::make_unique<packets::PlayerList>(),
std::make_unique<packets::PlayerStats>(),
std::make_unique<packets::ServerConfig>(),
std::make_unique<packets::ServerTps>(),
std::make_unique<packets::UpdateGameState>(),
std::make_unique<packets::KeepAlive>(),
std::make_unique<packets::Disconnect>(),
std::make_unique<packets::ChatMessage>(),
std::make_unique<packets::PlayerPositionAndRotation>(),
std::make_unique<packets::PlayerShoot>(),
DeclareAllPacket()
};
const std::unique_ptr<Packet>& CreateReadOnlyPacket(PacketType a_Type) {
return Packets[static_cast<std::size_t>(a_Type)];
return Packets[static_cast<std::size_t>(a_Type)];
}
} // namespace PacketFactory
} // namespace PacketFactory
} // namespace protocol
} // namespace blitz

41
src/blitz/protocol/PacketSerializer.cpp
View File

@@ -11,29 +11,16 @@ namespace protocol {
namespace PacketSerializer {
#define VisitSerialize(ClassName) \
void Visit(const ClassName& a_Packet) override { \
#define DeclarePacket(PacketName, ...) \
void Visit(const packets::PacketName& a_Packet) override { \
const auto& packetData = a_Packet.m_Data; \
SerializePacketData(packetData); \
} \
\
void SerializePacketData(const ClassName::PacketDataType& a_Packet)
#define VisitDeserialize(ClassName) \
void Visit(const ClassName& a_Packet) override { \
auto packetPtr = PacketFactory::CreatePacket<ClassName>(); \
auto& packetData = packetPtr->m_Data; \
\
DeserializePacketData(packetData); \
\
m_Packet = std::move(packetPtr); \
} \
\
void DeserializePacketData(ClassName::PacketDataType& a_Packet)
void SerializePacketData(const packets::PacketName::PacketDataType& a_Packet);
#define DeclarePacket(PacketName, ...) \
VisitSerialize(packets::PacketName)
class Serializer : public PacketVisitor {
private:
@@ -51,8 +38,24 @@ class Serializer : public PacketVisitor {
};
#undef DeclarePacket
#define DeclarePacket(PacketName, ...) \
VisitDeserialize(packets::PacketName)
#define DeclarePacket(PacketName, ...) \
void Visit(const packets::PacketName& a_Packet) override { \
auto packetPtr = PacketFactory::CreatePacket<packets::PacketName>(); \
auto& packetData = packetPtr->m_Data; \
\
DeserializePacketData(packetData); \
\
m_Packet = std::move(packetPtr); \
} \
\
void DeserializePacketData(packets::PacketName::PacketDataType& a_Packet);
class Deserializer : public PacketVisitor {
private: