griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: GPv3: PaintOperation::on_stroke_done

Browse Source 
There were some private methods in `PaintOperation` that
were only called in `PaintOperation::on_stroke_done`. These
don't need to be private methods and can just be static functions.

There was also some code that changed the selection in the
function that was supposed to only trim the end points,
so that functionality is moved to it's own function instead.
This commit is contained in:
Falk David
2024-06-03 19:03:36 +02:00
parent 906fcfb675
commit 8b0b6dd8b5
1 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
source/blender/editors/sculpt_paint/grease_pencil_paint.cc
View File

@@ -139,10 +139,6 @@ class PaintOperation : public GreasePencilStrokeOperation {
void on_stroke_begin(const bContext &C, const InputSample &start_sample) override;
void on_stroke_extended(const bContext &C, const InputSample &extension_sample) override;
void on_stroke_done(const bContext &C) override;
private:
void simplify_stroke(const bContext &C, bke::greasepencil::Drawing &drawing, float epsilon_px);
void process_stroke_end(const bContext &C, bke::greasepencil::Drawing &drawing);
};
/**
@@ -618,8 +614,7 @@ struct PaintOperationExecutor {
this->skipped_attribute_ids(bke::AttrDomain::Point),
curves.points_range().take_back(1));
drawing_->set_texture_matrices(Span<float4x2>(&(self.texture_space_), 1),
IndexMask(IndexRange(active_curve, 1)));
drawing_->set_texture_matrices({self.texture_space_}, IndexRange::from_single(active_curve));
}
void execute(PaintOperation &self, const bContext &C, const InputSample &extension_sample)
@@ -732,16 +727,12 @@ void PaintOperation::on_stroke_extended(const bContext &C, const InputSample &ex
WM_event_add_notifier(&C, NC_GEOM | ND_DATA, grease_pencil);
}
void PaintOperation::simplify_stroke(const bContext &C,
bke::greasepencil::Drawing &drawing,
const float epsilon)
static void simplify_stroke(bke::greasepencil::Drawing &drawing,
const float epsilon,
const int active_curve)
{
const Scene *scene = CTX_data_scene(&C);
const bke::CurvesGeometry &curves = drawing.strokes();
const bool on_back = (scene->toolsettings->gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK) != 0;
const int active_curve = on_back ? curves.curves_range().first() : curves.curves_range().last();
IndexMaskMemory memory;
IndexMask points_to_delete = geometry::simplify_curve_attribute(
curves.positions(),
@@ -770,12 +761,32 @@ void PaintOperation::simplify_stroke(const bContext &C,
}
}
static void remove_points_from_end_of_active_curve(bke::CurvesGeometry &curves,
const bool on_back,
const int rem_points_num)
static void trim_end_points(bke::greasepencil::Drawing &drawing,
const float epsilon,
const bool on_back,
const int active_curve)
{
const IndexRange points = drawing.strokes().points_by_curve()[active_curve];
bke::CurvesGeometry &curves = drawing.strokes_for_write();
const VArray<float> radii = drawing.radii();
/* Remove points at the end that have a radius close to 0. */
int64_t num_points_to_remove = 0;
for (int64_t index = points.last(); index >= points.first(); index--) {
if (radii[index] < epsilon) {
num_points_to_remove++;
}
else {
break;
}
}
if (num_points_to_remove <= 0) {
return;
}
if (!on_back) {
curves.resize(curves.points_num() - rem_points_num, curves.curves_num());
curves.resize(curves.points_num() - num_points_to_remove, curves.curves_num());
curves.offsets_for_write().last() = curves.points_num();
return;
}
@@ -796,52 +807,33 @@ static void remove_points_from_end_of_active_curve(bke::CurvesGeometry &curves,
using T = decltype(dummy);
MutableSpan<T> span_data = attribute_data.typed<T>();
for (int i = last_active_point - rem_points_num + 1;
i < curves.points_num() - rem_points_num;
for (int i = last_active_point - num_points_to_remove + 1;
i < curves.points_num() - num_points_to_remove;
i++)
{
span_data[i] = span_data[i + rem_points_num];
span_data[i] = span_data[i + num_points_to_remove];
}
});
dst.finish();
return true;
});
curves.resize(curves.points_num() - rem_points_num, curves.curves_num());
curves.resize(curves.points_num() - num_points_to_remove, curves.curves_num());
MutableSpan<int> offsets = curves.offsets_for_write();
for (const int src_curve : curves.curves_range().drop_front(1)) {
offsets[src_curve] = offsets[src_curve] - rem_points_num;
offsets[src_curve] = offsets[src_curve] - num_points_to_remove;
}
offsets.last() = curves.points_num();
curves.tag_topology_changed();
}
void PaintOperation::process_stroke_end(const bContext &C, bke::greasepencil::Drawing &drawing)
static void deselect_stroke(const bContext &C,
bke::greasepencil::Drawing &drawing,
const int active_curve)
{
Scene *scene = CTX_data_scene(&C);
const bool on_back = (scene->toolsettings->gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK) != 0;
const int active_curve = on_back ? drawing.strokes().curves_range().first() :
drawing.strokes().curves_range().last();
IndexRange points = drawing.strokes().points_by_curve()[active_curve];
const IndexRange points = drawing.strokes().points_by_curve()[active_curve];
bke::CurvesGeometry &curves = drawing.strokes_for_write();
const VArray<float> radii = drawing.radii();
/* Remove points at the end that have a radius close to 0. */
int64_t points_to_remove = 0;
for (int64_t index = points.last(); index >= points.first(); index--) {
if (radii[index] < 1e-5f) {
points_to_remove++;
}
else {
break;
}
}
if (points_to_remove > 0) {
remove_points_from_end_of_active_curve(curves, on_back, points_to_remove);
points = points.drop_back(points_to_remove);
}
const bke::AttrDomain selection_domain = ED_grease_pencil_selection_domain_get(
scene->toolsettings);
@@ -849,16 +841,13 @@ void PaintOperation::process_stroke_end(const bContext &C, bke::greasepencil::Dr
curves, selection_domain, CD_PROP_BOOL);
if (selection_domain == bke::AttrDomain::Curve) {
ed::curves::fill_selection_false(selection.span.slice(IndexRange(active_curve, 1)));
ed::curves::fill_selection_false(selection.span.slice(IndexRange::from_single(active_curve)));
}
else if (selection_domain == bke::AttrDomain::Point) {
ed::curves::fill_selection_false(selection.span.slice(points));
}
selection.finish();
drawing.set_texture_matrices(Span<float4x2>(&(this->texture_space_), 1),
IndexMask(IndexRange(curves.curves_range().last(), 1)));
}
void PaintOperation::on_stroke_done(const bContext &C)
@@ -871,6 +860,7 @@ void PaintOperation::on_stroke_done(const bContext &C)
Paint *paint = &scene->toolsettings->gp_paint->paint;
Brush *brush = BKE_paint_brush(paint);
BrushGpencilSettings *settings = brush->gpencil_settings;
const bool on_back = (scene->toolsettings->gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK) != 0;
const bool do_post_processing = (settings->flag & GP_BRUSH_GROUP_SETTINGS) != 0;
/* Grease Pencil should have an active layer. */
@@ -879,10 +869,18 @@ void PaintOperation::on_stroke_done(const bContext &C)
/* Drawing should exist. */
bke::greasepencil::Drawing &drawing = *grease_pencil.get_editable_drawing_at(active_layer,
scene->r.cfra);
const int active_curve = on_back ? drawing.strokes().curves_range().first() :
drawing.strokes().curves_range().last();
/* Remove trailing points with radii close to zero. */
trim_end_points(drawing, 1e-5f, on_back, active_curve);
/* Set the selection of the newly drawn stroke to false. */
deselect_stroke(C, drawing, active_curve);
if (do_post_processing) {
this->simplify_stroke(C, drawing, settings->simplify_f);
if (settings->simplify_f > 0.0f) {
simplify_stroke(drawing, settings->simplify_f, active_curve);
}
}
this->process_stroke_end(C, drawing);
drawing.set_texture_matrices({texture_space_}, IndexRange::from_single(active_curve));
drawing.tag_topology_changed();
DEG_id_tag_update(&grease_pencil.id, ID_RECALC_GEOMETRY);