Add multi update message
This commit is contained in:
parent
023b17818e
commit
cd4d2572f8
8 changed files with 140 additions and 61 deletions
|
|
@ -20,7 +20,7 @@ class NetClient : public std::enable_shared_from_this<NetClient> {
|
||||||
template <typename... Args> void send_items_to_server(const std::string& channel, Args&&... items) {
|
template <typename... Args> void send_items_to_server(const std::string& channel, Args&&... items) {
|
||||||
if(isDisconnected)
|
if(isDisconnected)
|
||||||
return;
|
return;
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>(std::ios::binary | std::ios::out));
|
||||||
{
|
{
|
||||||
cereal::PortableBinaryOutputArchive m(*ss);
|
cereal::PortableBinaryOutputArchive m(*ss);
|
||||||
(m(items), ...);
|
(m(items), ...);
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
send_string_stream_to_client_if(clientChecker, channel, get_string_stream_from_items(items...));
|
send_string_stream_to_client_if(clientChecker, channel, get_string_stream_from_items(items...));
|
||||||
}
|
}
|
||||||
template <typename... Args> std::shared_ptr<std::stringstream> get_string_stream_from_items(Args&&... items) {
|
template <typename... Args> std::shared_ptr<std::stringstream> get_string_stream_from_items(Args&&... items) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>(std::ios::binary | std::ios::out));
|
||||||
{
|
{
|
||||||
cereal::PortableBinaryOutputArchive m(*ss);
|
cereal::PortableBinaryOutputArchive m(*ss);
|
||||||
(m(items), ...);
|
(m(items), ...);
|
||||||
|
|
|
||||||
|
|
@ -17,16 +17,66 @@ namespace NetworkingObjects {
|
||||||
return;
|
return;
|
||||||
typeList.get_net_type_data(isServer, it->second.netTypeID).readUpdateFunc(NetObjTemporaryPtr<void>(this, id, it->second.p), a, clientReceivedFrom);
|
typeList.get_net_type_data(isServer, it->second.netTypeID).readUpdateFunc(NetObjTemporaryPtr<void>(this, id, it->second.p), a, clientReceivedFrom);
|
||||||
}
|
}
|
||||||
void NetObjManager::set_client(std::shared_ptr<NetClient> initClient, MessageCommandType initUpdateCommandID) {
|
void NetObjManager::read_many_update_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom) {
|
||||||
|
for(;;) {
|
||||||
|
bool objExists;
|
||||||
|
a(objExists);
|
||||||
|
if(!objExists)
|
||||||
|
break;
|
||||||
|
read_update_message(a, clientReceivedFrom);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void NetObjManager::set_client(std::shared_ptr<NetClient> initClient, MessageCommandType initUpdateCommandID, MessageCommandType initMultiUpdateCommandID) {
|
||||||
client = initClient;
|
client = initClient;
|
||||||
updateCommandID = initUpdateCommandID;
|
updateCommandID = initUpdateCommandID;
|
||||||
|
multiUpdateCommandID = initMultiUpdateCommandID;
|
||||||
}
|
}
|
||||||
void NetObjManager::set_server(std::shared_ptr<NetServer> initServer, MessageCommandType initUpdateCommandID) {
|
void NetObjManager::set_server(std::shared_ptr<NetServer> initServer, MessageCommandType initUpdateCommandID, MessageCommandType initMultiUpdateCommandID) {
|
||||||
server = initServer;
|
server = initServer;
|
||||||
updateCommandID = initUpdateCommandID;
|
updateCommandID = initUpdateCommandID;
|
||||||
|
multiUpdateCommandID = initMultiUpdateCommandID;
|
||||||
}
|
}
|
||||||
void NetObjManager::disconnect() {
|
void NetObjManager::disconnect() {
|
||||||
server = nullptr;
|
server = nullptr;
|
||||||
client = nullptr;
|
client = nullptr;
|
||||||
}
|
}
|
||||||
|
bool NetObjManager::is_connected() const {
|
||||||
|
return (server && !server->is_disconnected()) || (client && !client->is_disconnected());
|
||||||
|
}
|
||||||
|
void NetObjManager::send_multi_update_messsage(std::function<void()> captureSendBlock, SendUpdateType updateType, const std::shared_ptr<NetServer::ClientData>& specificClient) {
|
||||||
|
if(is_connected()) {
|
||||||
|
std::shared_ptr<MultiUpdateData> d = std::make_shared<MultiUpdateData>();
|
||||||
|
d->ss = std::make_shared<std::stringstream>(std::ios::binary | std::ios::out);
|
||||||
|
d->outArchive = std::make_unique<cereal::PortableBinaryOutputArchive>(*d->ss);
|
||||||
|
(*d->outArchive)(multiUpdateCommandID);
|
||||||
|
multiUpdateData = d; // Using weak pointer here ensures that object will be freed
|
||||||
|
captureSendBlock();
|
||||||
|
if(!d->channelToSendTo.empty()) {
|
||||||
|
(*d->outArchive)(false);
|
||||||
|
d->outArchive = nullptr; // Destroy output archive to finalize serialization
|
||||||
|
send_update_data_by_type(d->channelToSendTo, d->ss, updateType, specificClient);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
captureSendBlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
void NetObjManager::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) {
|
||||||
|
if(client && updateType != SendUpdateType::SEND_TO_ALL)
|
||||||
|
throw std::runtime_error("[NetObjManager::send_update_data_by_type] Client can only send to all (to server)");
|
||||||
|
switch(updateType) {
|
||||||
|
case SendUpdateType::SEND_TO_ALL:
|
||||||
|
if(client)
|
||||||
|
client->send_string_stream_to_server(channel, ss);
|
||||||
|
else
|
||||||
|
server->send_string_stream_to_all_clients(channel, ss);
|
||||||
|
break;
|
||||||
|
case SendUpdateType::SEND_TO_ALL_EXCEPT:
|
||||||
|
server->send_string_stream_to_all_clients_except(specificClient, channel, ss);
|
||||||
|
break;
|
||||||
|
case SendUpdateType::SEND_TO_SPECIFIC_CLIENT:
|
||||||
|
server->send_string_stream_to_client(specificClient, channel, ss);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,12 @@ namespace NetworkingObjects {
|
||||||
public:
|
public:
|
||||||
NetObjManager(bool initIsServer);
|
NetObjManager(bool initIsServer);
|
||||||
void read_update_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom);
|
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 read_many_update_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom);
|
||||||
void set_server(std::shared_ptr<NetServer> initServer, MessageCommandType initUpdateCommandID);
|
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();
|
void disconnect();
|
||||||
bool is_server() const;
|
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) {
|
template <typename T> NetObjOwnerPtr<T> read_create_message(cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& clientReceivedFrom) {
|
||||||
NetObjID id;
|
NetObjID id;
|
||||||
a(id);
|
a(id);
|
||||||
|
|
@ -44,6 +46,13 @@ namespace NetworkingObjects {
|
||||||
return NetObjTemporaryPtr<T>(this, id, std::static_pointer_cast<T>(it->second.p));
|
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
|
// 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) {
|
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()));
|
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);
|
typeList.register_class<ClientT, ServerT, ClientAllocatedType, ServerAllocatedType>(funcs);
|
||||||
}
|
}
|
||||||
private:
|
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) {
|
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)
|
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");
|
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) {
|
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 = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
if(ss)
|
||||||
{
|
|
||||||
cereal::PortableBinaryOutputArchive m(*ss);
|
|
||||||
m(ptr.get_obj_man()->updateCommandID, ptr.get_net_id());
|
|
||||||
sendUpdateFunc(ptr, m);
|
|
||||||
}
|
|
||||||
ptr.get_obj_man()->client->send_string_stream_to_server(channel, 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) {
|
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()) {
|
if(clientToSendTo) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||||
{
|
if(ss)
|
||||||
cereal::PortableBinaryOutputArchive m(*ss);
|
ptr.get_obj_man()->server->send_string_stream_to_client(clientToSendTo, channel, 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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
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 = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
if(ss)
|
||||||
{
|
|
||||||
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_all_clients_except(clientToNotSendTo, channel, 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) {
|
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 = send_update_general_check_for_multi_update(channel, ptr, sendUpdateFunc);
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
if(ss)
|
||||||
{
|
|
||||||
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_all_clients(channel, 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) {
|
template <typename T> static void write_create_message(const NetObjTemporaryPtr<T>& ptr, cereal::PortableBinaryOutputArchive& a) {
|
||||||
|
|
@ -147,10 +158,18 @@ namespace NetworkingObjects {
|
||||||
void* p;
|
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;
|
bool isServer;
|
||||||
std::shared_ptr<NetClient> client;
|
std::shared_ptr<NetClient> client;
|
||||||
std::shared_ptr<NetServer> server;
|
std::shared_ptr<NetServer> server;
|
||||||
MessageCommandType updateCommandID;
|
MessageCommandType updateCommandID;
|
||||||
|
MessageCommandType multiUpdateCommandID;
|
||||||
std::unordered_map<NetObjID, SingleObjectData> objectData;
|
std::unordered_map<NetObjID, SingleObjectData> objectData;
|
||||||
NetObjManagerTypeList typeList;
|
NetObjManagerTypeList typeList;
|
||||||
NetTypeIDType nextTypeID;
|
NetTypeIDType nextTypeID;
|
||||||
|
|
|
||||||
|
|
@ -103,31 +103,33 @@ void BookmarkManager::setup_list_gui(const std::string& id) {
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
.moveObjectsToListAtIndex = [&](NetObjID listObj, size_t index, const std::vector<GUIStuff::TreeListing::ParentObjectIDPair>& objsToInsert) {
|
.moveObjectsToListAtIndex = [&](NetObjID listObj, size_t index, const std::vector<GUIStuff::TreeListing::ParentObjectIDPair>& objsToInsert) {
|
||||||
std::unordered_map<NetObjID, std::unordered_set<NetObjID>> toEraseMap;
|
world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
uint32_t newIndex = index;
|
std::unordered_map<NetObjID, std::unordered_set<NetObjID>> toEraseMap;
|
||||||
std::vector<NetObjOwnerPtr<BookmarkListItem>> toInsertObjPtrs;
|
uint32_t newIndex = index;
|
||||||
auto& listPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(listObj)->get_folder_list();
|
std::vector<NetObjOwnerPtr<BookmarkListItem>> toInsertObjPtrs;
|
||||||
|
auto& listPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(listObj)->get_folder_list();
|
||||||
|
|
||||||
for(size_t i = 0; i < objsToInsert.size(); i++) {
|
for(size_t i = 0; i < objsToInsert.size(); i++) {
|
||||||
toEraseMap[objsToInsert[i].parent].emplace(objsToInsert[i].object);
|
toEraseMap[objsToInsert[i].parent].emplace(objsToInsert[i].object);
|
||||||
if(newIndex != 0 && objsToInsert[i].parent == listObj && listPtr->get(objsToInsert[i].object)->pos <= index)
|
if(newIndex != 0 && objsToInsert[i].parent == listObj && listPtr->get(objsToInsert[i].object)->pos <= index)
|
||||||
newIndex--;
|
newIndex--;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(auto& [listToEraseFrom, setToErase] : toEraseMap) {
|
for(auto& [listToEraseFrom, setToErase] : toEraseMap) {
|
||||||
auto& listToEraseFromPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(listToEraseFrom)->get_folder_list();
|
auto& listToEraseFromPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(listToEraseFrom)->get_folder_list();
|
||||||
listToEraseFromPtr->erase_unordered_set(listToEraseFromPtr, setToErase, &toInsertObjPtrs);
|
listToEraseFromPtr->erase_unordered_set(listToEraseFromPtr, setToErase, &toInsertObjPtrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::pair<uint32_t, NetObjOwnerPtr<BookmarkListItem>>> toInsert;
|
std::vector<std::pair<uint32_t, NetObjOwnerPtr<BookmarkListItem>>> toInsert;
|
||||||
for(uint32_t i = 0; i < objsToInsert.size(); i++) {
|
for(uint32_t i = 0; i < objsToInsert.size(); i++) {
|
||||||
auto it = std::find_if(toInsertObjPtrs.begin(), toInsertObjPtrs.end(), [id = objsToInsert[i].object](NetObjOwnerPtr<BookmarkListItem>& objPtr) {
|
auto it = std::find_if(toInsertObjPtrs.begin(), toInsertObjPtrs.end(), [id = objsToInsert[i].object](NetObjOwnerPtr<BookmarkListItem>& objPtr) {
|
||||||
return objPtr.get_net_id() == id;
|
return objPtr.get_net_id() == id;
|
||||||
});
|
});
|
||||||
toInsert.emplace_back(newIndex + i, std::move(*it));
|
toInsert.emplace_back(newIndex + i, std::move(*it));
|
||||||
toInsert.back().second.reassign_ids();
|
toInsert.back().second.reassign_ids();
|
||||||
}
|
}
|
||||||
listPtr->insert_ordered_list_and_send_create(listPtr, toInsert);
|
listPtr->insert_ordered_list_and_send_create(listPtr, toInsert);
|
||||||
|
}, NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if(toDeleteObject.has_value()) {
|
if(toDeleteObject.has_value()) {
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ enum ServerCommands : MessageCommandType {
|
||||||
SERVER_KEEP_ALIVE,
|
SERVER_KEEP_ALIVE,
|
||||||
SERVER_INITIAL_DATA,
|
SERVER_INITIAL_DATA,
|
||||||
SERVER_UPDATE_NETWORK_OBJECT,
|
SERVER_UPDATE_NETWORK_OBJECT,
|
||||||
|
SERVER_UPDATE_MANY_NETWORK_OBJECTS,
|
||||||
SERVER_NEW_RESOURCE_ID,
|
SERVER_NEW_RESOURCE_ID,
|
||||||
SERVER_NEW_RESOURCE_DATA
|
SERVER_NEW_RESOURCE_DATA
|
||||||
};
|
};
|
||||||
|
|
@ -16,6 +17,7 @@ enum ClientCommands : MessageCommandType {
|
||||||
CLIENT_KEEP_ALIVE,
|
CLIENT_KEEP_ALIVE,
|
||||||
CLIENT_INITIAL_DATA,
|
CLIENT_INITIAL_DATA,
|
||||||
CLIENT_UPDATE_NETWORK_OBJECT,
|
CLIENT_UPDATE_NETWORK_OBJECT,
|
||||||
|
CLIENT_UPDATE_MANY_NETWORK_OBJECTS,
|
||||||
CLIENT_NEW_RESOURCE_ID,
|
CLIENT_NEW_RESOURCE_ID,
|
||||||
CLIENT_NEW_RESOURCE_DATA
|
CLIENT_NEW_RESOURCE_DATA
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ void ConnectionManager::connect_p2p(World& initWorld, const std::string& serverF
|
||||||
client = std::make_shared<NetClient>(serverFullID);
|
client = std::make_shared<NetClient>(serverFullID);
|
||||||
lastKeepAliveTime = std::chrono::steady_clock::now();
|
lastKeepAliveTime = std::chrono::steady_clock::now();
|
||||||
NetLibrary::register_client(client);
|
NetLibrary::register_client(client);
|
||||||
initWorld.netObjMan.set_client(client, SERVER_UPDATE_NETWORK_OBJECT);
|
initWorld.netObjMan.set_client(client, SERVER_UPDATE_NETWORK_OBJECT, SERVER_UPDATE_MANY_NETWORK_OBJECTS);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConnectionManager::update() {
|
void ConnectionManager::update() {
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,9 @@ void World::init_server_callbacks() {
|
||||||
netServer->add_recv_callback(SERVER_UPDATE_NETWORK_OBJECT, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_UPDATE_NETWORK_OBJECT, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
netObjMan.read_update_message(message, client);
|
netObjMan.read_update_message(message, client);
|
||||||
});
|
});
|
||||||
|
netServer->add_recv_callback(SERVER_UPDATE_MANY_NETWORK_OBJECTS, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
|
netObjMan.read_many_update_message(message, client);
|
||||||
|
});
|
||||||
netServer->add_recv_callback(SERVER_KEEP_ALIVE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_KEEP_ALIVE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
});
|
});
|
||||||
netServer->add_disconnect_callback([&](std::shared_ptr<NetServer::ClientData> client) {
|
netServer->add_disconnect_callback([&](std::shared_ptr<NetServer::ClientData> client) {
|
||||||
|
|
@ -184,6 +187,9 @@ void World::init_client_callbacks() {
|
||||||
con.client_add_recv_callback(CLIENT_UPDATE_NETWORK_OBJECT, [&](cereal::PortableBinaryInputArchive& message) {
|
con.client_add_recv_callback(CLIENT_UPDATE_NETWORK_OBJECT, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
netObjMan.read_update_message(message, nullptr);
|
netObjMan.read_update_message(message, nullptr);
|
||||||
});
|
});
|
||||||
|
con.client_add_recv_callback(CLIENT_UPDATE_MANY_NETWORK_OBJECTS, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
|
netObjMan.read_many_update_message(message, nullptr);
|
||||||
|
});
|
||||||
con.client_add_recv_callback(CLIENT_KEEP_ALIVE, [&](cereal::PortableBinaryInputArchive& message) {
|
con.client_add_recv_callback(CLIENT_KEEP_ALIVE, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -347,7 +353,7 @@ void World::start_hosting(const std::string& initNetSource, const std::string& s
|
||||||
main.init_net_library();
|
main.init_net_library();
|
||||||
netServer = std::make_shared<NetServer>(serverLocalID);
|
netServer = std::make_shared<NetServer>(serverLocalID);
|
||||||
NetLibrary::register_server(netServer);
|
NetLibrary::register_server(netServer);
|
||||||
netObjMan.set_server(netServer, CLIENT_UPDATE_NETWORK_OBJECT);
|
netObjMan.set_server(netServer, CLIENT_UPDATE_NETWORK_OBJECT, CLIENT_UPDATE_MANY_NETWORK_OBJECTS);
|
||||||
conType = CONNECTIONTYPE_SERVER;
|
conType = CONNECTIONTYPE_SERVER;
|
||||||
netSource = initNetSource;
|
netSource = initNetSource;
|
||||||
init_server_callbacks();
|
init_server_callbacks();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue