splib transition

This commit is contained in:
2025-07-10 16:34:28 +02:00
parent c0473e5a65
commit cc57e03bc4
29 changed files with 146 additions and 1127 deletions

View File

@@ -1,12 +1,9 @@
#include <iostream>
// #include <td/protocol/packet/PacketVisitor.h>
#include <td/game/GameHistory.h>
#include <td/protocol/command/CommandDispatcher.h>
#include <td/protocol/command/CommandFactory.h>
#include <td/protocol/command/CommandSerializer.h>
#include <td/protocol/command/CommandVisitor.h>
#include <td/protocol/command/Commands.h>
class Test : public td::protocol::CommandVisitor {};
class Test : public td::protocol::CommandHandler {};
int main(int argc, char** argv) {
// Test visitor;
@@ -14,8 +11,8 @@ int main(int argc, char** argv) {
// visitor.Check(chat);
td::protocol::commands::UpgradeTower com{{1, 2}};
std::cout << (unsigned)com.GetType() << std::endl;
td::protocol::commands::UpgradeTowerCommand com{1, 2};
std::cout << (unsigned)com.GetId() << std::endl;
td::protocol::CommandDispatcher disptacher;
return 0;
}

1
src/td/game/Game.cpp Normal file
View File

@@ -0,0 +1 @@
#include <td/game/Game.h>

View File

@@ -32,12 +32,12 @@ void GameHistory::FromPacket(td::protocol::pdata::LockSteps&& a_Steps) {
}
}
td::protocol::packets::LockSteps GameHistory::ToPacket(HistorySizeType a_StartIndex) {
std::array<protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps;
td::protocol::packets::LockStepsPacket GameHistory::ToPacket(HistorySizeType a_StartIndex) {
Array<protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps;
for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
steps[i] = GetLockStep(a_StartIndex + i);
}
return {{a_StartIndex, std::move(steps)}};
return {a_StartIndex, std::move(steps)};
}
} // namespace game

View File

@@ -1,24 +0,0 @@
#include <td/protocol/command/CommandFactory.h>
#include <array>
#include <cassert>
#include <functional>
namespace td {
namespace protocol {
namespace CommandFactory {
using CommandCreator = std::function<std::shared_ptr<Command>()>;
#define DeclareCommand(CommandName, ...) std::make_shared<commands::CommandName>(),
static std::array<std::shared_ptr<Command>, static_cast<std::size_t>(CommandType::COMMAND_COUNT)> Commands = {DeclareAllCommand()};
const std::shared_ptr<Command>& CreateReadOnlyCommand(CommandType a_Type) {
assert(a_Type < CommandType::COMMAND_COUNT);
return Commands[static_cast<std::size_t>(a_Type)];
}
} // namespace CommandFactory
} // namespace protocol
} // namespace td

View File

@@ -1,229 +0,0 @@
#include <td/protocol/command/CommandSerializer.h>
#include <td/protocol/command/CommandFactory.h>
#include <td/protocol/command/CommandVisitor.h>
#include <td/misc/Format.h>
#include <td/misc/Log.h>
namespace td {
namespace protocol {
namespace CommandSerializer {
#define DeclareCommand(CommandName, ...) \
void Visit(const commands::CommandName& a_Command) override { \
const auto& commandData = a_Command.m_Data; \
SerializeCommandData(commandData); \
} \
\
void SerializeCommandData(const commands::CommandName::CommandDataType& a_Command);
class Serializer : public CommandVisitor {
private:
DataBuffer& m_Buffer;
public:
Serializer(DataBuffer& a_Buffer) : m_Buffer(a_Buffer) {}
void Serialize(const Command& a_Command) {
m_Buffer << static_cast<CommandID>(a_Command.GetType());
Check(a_Command);
}
DeclareAllCommand()
};
#undef DeclareCommand
#define DeclareCommand(CommandName, ...) \
void Visit(const commands::CommandName& a_Command) override { \
auto commandPtr = CommandFactory::CreateCommand<commands::CommandName>(); \
auto& commandData = commandPtr->m_Data; \
\
DeserializeCommandData(commandData); \
\
m_Command = std::move(commandPtr); \
} \
\
void DeserializeCommandData(commands::CommandName::CommandDataType& a_Command);
class Deserializer : public CommandVisitor {
private:
DataBuffer& m_Buffer;
CommandPtr m_Command;
public:
Deserializer(DataBuffer& a_Buffer) : m_Buffer(a_Buffer) {}
bool Deserialize(const CommandPtr& a_Command) {
try {
Check(*a_Command.get());
} catch (std::exception& e) {
utils::LOGE(utils::Format("[CommandSerializer::Deserializer] %s", e.what()));
return false;
}
return true;
}
CommandPtr& GetCommand() {
return m_Command;
}
DeclareAllCommand()
};
DataBuffer Serialize(const Command& a_Command) {
DataBuffer buffer;
Serializer serializer(buffer);
serializer.Serialize(a_Command);
return buffer;
}
std::shared_ptr<Command> Deserialize(DataBuffer& a_Data) {
CommandID commandId;
a_Data >> commandId;
if (commandId >= static_cast<CommandID>(CommandType::COMMAND_COUNT))
return nullptr;
CommandType commandType = CommandType(commandId);
// for double-dispatch
const CommandPtr& emptyCommand = CommandFactory::CreateReadOnlyCommand(commandType);
Deserializer deserializer(a_Data);
if (deserializer.Deserialize(emptyCommand)) {
CommandPtr command = std::move(deserializer.GetCommand());
return command;
}
return nullptr;
}
//---------------------------------------------
// Command serializer implementation
//----------------------------------------------
void Serializer::SerializeCommandData(const cdata::End& a_Command) {}
void Deserializer::DeserializeCommandData(cdata::End& a_Command) {}
void Serializer::SerializeCommandData(const cdata::PlaceTower& a_Command) {
m_Buffer << static_cast<std::uint8_t>((static_cast<std::uint8_t>(a_Command.m_Type) << 4 | a_Command.m_Placer & 0xF))
<< a_Command.m_Position;
}
void Deserializer::DeserializeCommandData(cdata::PlaceTower& a_Command) {
std::uint8_t union1;
m_Buffer >> union1 >> a_Command.m_Position;
a_Command.m_Type = td::TowerType(union1 >> 4);
a_Command.m_Placer = union1 & 0xF;
}
void Serializer::SerializeCommandData(const cdata::PlayerJoin& a_Command) {
m_Buffer << a_Command.m_ID << a_Command.m_Name;
}
void Deserializer::DeserializeCommandData(cdata::PlayerJoin& a_Command) {
m_Buffer >> a_Command.m_ID >> a_Command.m_Name;
}
void Serializer::SerializeCommandData(const cdata::SpawnTroop& a_Command) {
m_Buffer << static_cast<std::uint8_t>(static_cast<std::uint8_t>(a_Command.m_Type) << 3 | a_Command.m_Level & 0x7)
<< a_Command.m_Position << a_Command.m_Sender;
}
void Deserializer::DeserializeCommandData(cdata::SpawnTroop& a_Command) {
std::uint8_t union1;
m_Buffer >> union1 >> a_Command.m_Position >> a_Command.m_Sender;
a_Command.m_Type = td::EntityType(union1 >> 3);
a_Command.m_Level = union1 & 0x7;
}
void Serializer::SerializeCommandData(const cdata::TeamChange& a_Command) {
m_Buffer << static_cast<std::uint8_t>(a_Command.m_Player << 1 | static_cast<std::uint8_t>(a_Command.m_NewTeam));
}
void Deserializer::DeserializeCommandData(cdata::TeamChange& a_Command) {
std::uint8_t union1;
m_Buffer >> union1;
a_Command.m_Player = union1 >> 1;
a_Command.m_NewTeam = td::Team(union1 & 1);
}
void Serializer::SerializeCommandData(const cdata::UpgradeTower& a_Command) {
m_Buffer << static_cast<std::uint16_t>(a_Command.m_Tower << 4 | a_Command.m_Upgrade & 0xF);
}
void Deserializer::DeserializeCommandData(cdata::UpgradeTower& a_Command) {
std::uint16_t union1;
m_Buffer >> union1;
a_Command.m_Tower = union1 >> 4;
a_Command.m_Upgrade = union1 & 0xF;
}
void Serializer::SerializeCommandData(const cdata::UseItem& a_Command) {
m_Buffer << static_cast<std::uint8_t>(static_cast<std::uint8_t>(a_Command.m_Item) << 4 | a_Command.m_User & 0xF)
<< a_Command.m_Position;
}
void Deserializer::DeserializeCommandData(cdata::UseItem& a_Command) {
std::uint8_t union1;
m_Buffer >> union1 >> a_Command.m_Position;
a_Command.m_Item = td::ShopItem(union1 >> 4);
a_Command.m_User = union1 & 0xF;
}
} // namespace CommandSerializer
} // namespace protocol
} // namespace td

View File

@@ -1,11 +0,0 @@
#include <td/protocol/command/CommandVisitor.h>
namespace td {
namespace protocol {
void CommandVisitor::Check(const Command& a_Command) {
a_Command.Accept(*this);
}
} // namespace protocol
} // namespace td

View File

@@ -1,18 +0,0 @@
#define TD_INSTANCIATE_COMMANDS
#include <td/protocol/command/Commands.h>
#include <td/protocol/command/CommandVisitor.h>
namespace td {
namespace protocol {
template <CommandType CT, typename Data>
commands::ConcreteCommand<CT, Data>::ConcreteCommand(const CommandDataType& a_Data) : m_Data(a_Data) {}
template <CommandType CT, typename Data>
void commands::ConcreteCommand<CT, Data>::Accept(CommandVisitor& a_Visitor) const {
a_Visitor.Visit(*this);
}
} // namespace protocol
} // namespace td

View File

@@ -1,26 +0,0 @@
#include <td/protocol/packet/PacketFactory.h>
#include <array>
#include <cassert>
#include <functional>
namespace td {
namespace protocol {
namespace PacketFactory {
using PacketCreator = std::function<std::unique_ptr<Packet>()>;
#define DeclarePacket(PacketName, ...) std::make_unique<packets::PacketName>(),
static std::array<std::unique_ptr<Packet>, static_cast<std::size_t>(PacketType::PACKET_COUNT)> Packets = {
DeclareAllPacket()
};
const std::unique_ptr<Packet>& CreateReadOnlyPacket(PacketType a_Type) {
assert(a_Type < PacketType::PACKET_COUNT);
return Packets[static_cast<std::size_t>(a_Type)];
}
} // namespace PacketFactory
} // namespace protocol
} // namespace td

View File

@@ -1,262 +0,0 @@
#include <td/protocol/packet/PacketSerializer.h>
#include <td/protocol/command/CommandSerializer.h>
#include <td/protocol/packet/PacketFactory.h>
#include <td/protocol/packet/PacketVisitor.h>
#include <td/misc/Format.h>
#include <td/misc/Log.h>
namespace td {
namespace protocol {
namespace PacketSerializer {
#define DeclarePacket(PacketName, ...) \
void Visit(const packets::PacketName& a_Packet) override { \
const auto& packetData = a_Packet.m_Data; \
SerializePacketData(packetData); \
} \
\
void SerializePacketData(const packets::PacketName::PacketDataType& a_Packet);
class Serializer : public PacketVisitor {
private:
DataBuffer& m_Buffer;
public:
Serializer(DataBuffer& a_Buffer) : m_Buffer(a_Buffer) {}
void Serialize(const Packet& a_Packet) {
m_Buffer << static_cast<PacketID>(a_Packet.GetType());
Check(a_Packet);
}
DeclareAllPacket()
};
#undef DeclarePacket
#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:
DataBuffer& m_Buffer;
PacketPtr m_Packet;
public:
Deserializer(DataBuffer& a_Buffer) : m_Buffer(a_Buffer) {}
bool Deserialize(const PacketPtr& a_Packet) {
try {
Check(*a_Packet.get());
} catch (std::exception& e) {
utils::LOGE(utils::Format("[PacketSerializer::Deserializer] %s", e.what()));
return false;
}
return true;
}
PacketPtr& GetPacket() {
return m_Packet;
}
DeclareAllPacket()
};
DataBuffer Serialize(const Packet& a_Packet) {
DataBuffer buffer;
Serializer serializer(buffer);
serializer.Serialize(a_Packet);
return buffer;
}
std::unique_ptr<Packet> Deserialize(DataBuffer& a_Data) {
PacketID packetId;
a_Data >> packetId;
if (packetId >= static_cast<PacketID>(PacketType::PACKET_COUNT))
return nullptr;
PacketType packetType = PacketType(packetId);
// for double-dispatch
const PacketPtr& emptyPacket = PacketFactory::CreateReadOnlyPacket(packetType);
Deserializer deserializer(a_Data);
if (deserializer.Deserialize(emptyPacket)) {
PacketPtr packet = std::move(deserializer.GetPacket());
return packet;
}
return nullptr;
}
//---------------------------------------------
// Packet serializer implementation
//----------------------------------------------
void Serializer::SerializePacketData(const pdata::PlayerLogin& a_Packet) {
m_Buffer << a_Packet.m_PlayerName;
}
void Deserializer::DeserializePacketData(pdata::PlayerLogin& a_Packet) {
m_Buffer >> a_Packet.m_PlayerName;
}
void Serializer::SerializePacketData(const pdata::LoggingSuccess& a_Packet) {
m_Buffer << a_Packet.m_PlayerId;
}
void Deserializer::DeserializePacketData(pdata::LoggingSuccess& a_Packet) {
m_Buffer >> a_Packet.m_PlayerId;
}
void Serializer::SerializePacketData(const pdata::PlayerJoin& a_Packet) {
m_Buffer << a_Packet.m_Player;
}
void Deserializer::DeserializePacketData(pdata::PlayerJoin& a_Packet) {
m_Buffer >> a_Packet.m_Player;
}
void Serializer::SerializePacketData(const pdata::PlayerLeave& a_Packet) {
m_Buffer << a_Packet.m_PlayerId;
}
void Deserializer::DeserializePacketData(pdata::PlayerLeave& a_Packet) {
m_Buffer >> a_Packet.m_PlayerId;
}
void Serializer::SerializePacketData(const pdata::KeepAlive& a_Packet) {
m_Buffer << a_Packet.m_KeepAliveId;
}
void Deserializer::DeserializePacketData(pdata::KeepAlive& a_Packet) {
m_Buffer >> a_Packet.m_KeepAliveId;
}
void Serializer::SerializePacketData(const pdata::Disconnect& a_Packet) {
m_Buffer << a_Packet.m_Reason;
}
void Deserializer::DeserializePacketData(pdata::Disconnect& a_Packet) {
m_Buffer >> a_Packet.m_Reason;
}
void Serializer::SerializePacketData(const pdata::ChatMessage& a_Packet) {
m_Buffer << a_Packet.m_Text;
}
void Deserializer::DeserializePacketData(pdata::ChatMessage& a_Packet) {
m_Buffer >> a_Packet.m_Text;
}
void Serializer::SerializePacketData(const pdata::LockSteps& a_Packet) {
m_Buffer << a_Packet.m_FirstFrameNumber;
for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
auto& lockStep = a_Packet.m_LockSteps[i];
m_Buffer << VarInt{lockStep.size()};
for (int j = 0; j < lockStep.size(); i++) {
auto command = lockStep[j];
m_Buffer << CommandSerializer::Serialize(*command);
}
}
}
void Deserializer::DeserializePacketData(pdata::LockSteps& a_Packet) {
m_Buffer >> a_Packet.m_FirstFrameNumber;
for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
VarInt lockStepSize;
m_Buffer >> lockStepSize;
for (std::size_t j = 0; j < lockStepSize.GetValue(); i++) {
auto command = CommandSerializer::Deserialize(m_Buffer);
if (command) {
a_Packet.m_LockSteps[i].push_back(command);
} else {
throw std::runtime_error("Failed to deserialise command");
}
}
}
}
void Serializer::SerializePacketData(const pdata::BeginGame& a_Packet) {
m_Buffer << a_Packet.m_Map << a_Packet.m_BlueTeam << a_Packet.m_RedTeam << a_Packet.m_Map;
}
void Deserializer::DeserializePacketData(pdata::BeginGame& a_Packet) {
m_Buffer >> a_Packet.m_Map >> a_Packet.m_BlueTeam >> a_Packet.m_RedTeam >> a_Packet.m_Map;
}
} // namespace PacketSerializer
} // namespace protocol
} // namespace td

View File

@@ -1,11 +0,0 @@
#include <td/protocol/packet/PacketVisitor.h>
namespace td {
namespace protocol {
void PacketVisitor::Check(const Packet& a_Packet) {
a_Packet.Accept(*this);
}
} // namespace protocol
} // namespace td

View File

@@ -1,23 +0,0 @@
#define TD_INSTANCIATE_PACKETS
#include <td/protocol/packet/Packets.h>
#include <td/protocol/packet/PacketVisitor.h>
namespace td {
namespace protocol {
template <PacketType PT, typename Data>
packets::ConcretePacket<PT, Data>::ConcretePacket(const PacketDataType& a_Data) : m_Data(a_Data) {}
template <PacketType PT, typename Data>
void packets::ConcretePacket<PT, Data>::Accept(PacketVisitor& a_Visitor) const {
a_Visitor.Visit(*this);
}
#define DeclarePacket(PacketName, packetSendType, packetSenderType) \
static_assert(static_cast<unsigned>(PacketSendType::packetSendType) && static_cast<unsigned>(PacketSenderType::packetSenderType));
DeclareAllPacket()
} // namespace protocol
} // namespace td