Separated transform commit from deselecting, only one undo required to undo a paste operation
This commit is contained in:
parent
a2e4a795f7
commit
2605df6e54
2 changed files with 79 additions and 83 deletions
|
|
@ -92,32 +92,32 @@ void DrawingProgramSelection::calculate_aabb() {
|
|||
}
|
||||
}
|
||||
|
||||
void DrawingProgramSelection::deselect_all(bool readdObjectsToCache) {
|
||||
void DrawingProgramSelection::deselect_all() {
|
||||
if(is_something_selected()) {
|
||||
bool cacheWillRebuildAnyway = selectedSet.size() >= DrawingProgramCache::MINIMUM_COMPONENTS_TO_START_REBUILD;
|
||||
if(cacheWillRebuildAnyway)
|
||||
drawP.force_rebuild_cache();
|
||||
else {
|
||||
for(auto& obj : selectedSet)
|
||||
drawP.compCache.add_component(obj);
|
||||
}
|
||||
reset_selection_data();
|
||||
reset_transform_data();
|
||||
}
|
||||
}
|
||||
|
||||
void DrawingProgramSelection::commit_transform_selection() {
|
||||
auto selectedSetTemp = selectedSet;
|
||||
|
||||
std::vector<CollabListType::ObjectInfoPtr> a(selectedSet.begin(), selectedSet.end());
|
||||
std::vector<std::pair<CollabListType::ObjectInfoPtr, CoordSpaceHelper>> transformsFrom;
|
||||
for(auto& transformedObj : a)
|
||||
transformsFrom.emplace_back(transformedObj, transformedObj->obj->coords);
|
||||
|
||||
reset_selection_data();
|
||||
|
||||
bool isSingleThread = a.size() < DrawingProgramCache::MINIMUM_COMPONENTS_TO_START_REBUILD;
|
||||
parallel_loop_container(a, [&](auto& obj) {
|
||||
obj->obj->coords = selectionTransformCoords.other_coord_space_from_this_space(obj->obj->coords);
|
||||
obj->obj->commit_transform(drawP, false);
|
||||
}, isSingleThread);
|
||||
|
||||
if(readdObjectsToCache) {
|
||||
if(!isSingleThread)
|
||||
drawP.force_rebuild_cache();
|
||||
else {
|
||||
for(auto& obj : a)
|
||||
drawP.compCache.add_component(obj);
|
||||
}
|
||||
}
|
||||
|
||||
reset_transform_data();
|
||||
|
||||
std::vector<std::pair<CollabListType::ObjectInfoPtr, CoordSpaceHelper>> transformsTo;
|
||||
std::vector<std::pair<ServerClientID, CoordSpaceHelper>> transformsToSend;
|
||||
for(auto& transformedObj : a) {
|
||||
|
|
@ -125,7 +125,6 @@ void DrawingProgramSelection::deselect_all(bool readdObjectsToCache) {
|
|||
transformsTo.emplace_back(transformedObj, transformedObj->obj->coords);
|
||||
}
|
||||
DrawComponent::client_send_transform_many(drawP, transformsToSend);
|
||||
|
||||
drawP.world.undo.push(UndoManager::UndoRedoPair{
|
||||
[&, transformsFrom = transformsFrom]() {
|
||||
std::vector<std::pair<ServerClientID, CoordSpaceHelper>> transformsToSend;
|
||||
|
|
@ -176,12 +175,9 @@ void DrawingProgramSelection::deselect_all(bool readdObjectsToCache) {
|
|||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void DrawingProgramSelection::commit_transform_selection() {
|
||||
auto selectedSetTemp = selectedSet;
|
||||
deselect_all(false);
|
||||
reset_selection_data();
|
||||
reset_transform_data();
|
||||
set_to_selection(selectedSetTemp);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class DrawingProgramSelection {
|
|||
public:
|
||||
DrawingProgramSelection(DrawingProgram& initDrawP);
|
||||
void add_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC);
|
||||
void deselect_all(bool readdObjectsToCache = true);
|
||||
void deselect_all();
|
||||
void update();
|
||||
void draw_components(SkCanvas* canvas, const DrawData& drawData);
|
||||
void draw_gui(SkCanvas* canvas, const DrawData& drawData);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue