Add multi update message
This commit is contained in:
parent
023b17818e
commit
cd4d2572f8
8 changed files with 140 additions and 61 deletions
|
|
@ -21,10 +21,12 @@ namespace NetworkingObjects {
|
|||
public:
|
||||
NetObjManager(bool initIsServer);
|
||||
void read_update_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom);
|
||||
void set_client(std::shared_ptr<NetClient> initClient, MessageCommandType initUpdateCommandID);
|
||||
void set_server(std::shared_ptr<NetServer> initServer, MessageCommandType initUpdateCommandID);
|
||||
void read_many_update_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom);
|
||||
void set_client(std::shared_ptr<NetClient> initClient, MessageCommandType initUpdateCommandID, MessageCommandType initMultiUpdateCommandID);
|
||||
void set_server(std::shared_ptr<NetServer> initServer, MessageCommandType initUpdateCommandID, MessageCommandType initMultiUpdateCommandID);
|
||||
void disconnect();
|
||||
bool is_server() const;
|
||||
bool is_connected() const;
|
||||
template <typename T> NetObjOwnerPtr<T> read_create_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom) {
|
||||
NetObjID id;
|
||||
a(id);
|
||||
|
|
@ -44,6 +46,13 @@ namespace NetworkingObjects {
|
|||
return NetObjTemporaryPtr<T>(this, id, std::static_pointer_cast<T>(it->second.p));
|
||||
}
|
||||
|
||||
enum class SendUpdateType {
|
||||
SEND_TO_ALL,
|
||||
SEND_TO_ALL_EXCEPT,
|
||||
SEND_TO_SPECIFIC_CLIENT
|
||||
};
|
||||
void send_multi_update_messsage(std::function<void()> captureSendBlock, SendUpdateType updateType, const std::shared_ptr<NetServer::ClientData>& specificClient);
|
||||
|
||||
// NOTE: DO NOT USE THESE FUNCTIONS UNLESS SITUATION ISN'T NORMAL, EVERY OBJECT SHOULD HAVE A UNIQUE ID AND IDS SHOULDNT BE REUSED UNDER ANY CIRCUMSTANCES
|
||||
template <typename T> NetObjOwnerPtr<T> make_obj_with_specific_id(const NetObjID& id) {
|
||||
return emplace_raw_ptr<T>(id, static_cast<T*>(typeList.get_type_index_data<T>(isServer).allocatorFunc()));
|
||||
|
|
@ -72,6 +81,8 @@ namespace NetworkingObjects {
|
|||
typeList.register_class<ClientT, ServerT, ClientAllocatedType, ServerAllocatedType>(funcs);
|
||||
}
|
||||
private:
|
||||
void send_update_data_by_type(const std::string& channel, const std::shared_ptr<std::stringstream>& ss, SendUpdateType updateType, const std::shared_ptr<NetServer::ClientData>& specificClient);
|
||||
|
||||
template <typename T> NetObjOwnerPtr<T> emplace_raw_ptr(NetObjID id, T* rawPtr) {
|
||||
if(!objectData.emplace(id, SingleObjectData{.netTypeID = typeList.get_type_index_data<T>(isServer).netTypeID, .p = rawPtr}).second)
|
||||
throw std::runtime_error("[NetObjManager::emplace_raw_ptr] ID Collision");
|
||||
|
|
@ -86,51 +97,51 @@ namespace NetworkingObjects {
|
|||
}
|
||||
|
||||
template <typename T> static void send_client_update(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||
if(ptr.get_obj_man()->client && !ptr.get_obj_man()->client->is_disconnected()) {
|
||||
auto ss(std::make_shared<std::stringstream>());
|
||||
{
|
||||
cereal::PortableBinaryOutputArchive m(*ss);
|
||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, m);
|
||||
}
|
||||
auto ss = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||
if(ss)
|
||||
ptr.get_obj_man()->client->send_string_stream_to_server(channel, ss);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static void send_server_update_to_client(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||
auto ss(std::make_shared<std::stringstream>());
|
||||
{
|
||||
cereal::PortableBinaryOutputArchive m(*ss);
|
||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, m);
|
||||
}
|
||||
ptr.get_obj_man()->server->send_string_stream_to_client(clientToSendTo, channel, ss);
|
||||
if(clientToSendTo) {
|
||||
auto ss = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||
if(ss)
|
||||
ptr.get_obj_man()->server->send_string_stream_to_client(clientToSendTo, channel, ss);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static void send_server_update_to_all_clients_except(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToNotSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||
auto ss(std::make_shared<std::stringstream>());
|
||||
{
|
||||
cereal::PortableBinaryOutputArchive m(*ss);
|
||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, m);
|
||||
}
|
||||
auto ss = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||
if(ss)
|
||||
ptr.get_obj_man()->server->send_string_stream_to_all_clients_except(clientToNotSendTo, channel, ss);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> static void send_server_update_to_all_clients(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||
auto ss(std::make_shared<std::stringstream>());
|
||||
{
|
||||
cereal::PortableBinaryOutputArchive m(*ss);
|
||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, m);
|
||||
}
|
||||
auto ss = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||
if(ss)
|
||||
ptr.get_obj_man()->server->send_string_stream_to_all_clients(channel, ss);
|
||||
}
|
||||
|
||||
template <typename T> static std::shared_ptr<std::stringstream> send_update_general_check_for_multi_update(const std::string& channel, const NetObjTemporaryPtr<T>& ptr, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||
if(ptr.get_obj_man()->is_connected()) {
|
||||
std::shared_ptr<MultiUpdateData> mData = ptr.get_obj_man()->multiUpdateData.lock();
|
||||
if(mData) {
|
||||
mData->channelToSendTo = channel;
|
||||
(*mData->outArchive)(true, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, *mData->outArchive);
|
||||
return nullptr;
|
||||
}
|
||||
else {
|
||||
auto ss(std::make_shared<std::stringstream>(std::ios::binary | std::ios::out));
|
||||
{
|
||||
cereal::PortableBinaryOutputArchive m(*ss);
|
||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
||||
sendUpdateFunc(ptr, m);
|
||||
}
|
||||
return ss;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
template <typename T> static void write_create_message(const NetObjTemporaryPtr<T>& ptr, cereal::PortableBinaryOutputArchive& a) {
|
||||
|
|
@ -147,10 +158,18 @@ namespace NetworkingObjects {
|
|||
void* p;
|
||||
};
|
||||
|
||||
struct MultiUpdateData {
|
||||
std::string channelToSendTo;
|
||||
std::shared_ptr<std::stringstream> ss;
|
||||
std::unique_ptr<cereal::PortableBinaryOutputArchive> outArchive;
|
||||
};
|
||||
std::weak_ptr<MultiUpdateData> multiUpdateData;
|
||||
|
||||
bool isServer;
|
||||
std::shared_ptr<NetClient> client;
|
||||
std::shared_ptr<NetServer> server;
|
||||
MessageCommandType updateCommandID;
|
||||
MessageCommandType multiUpdateCommandID;
|
||||
std::unordered_map<NetObjID, SingleObjectData> objectData;
|
||||
NetObjManagerTypeList typeList;
|
||||
NetTypeIDType nextTypeID;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue