Added erase many and place many canvas undo
This commit is contained in:
parent
2dec0ab2c5
commit
279801623d
7 changed files with 291 additions and 10 deletions
|
|
@ -45,6 +45,10 @@ void CanvasComponentContainer::register_class(World& w) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CanvasComponentContainer::reassign_netobj_ids_call() {
|
||||||
|
compAllocator.reassign_ids();
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<CanvasComponentContainer::CopyData> CanvasComponentContainer::get_data_copy() const {
|
std::unique_ptr<CanvasComponentContainer::CopyData> CanvasComponentContainer::get_data_copy() const {
|
||||||
auto toRet = std::make_unique<CanvasComponentContainer::CopyData>();
|
auto toRet = std::make_unique<CanvasComponentContainer::CopyData>();
|
||||||
toRet->coords = coords;
|
toRet->coords = coords;
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ class CanvasComponentContainer {
|
||||||
CanvasComponentContainer(NetworkingObjects::NetObjManager& objMan, const CopyData& copyData);
|
CanvasComponentContainer(NetworkingObjects::NetObjManager& objMan, const CopyData& copyData);
|
||||||
|
|
||||||
static void register_class(World& w);
|
static void register_class(World& w);
|
||||||
|
void reassign_netobj_ids_call();
|
||||||
std::unique_ptr<CopyData> get_data_copy() const;
|
std::unique_ptr<CopyData> get_data_copy() const;
|
||||||
void save_file(cereal::PortableBinaryOutputArchive& a) const;
|
void save_file(cereal::PortableBinaryOutputArchive& a) const;
|
||||||
void load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version, NetworkingObjects::NetObjManager& objMan);
|
void load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version, NetworkingObjects::NetObjManager& objMan);
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ DrawingProgramLayerListItem::DrawingProgramLayerListItem(World& w, const Drawing
|
||||||
auto& initFolderList = initData.folderData.value();
|
auto& initFolderList = initData.folderData.value();
|
||||||
folderData = std::make_unique<DrawingProgramLayerFolder>();
|
folderData = std::make_unique<DrawingProgramLayerFolder>();
|
||||||
folderData->folderList = w.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>>();
|
folderData->folderList = w.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>>();
|
||||||
|
w.undo.register_new_netid_to_existing_undoid(initData.containerUndoID, folderData->folderList.get_net_id());
|
||||||
for(auto& initFolder : initFolderList) {
|
for(auto& initFolder : initFolderList) {
|
||||||
auto it = folderData->folderList->emplace_back_direct(folderData->folderList, w, initFolder);
|
auto it = folderData->folderList->emplace_back_direct(folderData->folderList, w, initFolder);
|
||||||
w.undo.register_new_netid_to_existing_undoid(initFolder.undoID, it->obj.get_net_id());
|
w.undo.register_new_netid_to_existing_undoid(initFolder.undoID, it->obj.get_net_id());
|
||||||
|
|
@ -48,6 +49,7 @@ DrawingProgramLayerListItem::DrawingProgramLayerListItem(World& w, const Drawing
|
||||||
auto& initComponentList = initData.layerData.value();
|
auto& initComponentList = initData.layerData.value();
|
||||||
layerData = std::make_unique<DrawingProgramLayer>();
|
layerData = std::make_unique<DrawingProgramLayer>();
|
||||||
layerData->components = w.netObjMan.make_obj<CanvasComponentContainer::NetList>();
|
layerData->components = w.netObjMan.make_obj<CanvasComponentContainer::NetList>();
|
||||||
|
w.undo.register_new_netid_to_existing_undoid(initData.containerUndoID, layerData->components.get_net_id());
|
||||||
for(auto& initComponent : initComponentList) {
|
for(auto& initComponent : initComponentList) {
|
||||||
auto it = layerData->components->emplace_back_direct(layerData->components, w.netObjMan, *initComponent.copyData);
|
auto it = layerData->components->emplace_back_direct(layerData->components, w.netObjMan, *initComponent.copyData);
|
||||||
w.undo.register_new_netid_to_existing_undoid(initComponent.undoID, it->obj.get_net_id());
|
w.undo.register_new_netid_to_existing_undoid(initComponent.undoID, it->obj.get_net_id());
|
||||||
|
|
@ -66,6 +68,7 @@ DrawingProgramLayerListItemUndoData DrawingProgramLayerListItem::get_undo_data(W
|
||||||
toRet.metaInfo.blendMode = displayData->blendMode;
|
toRet.metaInfo.blendMode = displayData->blendMode;
|
||||||
toRet.metaInfo.alpha = displayData->alpha;
|
toRet.metaInfo.alpha = displayData->alpha;
|
||||||
if(folderData) {
|
if(folderData) {
|
||||||
|
toRet.containerUndoID = u.get_undoid_from_netid(folderData->folderList.get_net_id());
|
||||||
toRet.folderData = std::vector<DrawingProgramLayerListItemUndoData>();
|
toRet.folderData = std::vector<DrawingProgramLayerListItemUndoData>();
|
||||||
auto& folderListToRet = toRet.folderData.value();
|
auto& folderListToRet = toRet.folderData.value();
|
||||||
for(auto& f : *folderData->folderList) {
|
for(auto& f : *folderData->folderList) {
|
||||||
|
|
@ -74,6 +77,7 @@ DrawingProgramLayerListItemUndoData DrawingProgramLayerListItem::get_undo_data(W
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
toRet.containerUndoID = u.get_undoid_from_netid(layerData->components.get_net_id());
|
||||||
toRet.layerData = std::vector<DrawingProgramComponentUndoData>();
|
toRet.layerData = std::vector<DrawingProgramComponentUndoData>();
|
||||||
auto& layerListToRet = toRet.layerData.value();
|
auto& layerListToRet = toRet.layerData.value();
|
||||||
for(auto& c : *layerData->components)
|
for(auto& c : *layerData->components)
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ struct DrawingProgramLayerListItemMetaInfo {
|
||||||
|
|
||||||
struct DrawingProgramLayerListItemUndoData {
|
struct DrawingProgramLayerListItemUndoData {
|
||||||
WorldUndoManager::UndoObjectID undoID;
|
WorldUndoManager::UndoObjectID undoID;
|
||||||
|
WorldUndoManager::UndoObjectID containerUndoID; // Contains either the undoID of folderData->folderList, or layerData->components. Allows for undo to directly point to those two containers
|
||||||
DrawingProgramLayerListItemMetaInfo metaInfo;
|
DrawingProgramLayerListItemMetaInfo metaInfo;
|
||||||
std::optional<std::vector<DrawingProgramLayerListItemUndoData>> folderData;
|
std::optional<std::vector<DrawingProgramLayerListItemUndoData>> folderData;
|
||||||
std::optional<std::vector<DrawingProgramComponentUndoData>> layerData;
|
std::optional<std::vector<DrawingProgramComponentUndoData>> layerData;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
#include "DrawingProgramLayerManager.hpp"
|
#include "DrawingProgramLayerManager.hpp"
|
||||||
#include "../../World.hpp"
|
#include "../../World.hpp"
|
||||||
|
#include "Helpers/NetworkingObjects/NetObjID.hpp"
|
||||||
#include "Helpers/NetworkingObjects/NetObjOrderedList.hpp"
|
#include "Helpers/NetworkingObjects/NetObjOrderedList.hpp"
|
||||||
#include "Helpers/NetworkingObjects/NetObjOwnerPtr.decl.hpp"
|
#include "Helpers/NetworkingObjects/NetObjOwnerPtr.decl.hpp"
|
||||||
|
#include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
|
||||||
#include "Helpers/Parallel.hpp"
|
#include "Helpers/Parallel.hpp"
|
||||||
#include "../../CanvasComponents/CanvasComponentContainer.hpp"
|
#include "../../CanvasComponents/CanvasComponentContainer.hpp"
|
||||||
#include "../../CanvasComponents/CanvasComponentAllocator.hpp"
|
#include "../../CanvasComponents/CanvasComponentAllocator.hpp"
|
||||||
|
|
@ -94,10 +96,14 @@ bool DrawingProgramLayerManager::component_passes_layer_selector(CanvasComponent
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<CanvasComponentContainer::ObjInfoIterator> DrawingProgramLayerManager::add_many_components_to_layer_being_edited(const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs) {
|
std::vector<CanvasComponentContainer::ObjInfoIterator> DrawingProgramLayerManager::add_many_components_to_layer_being_edited(const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs) {
|
||||||
|
if(!newObjs.empty()) {
|
||||||
auto editLayerPtr = editingLayer.lock();
|
auto editLayerPtr = editingLayer.lock();
|
||||||
if(!editLayerPtr)
|
if(!editLayerPtr)
|
||||||
return {};
|
return {};
|
||||||
return editLayerPtr->get_layer().components->insert_ordered_list_and_send_create(editLayerPtr->get_layer().components, newObjs);
|
auto toRet = editLayerPtr->get_layer().components->insert_ordered_list_and_send_create(editLayerPtr->get_layer().components, newObjs);
|
||||||
|
add_undo_place_components(editingLayer.lock().get(), toRet);
|
||||||
|
}
|
||||||
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
CanvasComponentContainer::ObjInfo* DrawingProgramLayerManager::add_component_to_layer_being_edited(CanvasComponentContainer* newObj) {
|
CanvasComponentContainer::ObjInfo* DrawingProgramLayerManager::add_component_to_layer_being_edited(CanvasComponentContainer* newObj) {
|
||||||
|
|
@ -144,3 +150,258 @@ void DrawingProgramLayerManager::save_file(cereal::PortableBinaryOutputArchive&
|
||||||
void DrawingProgramLayerManager::get_used_resources(std::unordered_set<NetworkingObjects::NetObjID>& resourceSet) {
|
void DrawingProgramLayerManager::get_used_resources(std::unordered_set<NetworkingObjects::NetObjID>& resourceSet) {
|
||||||
layerTreeRoot->get_used_resources(resourceSet);
|
layerTreeRoot->get_used_resources(resourceSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::add_undo_place_component(CanvasComponentContainer::ObjInfo* objInfo) {
|
||||||
|
using namespace NetworkingObjects;
|
||||||
|
class AddCanvasComponentWorldUndoAction : public WorldUndoAction {
|
||||||
|
public:
|
||||||
|
AddCanvasComponentWorldUndoAction(std::unique_ptr<CanvasComponentContainer::CopyData> initCopyData, uint32_t newPos, WorldUndoManager::UndoObjectID initUndoID, WorldUndoManager::UndoObjectID initComponentListUndoID):
|
||||||
|
copyData(std::move(initCopyData)),
|
||||||
|
pos(newPos),
|
||||||
|
undoID(initUndoID),
|
||||||
|
componentListUndoID(initComponentListUndoID)
|
||||||
|
{}
|
||||||
|
std::string get_name() const override {
|
||||||
|
return "Add Canvas Object";
|
||||||
|
}
|
||||||
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
|
std::optional<NetObjID> toEraseID = undoMan.get_netid_from_undoid(undoID);
|
||||||
|
if(!toEraseID.has_value())
|
||||||
|
return false;
|
||||||
|
std::optional<NetObjID> toEraseCompListID = undoMan.get_netid_from_undoid(componentListUndoID);
|
||||||
|
if(!toEraseCompListID.has_value())
|
||||||
|
return false;
|
||||||
|
auto compList = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(toEraseCompListID.value());
|
||||||
|
compList->erase(compList, compList->get(toEraseID.value()));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
bool redo(WorldUndoManager& undoMan) override {
|
||||||
|
std::optional<NetworkingObjects::NetObjID> toInsertID = undoMan.get_netid_from_undoid(undoID);
|
||||||
|
if(toInsertID.has_value())
|
||||||
|
return false;
|
||||||
|
std::optional<NetObjID> toEraseCompListID = undoMan.get_netid_from_undoid(componentListUndoID);
|
||||||
|
if(!toEraseCompListID.has_value())
|
||||||
|
return false;
|
||||||
|
auto compList = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(toEraseCompListID.value());
|
||||||
|
auto insertedIt = compList->emplace_direct(compList, compList->at(pos), undoMan.world.netObjMan, *copyData);
|
||||||
|
undoMan.register_new_netid_to_existing_undoid(undoID, insertedIt->obj.get_net_id());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
void scale_up(const WorldScalar& scaleAmount) override {
|
||||||
|
copyData->scale_up(scaleAmount);
|
||||||
|
}
|
||||||
|
~AddCanvasComponentWorldUndoAction() {}
|
||||||
|
|
||||||
|
std::unique_ptr<CanvasComponentContainer::CopyData> copyData;
|
||||||
|
uint32_t pos;
|
||||||
|
WorldUndoManager::UndoObjectID undoID;
|
||||||
|
WorldUndoManager::UndoObjectID componentListUndoID;
|
||||||
|
};
|
||||||
|
|
||||||
|
drawP.world.undo.push(std::make_unique<AddCanvasComponentWorldUndoAction>(objInfo->obj->get_data_copy(), objInfo->pos, drawP.world.undo.get_undoid_from_netid(objInfo->obj.get_net_id()), drawP.world.undo.get_undoid_from_netid(objInfo->obj->parentLayer->get_layer().components.get_net_id())));
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::erase_component_map(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap) {
|
||||||
|
add_undo_erase_components(eraseMap);
|
||||||
|
drawP.world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
|
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) {
|
||||||
|
using namespace NetworkingObjects;
|
||||||
|
|
||||||
|
struct EraseListData {
|
||||||
|
std::vector<WorldUndoManager::UndoObjectID> undoID;
|
||||||
|
std::vector<uint32_t> pos;
|
||||||
|
std::vector<std::unique_ptr<CanvasComponentContainer::CopyData>> copyData;
|
||||||
|
};
|
||||||
|
|
||||||
|
class EraseCanvasComponentsWorldUndoAction : public WorldUndoAction {
|
||||||
|
public:
|
||||||
|
EraseCanvasComponentsWorldUndoAction(std::unordered_map<WorldUndoManager::UndoObjectID, EraseListData> initEraseMap):
|
||||||
|
undoEraseMap(std::move(initEraseMap))
|
||||||
|
{}
|
||||||
|
std::string get_name() const override {
|
||||||
|
return "Erase Canvas Objects";
|
||||||
|
}
|
||||||
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
|
struct InsertData {
|
||||||
|
std::vector<NetObjOrderedListIterator<CanvasComponentContainer>> it;
|
||||||
|
std::vector<std::unique_ptr<CanvasComponentContainer::CopyData>>* copyData;
|
||||||
|
std::vector<WorldUndoManager::UndoObjectID>* undoID;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unordered_map<NetObjID, InsertData> insertMap;
|
||||||
|
|
||||||
|
{
|
||||||
|
for(auto& [parentUndoID, eData] : undoEraseMap) {
|
||||||
|
std::optional<NetObjID> parentNetID = undoMan.get_netid_from_undoid(parentUndoID);
|
||||||
|
if(!parentNetID)
|
||||||
|
return false;
|
||||||
|
auto& insertData = insertMap[parentNetID.value()];
|
||||||
|
auto parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID.value());
|
||||||
|
insertData.it = parentListPtr->at_ordered_indices(eData.pos);
|
||||||
|
insertData.copyData = &eData.copyData;
|
||||||
|
insertData.undoID = &eData.undoID;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
undoMan.world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
|
for(auto& [parentNetID, insertData] : insertMap) {
|
||||||
|
auto parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID);
|
||||||
|
std::vector<std::pair<NetObjOrderedListIterator<CanvasComponentContainer>, NetObjOwnerPtr<CanvasComponentContainer>>> toInsert(insertData.it.size());
|
||||||
|
for(size_t i = 0; i < insertData.it.size(); i++) {
|
||||||
|
toInsert[i].first = insertData.it[i];
|
||||||
|
toInsert[i].second = undoMan.world.netObjMan.make_obj_direct<CanvasComponentContainer>(undoMan.world.netObjMan, *insertData.copyData->at(i));
|
||||||
|
undoMan.register_new_netid_to_existing_undoid(insertData.undoID->at(i), toInsert[i].second.get_net_id());
|
||||||
|
}
|
||||||
|
parentListPtr->insert_ordered_list_and_send_create(parentListPtr, toInsert);
|
||||||
|
}
|
||||||
|
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
bool redo(WorldUndoManager& undoMan) override {
|
||||||
|
std::unordered_map<NetObjID, std::vector<NetObjOrderedListIterator<CanvasComponentContainer>>> eraseMap;
|
||||||
|
|
||||||
|
{
|
||||||
|
for(auto& [parentUndoID, eData] : undoEraseMap) {
|
||||||
|
std::optional<NetObjID> parentNetID = undoMan.get_netid_from_undoid(parentUndoID);
|
||||||
|
if(!parentNetID)
|
||||||
|
return false;
|
||||||
|
auto& eraseData = eraseMap[parentNetID.value()];
|
||||||
|
auto parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID.value());
|
||||||
|
std::vector<NetObjID> netIDList;
|
||||||
|
if(!undoMan.fill_netid_list_from_undoid_list(netIDList, eData.undoID))
|
||||||
|
return false;
|
||||||
|
eraseData = parentListPtr->get_list(netIDList);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
undoMan.world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
|
for(auto& [parentNetID, eData] : eraseMap) {
|
||||||
|
auto parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID);
|
||||||
|
parentListPtr->erase_list(parentListPtr, eData);
|
||||||
|
}
|
||||||
|
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
void scale_up(const WorldScalar& scaleAmount) override {
|
||||||
|
for(auto& [undoID, eData] : undoEraseMap) {
|
||||||
|
for(auto& c : eData.copyData)
|
||||||
|
c->scale_up(scaleAmount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
~EraseCanvasComponentsWorldUndoAction() {}
|
||||||
|
|
||||||
|
std::unordered_map<WorldUndoManager::UndoObjectID, EraseListData> undoEraseMap;
|
||||||
|
};
|
||||||
|
|
||||||
|
auto& undoMan = drawP.world.undo;
|
||||||
|
std::unordered_map<WorldUndoManager::UndoObjectID, EraseListData> undoMap;
|
||||||
|
for(auto& [item, compContainer] : eraseMap) {
|
||||||
|
auto& undoData = undoMap[undoMan.get_undoid_from_netid(item->get_layer().components.get_net_id())];
|
||||||
|
// Vectors must be sorted
|
||||||
|
uint32_t i = 0;
|
||||||
|
for(auto& comp : compContainer) {
|
||||||
|
undoData.undoID.emplace_back(undoMan.get_undoid_from_netid(comp->obj.get_net_id()));
|
||||||
|
undoData.copyData.emplace_back(comp->obj->get_data_copy());
|
||||||
|
undoData.pos.emplace_back(comp->pos - i);
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
undoMan.push(std::make_unique<EraseCanvasComponentsWorldUndoAction>(std::move(undoMap)));
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList) {
|
||||||
|
using namespace NetworkingObjects;
|
||||||
|
|
||||||
|
struct PlaceListData {
|
||||||
|
std::vector<WorldUndoManager::UndoObjectID> undoID;
|
||||||
|
std::vector<uint32_t> pos;
|
||||||
|
std::vector<std::unique_ptr<CanvasComponentContainer::CopyData>> copyData;
|
||||||
|
};
|
||||||
|
|
||||||
|
class PlaceCanvasComponentsWorldUndoAction : public WorldUndoAction {
|
||||||
|
public:
|
||||||
|
PlaceCanvasComponentsWorldUndoAction(WorldUndoManager::UndoObjectID parentList, PlaceListData initPlaceData):
|
||||||
|
parentUndoID(parentList),
|
||||||
|
undoPlaceData(std::move(initPlaceData))
|
||||||
|
{}
|
||||||
|
std::string get_name() const override {
|
||||||
|
return "Place Canvas Objects";
|
||||||
|
}
|
||||||
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
|
NetObjTemporaryPtr<NetObjOrderedList<CanvasComponentContainer>> parentListPtr;
|
||||||
|
std::vector<NetObjOrderedListIterator<CanvasComponentContainer>> eraseData;
|
||||||
|
|
||||||
|
{
|
||||||
|
std::optional<NetObjID> parentNetID = undoMan.get_netid_from_undoid(parentUndoID);
|
||||||
|
if(!parentNetID)
|
||||||
|
return false;
|
||||||
|
parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID.value());
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
std::vector<NetObjID> netIDList;
|
||||||
|
if(!undoMan.fill_netid_list_from_undoid_list(netIDList, undoPlaceData.undoID))
|
||||||
|
return false;
|
||||||
|
eraseData = parentListPtr->get_list(netIDList);
|
||||||
|
}
|
||||||
|
|
||||||
|
parentListPtr->erase_list(parentListPtr, eraseData);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
bool redo(WorldUndoManager& undoMan) override {
|
||||||
|
std::vector<NetObjOrderedListIterator<CanvasComponentContainer>> it;
|
||||||
|
NetObjTemporaryPtr<NetObjOrderedList<CanvasComponentContainer>> parentListPtr;
|
||||||
|
|
||||||
|
{
|
||||||
|
std::optional<NetObjID> parentNetID = undoMan.get_netid_from_undoid(parentUndoID);
|
||||||
|
if(!parentNetID)
|
||||||
|
return false;
|
||||||
|
parentListPtr = undoMan.world.netObjMan.get_obj_temporary_ref_from_id<NetObjOrderedList<CanvasComponentContainer>>(parentNetID.value());
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
it = parentListPtr->at_ordered_indices(undoPlaceData.pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::pair<NetObjOrderedListIterator<CanvasComponentContainer>, NetObjOwnerPtr<CanvasComponentContainer>>> toInsert(it.size());
|
||||||
|
for(size_t i = 0; i < it.size(); i++) {
|
||||||
|
toInsert[i].first = it[i];
|
||||||
|
toInsert[i].second = undoMan.world.netObjMan.make_obj_direct<CanvasComponentContainer>(undoMan.world.netObjMan, *undoPlaceData.copyData.at(i));
|
||||||
|
undoMan.register_new_netid_to_existing_undoid(undoPlaceData.undoID.at(i), toInsert[i].second.get_net_id());
|
||||||
|
}
|
||||||
|
parentListPtr->insert_ordered_list_and_send_create(parentListPtr, toInsert);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
void scale_up(const WorldScalar& scaleAmount) override {
|
||||||
|
for(auto& c : undoPlaceData.copyData)
|
||||||
|
c->scale_up(scaleAmount);
|
||||||
|
}
|
||||||
|
~PlaceCanvasComponentsWorldUndoAction() {}
|
||||||
|
|
||||||
|
WorldUndoManager::UndoObjectID parentUndoID;
|
||||||
|
PlaceListData undoPlaceData;
|
||||||
|
};
|
||||||
|
|
||||||
|
auto& undoMan = drawP.world.undo;
|
||||||
|
PlaceListData undoData;
|
||||||
|
// Vectors must be sorted
|
||||||
|
uint32_t i = 0;
|
||||||
|
for(auto& comp : placeList) {
|
||||||
|
undoData.undoID.emplace_back(undoMan.get_undoid_from_netid(comp->obj.get_net_id()));
|
||||||
|
undoData.copyData.emplace_back(comp->obj->get_data_copy());
|
||||||
|
undoData.pos.emplace_back(comp->pos - i);
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
undoMan.push(std::make_unique<PlaceCanvasComponentsWorldUndoAction>(undoMan.get_undoid_from_netid(parent->get_layer().components.get_net_id()), std::move(undoData)));
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@ class DrawingProgramLayerManager {
|
||||||
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
||||||
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
||||||
void set_initial_editing_layer();
|
void set_initial_editing_layer();
|
||||||
|
void add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap);
|
||||||
|
void add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList);
|
||||||
|
void erase_component_map(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap);
|
||||||
bool commitUpdateOnComponentInsert = true;
|
bool commitUpdateOnComponentInsert = true;
|
||||||
public:
|
public:
|
||||||
enum class LayerSelector {
|
enum class LayerSelector {
|
||||||
|
|
@ -28,12 +31,16 @@ class DrawingProgramLayerManager {
|
||||||
bool is_a_layer_being_edited();
|
bool is_a_layer_being_edited();
|
||||||
void scale_up(const WorldScalar& scaleUpAmount);
|
void scale_up(const WorldScalar& scaleUpAmount);
|
||||||
template <typename List> void erase_component_container(const List& compsToErase) {
|
template <typename List> void erase_component_container(const List& compsToErase) {
|
||||||
|
if(!compsToErase.empty()) {
|
||||||
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>> idsToEraseInSpecificLayers;
|
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>> idsToEraseInSpecificLayers;
|
||||||
for(auto& c : compsToErase)
|
for(auto& c : compsToErase)
|
||||||
idsToEraseInSpecificLayers[c->obj->parentLayer].emplace_back(c->obj->objInfo);
|
idsToEraseInSpecificLayers[c->obj->parentLayer].emplace_back(c->obj->objInfo);
|
||||||
for(auto& [layerListItem, netObjSetToErase] : idsToEraseInSpecificLayers) {
|
for(auto& [parent, its] : idsToEraseInSpecificLayers) {
|
||||||
auto& layerComponentList = layerListItem->get_layer().components;
|
std::sort(its.begin(), its.end(), [](auto& a, auto& b) {
|
||||||
layerComponentList->erase_list(layerComponentList, netObjSetToErase);
|
return a->pos < b->pos;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
erase_component_map(idsToEraseInSpecificLayers);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
uint32_t edited_layer_component_count();
|
uint32_t edited_layer_component_count();
|
||||||
|
|
@ -52,5 +59,7 @@ class DrawingProgramLayerManager {
|
||||||
std::vector<CanvasComponentContainer::ObjInfoIterator> add_many_components_to_layer_being_edited(const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs);
|
std::vector<CanvasComponentContainer::ObjInfoIterator> add_many_components_to_layer_being_edited(const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs);
|
||||||
std::vector<CanvasComponentContainer::ObjInfo*> get_flattened_component_list() const;
|
std::vector<CanvasComponentContainer::ObjInfo*> get_flattened_component_list() const;
|
||||||
std::vector<DrawingProgramLayerListItem*> get_flattened_layer_list();
|
std::vector<DrawingProgramLayerListItem*> get_flattened_layer_list();
|
||||||
|
|
||||||
|
void add_undo_place_component(CanvasComponentContainer::ObjInfo* objInfo);
|
||||||
DrawingProgramLayerManagerGUI listGUI;
|
DrawingProgramLayerManagerGUI listGUI;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ void BrushTool::commit_stroke() {
|
||||||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||||
containerPtr->commit_update(drawP);
|
containerPtr->commit_update(drawP);
|
||||||
containerPtr->send_comp_update(drawP, true);
|
containerPtr->send_comp_update(drawP, true);
|
||||||
|
drawP.layerMan.add_undo_place_component(objInfoBeingEdited);
|
||||||
objInfoBeingEdited = nullptr;
|
objInfoBeingEdited = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue