dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GOOENGINE: Add context based gpencil smoothing for thickness and strength modes

Browse Source 
Updated for GPv3
This commit is contained in:
Cody Winchester
2025-10-12 23:13:45 -05:00
parent be7c62b6c0
commit a23e4e2d47
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
+20 -1
View File
@@ -115,7 +115,26 @@ static std::unique_ptr<GreasePencilStrokeOperation> get_stroke_operation(bContex
}
else if (mode == PaintMode::SculptGreasePencil) {
if (stroke_mode == BRUSH_STROKE_SMOOTH) {
return greasepencil::new_smooth_operation(stroke_mode, true);
switch (eBrushGPSculptType(brush.gpencil_sculpt_brush_type)) {
case GPSCULPT_BRUSH_TYPE_SMOOTH:
return greasepencil::new_smooth_operation(stroke_mode);
case GPSCULPT_BRUSH_TYPE_THICKNESS:
return greasepencil::new_smooth_operation(stroke_mode, true, 3);
case GPSCULPT_BRUSH_TYPE_STRENGTH:
return greasepencil::new_smooth_operation(stroke_mode, true, 2);
case GPSCULPT_BRUSH_TYPE_GRAB:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
case GPSCULPT_BRUSH_TYPE_PUSH:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
case GPSCULPT_BRUSH_TYPE_TWIST:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
case GPSCULPT_BRUSH_TYPE_PINCH:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
case GPSCULPT_BRUSH_TYPE_RANDOMIZE:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
case GPSCULPT_BRUSH_TYPE_CLONE:
return greasepencil::new_smooth_operation(stroke_mode, true, 1);
}
}
switch (eBrushGPSculptType(brush.gpencil_sculpt_brush_type)) {
case GPSCULPT_BRUSH_TYPE_SMOOTH:
source/blender/editors/sculpt_paint/grease_pencil_intern.hh
+2 -1
View File
@@ -200,7 +200,8 @@ std::unique_ptr<GreasePencilStrokeOperation> new_weight_paint_blur_operation();
std::unique_ptr<GreasePencilStrokeOperation> new_weight_paint_average_operation();
std::unique_ptr<GreasePencilStrokeOperation> new_weight_paint_smear_operation();
std::unique_ptr<GreasePencilStrokeOperation> new_smooth_operation(BrushStrokeMode stroke_mode,
bool temp_smooth = false);
bool temp_smooth = false,
int context_type = 0);
std::unique_ptr<GreasePencilStrokeOperation> new_thickness_operation(BrushStrokeMode stroke_mode);
std::unique_ptr<GreasePencilStrokeOperation> new_strength_operation(BrushStrokeMode stroke_mode);
std::unique_ptr<GreasePencilStrokeOperation> new_randomize_operation(BrushStrokeMode stroke_mode);
source/blender/editors/sculpt_paint/grease_pencil_sculpt_smooth.cc
+9 -8
View File
@@ -28,12 +28,13 @@ namespace blender::ed::sculpt_paint::greasepencil {
class SmoothOperation : public GreasePencilStrokeOperationCommon {
private:
bool temp_smooth_;
int context_type_;
public:
using GreasePencilStrokeOperationCommon::GreasePencilStrokeOperationCommon;
SmoothOperation(const BrushStrokeMode stroke_mode, const bool temp_smooth = false)
: GreasePencilStrokeOperationCommon(stroke_mode), temp_smooth_(temp_smooth)
SmoothOperation(const BrushStrokeMode stroke_mode, const bool temp_smooth = false, const int context_type = 0)
: GreasePencilStrokeOperationCommon(stroke_mode), temp_smooth_(temp_smooth), context_type_(context_type)
{
}
@@ -101,7 +102,7 @@ void SmoothOperation::on_stroke_extended(const bContext &C, const InputSample &e
const VArray<bool> selection_varray = VArray<bool>::ForSpan(selection_array);
bool changed = false;
if (sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_POSITION) {
if ((sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_POSITION & context_type_ == 0) || context_type_ == 1) {
MutableSpan<float3> positions = curves.positions_for_write();
geometry::smooth_curve_attribute(curves.curves_range(),
points_by_curve,
@@ -115,7 +116,7 @@ void SmoothOperation::on_stroke_extended(const bContext &C, const InputSample &e
params.drawing.tag_positions_changed();
changed = true;
}
if (sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_STRENGTH) {
if ((sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_STRENGTH & context_type_ == 0) || context_type_ == 2) {
MutableSpan<float> opacities = params.drawing.opacities_for_write();
geometry::smooth_curve_attribute(curves.curves_range(),
points_by_curve,
@@ -128,7 +129,7 @@ void SmoothOperation::on_stroke_extended(const bContext &C, const InputSample &e
opacities);
changed = true;
}
if (sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_THICKNESS) {
if ((sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_THICKNESS & context_type_ == 0) || context_type_ == 3) {
const MutableSpan<float> radii = params.drawing.radii_for_write();
geometry::smooth_curve_attribute(curves.curves_range(),
points_by_curve,
@@ -142,7 +143,7 @@ void SmoothOperation::on_stroke_extended(const bContext &C, const InputSample &e
curves.tag_radii_changed();
changed = true;
}
if (sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_UV) {
if (sculpt_mode_flag & GP_SCULPT_FLAGMODE_APPLY_UV & context_type_ == 0) {
bke::SpanAttributeWriter<float> rotations = attributes.lookup_or_add_for_write_span<float>(
"rotation", bke::AttrDomain::Point);
geometry::smooth_curve_attribute(curves.curves_range(),
@@ -163,9 +164,9 @@ void SmoothOperation::on_stroke_extended(const bContext &C, const InputSample &e
}
std::unique_ptr<GreasePencilStrokeOperation> new_smooth_operation(
const BrushStrokeMode stroke_mode, const bool temp_smooth)
const BrushStrokeMode stroke_mode, const bool temp_smooth, const int context_type)
{
return std::make_unique<SmoothOperation>(stroke_mode, temp_smooth);
return std::make_unique<SmoothOperation>(stroke_mode, temp_smooth, context_type);
}
} // namespace blender::ed::sculpt_paint::greasepencil