Added multi command block
This commit is contained in:
parent
6889eeff60
commit
279a9317a4
14 changed files with 173 additions and 106 deletions
|
|
@ -22,10 +22,10 @@
|
|||
|
||||
enum ServerCommands : MessageCommandType {
|
||||
SERVER_FRAGMENT = 0,
|
||||
SERVER_MULTI_COMMAND = 1,
|
||||
SERVER_KEEP_ALIVE,
|
||||
SERVER_INITIAL_DATA,
|
||||
SERVER_UPDATE_NETWORK_OBJECT,
|
||||
SERVER_UPDATE_MANY_NETWORK_OBJECTS,
|
||||
SERVER_NEW_RESOURCE_ID,
|
||||
SERVER_NEW_RESOURCE_DATA,
|
||||
SERVER_TRANSFORM_MANY_COMPONENTS
|
||||
|
|
@ -33,10 +33,10 @@ enum ServerCommands : MessageCommandType {
|
|||
|
||||
enum ClientCommands : MessageCommandType {
|
||||
CLIENT_FRAGMENT = 0,
|
||||
CLIENT_MULTI_COMMAND = 1,
|
||||
CLIENT_KEEP_ALIVE,
|
||||
CLIENT_INITIAL_DATA,
|
||||
CLIENT_UPDATE_NETWORK_OBJECT,
|
||||
CLIENT_UPDATE_MANY_NETWORK_OBJECTS,
|
||||
CLIENT_NEW_RESOURCE_ID,
|
||||
CLIENT_NEW_RESOURCE_DATA,
|
||||
CLIENT_TRANSFORM_MANY_COMPONENTS
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ void DrawingProgramLayerManager::push_components_to(const std::vector<CanvasComp
|
|||
|
||||
auto& undoMan = drawP.world.undo;
|
||||
|
||||
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||
drawP.world.send_reliable_multi_command_to_all([&]() {
|
||||
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfo*>> toEraseMap;
|
||||
std::vector<NetObjOwnerPtr<DrawingProgramLayerListItem>> toInsertObjPtrs;
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ void DrawingProgramLayerManager::push_components_to(const std::vector<CanvasComp
|
|||
toEraseList.emplace_back(obj->obj->objInfo);
|
||||
}
|
||||
commitMoveOnLayer();
|
||||
}, NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
|
||||
class MoveComponentsUndoAction : public WorldUndoAction {
|
||||
public:
|
||||
|
|
@ -376,12 +376,12 @@ void DrawingProgramLayerManager::add_undo_place_component(CanvasComponentContain
|
|||
|
||||
void DrawingProgramLayerManager::erase_component_map(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap, bool newUndo) {
|
||||
add_undo_erase_components(eraseMap, newUndo);
|
||||
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||
drawP.world.send_reliable_multi_command_to_all([&]() {
|
||||
for(auto& [layerListItem, netObjSetToErase] : eraseMap) {
|
||||
auto& layerComponentList = layerListItem->get_layer().components;
|
||||
layerComponentList->erase_list(layerComponentList, netObjSetToErase);
|
||||
}
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
}
|
||||
|
||||
void DrawingProgramLayerManager::add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap, bool newUndo) {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "../../MainProgram.hpp"
|
||||
#include "DrawingProgramToolBase.hpp"
|
||||
#include "../../CanvasComponents/MeshCanvasComponent.hpp"
|
||||
#include "Helpers/Networking/NetLibrary.hpp"
|
||||
#include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
|
||||
#include "../../CanvasComponents/CanvasComponentContainer.hpp"
|
||||
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||
|
|
@ -85,10 +86,10 @@ void BrushTool::commit_data(bool final) {
|
|||
}
|
||||
containerPtr->commit_update(drawP);
|
||||
if(final) {
|
||||
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||
drawP.world.send_reliable_multi_command_to_all([&]() {
|
||||
drawP.send_transforms_for({objInfoBeingEdited});
|
||||
containerPtr->send_comp_update(drawP, final);
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
containerPtr->send_comp_update(drawP, true);
|
||||
});
|
||||
}
|
||||
else
|
||||
containerPtr->send_comp_update(drawP, final);
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ void EraserTool::commit_erase() {
|
|||
return false;
|
||||
});
|
||||
|
||||
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||
drawP.world.send_reliable_multi_command_to_all([&]() {
|
||||
bool firstPlacement = true;
|
||||
for(auto& [layer, compMap] : newObjectsToPlace) {
|
||||
layer->get_layer().components->sort_netobj_ordered_list_iterator_insert_list(layer->get_layer().components, compMap);
|
||||
|
|
@ -269,7 +269,7 @@ void EraserTool::commit_erase() {
|
|||
else
|
||||
drawP.world.undo.push_on_last(std::make_unique<EditTransformCanvasComponentWorldUndoAction>(std::move(oldData.copyData->obj), oldData.copyData->coords, drawP.world.undo.get_undoid_from_netid(comp->obj.get_net_id())));
|
||||
}
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
erasedComponents.clear();
|
||||
updatedComponents.clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,10 +59,10 @@ void LineDrawTool::commit_data(bool final) {
|
|||
}
|
||||
containerPtr->commit_update(drawP);
|
||||
if(final) {
|
||||
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||
drawP.world.send_reliable_multi_command_to_all([&]() {
|
||||
drawP.send_transforms_for({objInfoBeingEdited});
|
||||
containerPtr->send_comp_update(drawP, final);
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
}
|
||||
else
|
||||
containerPtr->send_comp_update(drawP, final);
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ void World::init_client(const std::string& serverFullID) {
|
|||
netClient = std::make_shared<NetClient>(serverFullID);
|
||||
lastKeepAliveSent = std::chrono::steady_clock::now();
|
||||
NetLibrary::register_client(netClient);
|
||||
netObjMan.set_client(netClient, SERVER_UPDATE_NETWORK_OBJECT, SERVER_UPDATE_MANY_NETWORK_OBJECTS);
|
||||
netObjMan.set_client(netClient, SERVER_UPDATE_NETWORK_OBJECT);
|
||||
set_name("");
|
||||
|
||||
rMan.init_client_callbacks();
|
||||
|
|
@ -179,15 +179,21 @@ void World::init_client(const std::string& serverFullID) {
|
|||
netClient->add_recv_callback(CLIENT_UPDATE_NETWORK_OBJECT, [&](cereal::PortableBinaryInputArchive& message) {
|
||||
netObjMan.read_update_message(message, nullptr);
|
||||
});
|
||||
netClient->add_recv_callback(CLIENT_UPDATE_MANY_NETWORK_OBJECTS, [&](cereal::PortableBinaryInputArchive& message) {
|
||||
netObjMan.read_many_update_message(message, nullptr);
|
||||
});
|
||||
netClient->add_recv_callback(CLIENT_KEEP_ALIVE, [&](cereal::PortableBinaryInputArchive& message) {
|
||||
});
|
||||
|
||||
netClient->send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_INITIAL_DATA, main.conf.displayName);
|
||||
}
|
||||
|
||||
void World::send_reliable_multi_command_to_all(const std::function<void()>& captureSendBlock) {
|
||||
if(netServer)
|
||||
netServer->send_multi_command_to_all_clients(RELIABLE_COMMAND_CHANNEL, captureSendBlock);
|
||||
else if(netClient)
|
||||
netClient->send_multi_command_to_server(RELIABLE_COMMAND_CHANNEL, captureSendBlock);
|
||||
else
|
||||
captureSendBlock();
|
||||
}
|
||||
|
||||
void World::focus_update() {
|
||||
if(!clientStillConnecting) {
|
||||
delayedUpdateObjectManager.update(netObjMan);
|
||||
|
|
@ -417,7 +423,7 @@ void World::start_hosting(const std::string& initNetSource, const std::string& s
|
|||
netServer = std::make_shared<NetServer>(serverLocalID);
|
||||
lastKeepAliveSent = std::chrono::steady_clock::now();
|
||||
NetLibrary::register_server(netServer);
|
||||
netObjMan.set_server(netServer, CLIENT_UPDATE_NETWORK_OBJECT, CLIENT_UPDATE_MANY_NETWORK_OBJECTS);
|
||||
netObjMan.set_server(netServer, CLIENT_UPDATE_NETWORK_OBJECT);
|
||||
netSource = initNetSource;
|
||||
rMan.init_server_callbacks();
|
||||
drawProg.init_server_callbacks();
|
||||
|
|
@ -455,9 +461,6 @@ void World::start_hosting(const std::string& initNetSource, const std::string& s
|
|||
netServer->add_recv_callback(SERVER_UPDATE_NETWORK_OBJECT, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||
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_disconnect_callback([&](std::shared_ptr<NetServer::ClientData> client) {
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ class World {
|
|||
void set_has_unsaved_local_changes(bool newHasUnsavedLocalChangesVal);
|
||||
bool is_focus();
|
||||
void set_to_layout_gui_if_focus();
|
||||
void send_reliable_multi_command_to_all(const std::function<void()>& captureSendBlock);
|
||||
|
||||
NetworkingObjects::DelayUpdateSerializedClassManager delayedUpdateObjectManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -76,14 +76,14 @@ void WorldUndoManager::undo() {
|
|||
|
||||
bool undoFail = false;
|
||||
|
||||
world.netObjMan.send_multi_update_messsage([&]() {
|
||||
world.send_reliable_multi_command_to_all([&]() {
|
||||
for(auto& u : std::views::reverse(undoQueue.back())) {
|
||||
if(!u->undo(*this)) {
|
||||
undoFail = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
|
||||
if(undoFail) {
|
||||
clear();
|
||||
|
|
@ -106,14 +106,14 @@ void WorldUndoManager::redo() {
|
|||
world.bMan.refresh_gui_data();
|
||||
|
||||
bool redoFail = false;
|
||||
world.netObjMan.send_multi_update_messsage([&]() {
|
||||
world.send_reliable_multi_command_to_all([&]() {
|
||||
for(auto& u : redoQueue.back()) {
|
||||
if(!u->redo(*this)) {
|
||||
redoFail = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
});
|
||||
|
||||
if(redoFail) {
|
||||
clear();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue