copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improved transform and clipboard paste performance, and share memory between copied brush strokes in some instances

Browse source
This commit is contained in:
Yousef Khadadeh 2025-07-29 14:11:36 +03:00
parent c499f597d9
commit 1d0a7fc495
15 changed files with 115 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/DrawingProgram/BrushTool.cpp
View file

@ -24,7 +24,7 @@ void BrushTool::reset_tool() {
}
bool BrushTool::extensive_point_checking(const Vector2f& newPoint) {
auto& points = controls.intermediateItem->d.points;
auto& points = controls.intermediateItem->d->points;
if(points.size() >= 1 && (newPoint - points[points.size() - 1].pos).norm() < MINIMUM_DISTANCE_TO_NEXT_POINT)
return false;
if(points.size() >= 2 && (newPoint - points[points.size() - 2].pos).norm() < MINIMUM_DISTANCE_TO_NEXT_POINT)
@ -35,7 +35,7 @@ bool BrushTool::extensive_point_checking(const Vector2f& newPoint) {
}
bool BrushTool::extensive_point_checking_back(const Vector2f& newPoint) {
auto& points = controls.intermediateItem->d.points;
auto& points = controls.intermediateItem->d->points;
if(points.size() >= 2 && (newPoint - points[points.size() - 2].pos).norm() < MINIMUM_DISTANCE_TO_NEXT_POINT)
return false;
if(points.size() >= 3 && (newPoint - points[points.size() - 3].pos).norm() < MINIMUM_DISTANCE_TO_NEXT_POINT)
@ -100,9 +100,9 @@ void BrushTool::tool_update() {
p.pos = drawP.world.main.input.mouse.pos;
p.width = drawP.controls.relativeWidth * controls.penWidth;
controls.prevPointUnaltered = p.pos;
controls.intermediateItem->d.points.emplace_back(p);
controls.intermediateItem->d.color = drawP.controls.foregroundColor;
controls.intermediateItem->d.hasRoundCaps = controls.hasRoundCaps;
controls.intermediateItem->d->points.emplace_back(p);
controls.intermediateItem->d->color = drawP.controls.foregroundColor;
controls.intermediateItem->d->hasRoundCaps = controls.hasRoundCaps;
controls.intermediateItem->coords = drawP.world.drawData.cam.c;
controls.intermediateItem->lastUpdateTime = std::chrono::steady_clock::now();
uint64_t placement = drawP.components.client_list().size();
@ -123,29 +123,29 @@ void BrushTool::tool_update() {
if(!controls.addedTemporaryPoint) {
if(extensive_point_checking(p.pos)) {
controls.intermediateItem->d.points.emplace_back(p);
controls.intermediateItem->d->points.emplace_back(p);
controls.addedTemporaryPoint = true;
}
else
controls.intermediateItem->d.points.back().width = std::max(controls.intermediateItem->d.points.back().width, p.width);
controls.intermediateItem->d->points.back().width = std::max(controls.intermediateItem->d->points.back().width, p.width);
}
if(controls.addedTemporaryPoint) {
const DrawBrushStrokePoint& prevP = controls.intermediateItem->d.points[controls.intermediateItem->d.points.size() - 2];
const DrawBrushStrokePoint& prevP = controls.intermediateItem->d->points[controls.intermediateItem->d->points.size() - 2];
float distToPrev = (p.pos - prevP.pos).norm();
if(extensive_point_checking_back(p.pos)) {
controls.intermediateItem->d.points.back().pos = p.pos;
controls.intermediateItem->d.points.back().width = std::max(controls.intermediateItem->d.points.back().width, p.width);
controls.intermediateItem->d.points[controls.intermediateItem->d.points.size() - 2].width = std::max(controls.intermediateItem->d.points[controls.intermediateItem->d.points.size() - 2].width, p.width);
controls.intermediateItem->d->points.back().pos = p.pos;
controls.intermediateItem->d->points.back().width = std::max(controls.intermediateItem->d->points.back().width, p.width);
controls.intermediateItem->d->points[controls.intermediateItem->d->points.size() - 2].width = std::max(controls.intermediateItem->d->points[controls.intermediateItem->d->points.size() - 2].width, p.width);
}
if((!controls.drawingMinimumRelativeToSize && distToPrev >= 10.0) || (controls.drawingMinimumRelativeToSize && distToPrev >= drawP.controls.relativeWidth * DRAW_MINIMUM_LIMIT)) {
controls.intermediateItem->d.points.back() = p;
controls.intermediateItem->d->points.back() = p;
controls.addedTemporaryPoint = false;
controls.intermediateItem->client_send_update_temp(drawP);
if(controls.midwayInterpolation) {
if(controls.intermediateItem->d.points.size() != 2) // Don't interpolate the first point
controls.intermediateItem->d.points[controls.intermediateItem->d.points.size() - 2].pos = (controls.prevPointUnaltered + p.pos) * 0.5;
if(controls.intermediateItem->d->points.size() != 2) // Don't interpolate the first point
controls.intermediateItem->d->points[controls.intermediateItem->d->points.size() - 2].pos = (controls.prevPointUnaltered + p.pos) * 0.5;
controls.prevPointUnaltered = p.pos;
}
}
@ -174,7 +174,7 @@ bool BrushTool::prevent_undo_or_redo() {
void BrushTool::commit_stroke() {
if(controls.intermediateItem && controls.intermediateItem->collabListInfo.lock()) {
if(!controls.intermediateItem->d.points.empty()) {
if(!controls.intermediateItem->d->points.empty()) {
controls.intermediateItem->client_send_update_final(drawP);
controls.intermediateItem->final_update(drawP);
}

4
src/DrawingProgram/DrawingProgram.cpp
View file

@ -106,7 +106,7 @@ void DrawingProgram::init_client_callbacks() {
return;
comp->coords = coords;
objsActuallyTransformed++;
comp->finalize_update(*this, false);
comp->transform_update(*this, false);
});
if(objsActuallyTransformed != 0)
force_rebuild_cache();
@ -120,7 +120,7 @@ void DrawingProgram::init_client_callbacks() {
if(comp->coords == coords)
return;
comp->coords = coords;
comp->finalize_update(*this); // No need to update draw data during transformation
comp->transform_update(*this);
}
}
});

10
src/DrawingProgram/DrawingProgramSelection.cpp
View file

@ -94,7 +94,7 @@ void DrawingProgramSelection::deselect_all() {
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->finalize_update(drawP, false);
obj->obj->transform_update(drawP, false);
}, isSingleThread);
if(!isSingleThread)
drawP.force_rebuild_cache();
@ -128,7 +128,7 @@ void DrawingProgramSelection::deselect_all() {
parallel_loop_container(transformsFrom, [&](auto& p) {
auto& [comp, coords] = p;
comp->obj->coords = coords;
comp->obj->finalize_update(drawP, isSingleThread);
comp->obj->transform_update(drawP, isSingleThread);
}, isSingleThread);
DrawComponent::client_send_transform_many(drawP, transformsToSend);
@ -154,7 +154,7 @@ void DrawingProgramSelection::deselect_all() {
parallel_loop_container(transformsTo, [&](auto& p) {
auto& [comp, coords] = p;
comp->obj->coords = coords;
comp->obj->finalize_update(drawP, isSingleThread);
comp->obj->transform_update(drawP, isSingleThread);
}, isSingleThread);
DrawComponent::client_send_transform_many(drawP, transformsToSend);
@ -328,13 +328,13 @@ void DrawingProgramSelection::paste_clipboard() {
for(auto& r : clipboard.resources)
resourceRemapIDs[r.first] = drawP.world.rMan.add_resource(r.second);
for(auto& c : clipboard.components)
placedComponents.emplace_back(c->copy());
placedComponents.emplace_back(c->deep_copy());
drawP.addToCompCacheOnInsert = false;
auto compListInserted = drawP.components.client_insert_ordered_vector_items(allPlacement, placedComponents);
parallel_loop_container(compListInserted, [&](auto& c) {
c->obj->remap_resource_ids(resourceRemapIDs);
c->obj->coords.translate(-moveVec);
c->obj->final_update(drawP, false);
c->obj->transform_update(drawP, false);
});
DrawComponent::client_send_place_many(drawP, compListInserted);
drawP.addToCompCacheOnInsert = true;