Split mesh on erase
This commit is contained in:
Yousef Khadadeh
parent
20a7e0bc37
commit
c3fa1deee9
8 changed files with 168 additions and 16 deletions
|
|
@ -250,6 +250,12 @@ std::vector<CanvasComponentContainer::ObjInfoIterator> DrawingProgramLayerManage
|
|||
return {};
|
||||
}
|
||||
|
||||
std::vector<CanvasComponentContainer::ObjInfoIterator> DrawingProgramLayerManager::add_many_components_to_layer(DrawingProgramLayerListItem* layer, const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs, bool newUndo) {
|
||||
auto toRet = layer->get_layer().components->insert_sorted_list_and_send_create(layer->get_layer().components, newObjs);
|
||||
add_undo_place_components(layer, toRet, newUndo);
|
||||
return toRet;
|
||||
}
|
||||
|
||||
void DrawingProgramLayerManager::disable_add_to_cache_block(const std::function<void()>& toRun) {
|
||||
addToCacheOnComponentInsert = false;
|
||||
toRun();
|
||||
|
|
@ -368,8 +374,8 @@ void DrawingProgramLayerManager::add_undo_place_component(CanvasComponentContain
|
|||
drawP.world.undo.push(std::make_unique<AddCanvasComponentWorldUndoAction>(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);
|
||||
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([&]() {
|
||||
for(auto& [layerListItem, netObjSetToErase] : eraseMap) {
|
||||
auto& layerComponentList = layerListItem->get_layer().components;
|
||||
|
|
@ -378,7 +384,7 @@ void DrawingProgramLayerManager::erase_component_map(const std::unordered_map<Dr
|
|||
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||
}
|
||||
|
||||
void DrawingProgramLayerManager::add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap) {
|
||||
void DrawingProgramLayerManager::add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap, bool newUndo) {
|
||||
using namespace NetworkingObjects;
|
||||
|
||||
struct EraseListData {
|
||||
|
|
@ -485,10 +491,14 @@ void DrawingProgramLayerManager::add_undo_erase_components(const std::unordered_
|
|||
++i;
|
||||
}
|
||||
}
|
||||
undoMan.push(std::make_unique<EraseCanvasComponentsWorldUndoAction>(std::move(undoMap)));
|
||||
|
||||
if(newUndo)
|
||||
undoMan.push(std::make_unique<EraseCanvasComponentsWorldUndoAction>(std::move(undoMap)));
|
||||
else
|
||||
undoMan.push_on_last(std::make_unique<EraseCanvasComponentsWorldUndoAction>(std::move(undoMap)));
|
||||
}
|
||||
|
||||
void DrawingProgramLayerManager::add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList) {
|
||||
void DrawingProgramLayerManager::add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList, bool newUndo) {
|
||||
using namespace NetworkingObjects;
|
||||
|
||||
struct PlaceListData {
|
||||
|
|
@ -575,5 +585,8 @@ void DrawingProgramLayerManager::add_undo_place_components(DrawingProgramLayerLi
|
|||
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)));
|
||||
if(newUndo)
|
||||
undoMan.push(std::make_unique<PlaceCanvasComponentsWorldUndoAction>(undoMan.get_undoid_from_netid(parent->get_layer().components.get_net_id()), std::move(undoData)));
|
||||
else
|
||||
undoMan.push_on_last(std::make_unique<PlaceCanvasComponentsWorldUndoAction>(undoMan.get_undoid_from_netid(parent->get_layer().components.get_net_id()), std::move(undoData)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ class DrawingProgramLayerManager {
|
|||
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
||||
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
||||
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);
|
||||
void add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap, bool newUndo = true);
|
||||
void add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList, bool newUndo = true);
|
||||
void erase_component_map(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap, bool newUndo = true);
|
||||
bool commitUpdateOnComponentInsert = true;
|
||||
bool addToCacheOnComponentInsert = true;
|
||||
public:
|
||||
|
|
@ -49,7 +49,7 @@ class DrawingProgramLayerManager {
|
|||
void read_components_client(cereal::PortableBinaryInputArchive& a);
|
||||
bool is_a_layer_being_edited();
|
||||
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, bool newUndo = true) {
|
||||
if(!compsToErase.empty()) {
|
||||
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>> idsToEraseInSpecificLayers;
|
||||
for(auto& c : compsToErase)
|
||||
|
|
@ -59,7 +59,7 @@ class DrawingProgramLayerManager {
|
|||
return a->pos < b->pos;
|
||||
});
|
||||
}
|
||||
erase_component_map(idsToEraseInSpecificLayers);
|
||||
erase_component_map(idsToEraseInSpecificLayers, newUndo);
|
||||
}
|
||||
}
|
||||
uint32_t edited_layer_component_count();
|
||||
|
|
@ -80,6 +80,7 @@ class DrawingProgramLayerManager {
|
|||
|
||||
CanvasComponentContainer::ObjInfo* add_component_to_layer_being_edited(CanvasComponentContainer* newObj);
|
||||
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(DrawingProgramLayerListItem* layer, const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs, bool newUndo = true);
|
||||
std::vector<CanvasComponentContainer::ObjInfo*> get_flattened_component_list() const;
|
||||
std::vector<DrawingProgramLayerListItem*> get_flattened_layer_list();
|
||||
void add_undo_place_component(CanvasComponentContainer::ObjInfo* objInfo);
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
#include "../../CanvasComponents/MeshCanvasComponent.hpp"
|
||||
#include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
|
||||
#include "../../CanvasComponents/CanvasComponentContainer.hpp"
|
||||
|
||||
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||
#include "../../GUIStuff/ElementHelpers/CheckBoxHelpers.hpp"
|
||||
#include <include/pathops/SkPathOps.h>
|
||||
|
||||
#define MINIMUM_DISTANCE_FROM_FIRST_POINT 3.0f
|
||||
#define MINIMUM_DISTANCE_TO_NEXT_POINT 0.002f
|
||||
|
|
@ -83,6 +83,11 @@ void BrushTool::commit_data(bool final) {
|
|||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||
MeshCanvasComponent& newMesh = static_cast<MeshCanvasComponent&>(containerPtr->get_comp());
|
||||
newMesh.d.meshPath = BrushComponentCode::brush_stroke_to_skpath(genData.brushPoints, drawP.world.main.toolConfig.brush.hasRoundCaps);
|
||||
if(final) {
|
||||
std::optional<SkPath> simplified = Simplify(newMesh.d.meshPath);
|
||||
if(simplified.has_value())
|
||||
newMesh.d.meshPath = simplified.value();
|
||||
}
|
||||
containerPtr->commit_update(drawP);
|
||||
containerPtr->send_comp_update(drawP, final);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include <include/core/SkPathBuilder.h>
|
||||
#include "../../CanvasComponents/BrushComponentCode.hpp"
|
||||
#include "../EditCanvasComponentWorldUndoAction.hpp"
|
||||
#include <include/pathops/SkPathOps.h>
|
||||
|
||||
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||
#include "../../GUIStuff/ElementHelpers/RadioButtonHelpers.hpp"
|
||||
|
|
@ -88,6 +89,10 @@ void EraserTool::input_mouse_button_on_canvas_callback(const InputManager::Mouse
|
|||
isErasing = true;
|
||||
}
|
||||
else if(!button.down && isErasing) {
|
||||
// If not real time eraser, we can benefit from simplifying the path
|
||||
std::optional<SkPath> simplified = Simplify(erasePath);
|
||||
if(simplified.has_value())
|
||||
erasePath = simplified.value();
|
||||
erase_on_path();
|
||||
reset_erasing_stroke();
|
||||
commit_erase();
|
||||
|
|
@ -202,8 +207,30 @@ void EraserTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp)
|
|||
}
|
||||
|
||||
void EraserTool::commit_erase() {
|
||||
bool first = erasedComponents.empty(); // erase_component_container will call EraserTool::erase_component, which will clear erasedComponents eventually
|
||||
drawP.layerMan.erase_component_container(erasedComponents);
|
||||
bool placedNewObject = false;
|
||||
std::unordered_map<DrawingProgramLayerListItem*, std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>> newObjectsToPlace;
|
||||
std::erase_if(updatedComponents, [&] (auto& p) {
|
||||
auto& [comp, oldData] = p;
|
||||
std::vector<CanvasComponentContainer*> splitComps = comp->obj->get_comp().attempt_split(drawP);
|
||||
if(!splitComps.empty()) {
|
||||
for(CanvasComponentContainer* c : splitComps)
|
||||
newObjectsToPlace[comp->obj->parentLayer].emplace_back(std::next(comp->obj->objInfo), c);
|
||||
placedNewObject = true;
|
||||
erasedComponents.emplace(comp);
|
||||
comp->obj->get_comp().set_data_from(*oldData);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
bool firstPlacement = true;
|
||||
for(auto& [layer, compMap] : newObjectsToPlace) {
|
||||
drawP.layerMan.add_many_components_to_layer(layer, compMap, firstPlacement);
|
||||
firstPlacement = false;
|
||||
}
|
||||
bool objectsToErase = !erasedComponents.empty();
|
||||
if(objectsToErase)
|
||||
drawP.layerMan.erase_component_container(erasedComponents, !placedNewObject);
|
||||
bool first = !objectsToErase && !placedNewObject;
|
||||
for(auto& [comp, oldData] : updatedComponents) {
|
||||
comp->obj->commit_update_dont_invalidate_cache(drawP);
|
||||
comp->obj->send_comp_update(drawP, true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue