scripts/startup/bl_ui/space_view3d.py

@@ -1018,6 +1018,8 @@ class VIEW3D_MT_editor_menus(Menu):
             elif mode_string in {'EDIT_CURVE', 'EDIT_SURFACE'}:
                 layout.menu("VIEW3D_MT_edit_curve_ctrlpoints")
                 layout.menu("VIEW3D_MT_edit_curve_segments")
+            elif mode_string == 'EDIT_GREASE_PENCIL':
+                layout.menu("VIEW3D_MT_edit_greasepencil_stroke")
 
         elif obj:
             if mode_string not in {'PAINT_TEXTURE', 'SCULPT_CURVES'}:
@@ -5521,6 +5523,14 @@ class VIEW3D_MT_edit_greasepencil(Menu):
     def draw(self, _context):
         pass
 
+class VIEW3D_MT_edit_greasepencil_stroke(Menu):
+    bl_label = "Stroke"
+
+    def draw(self, _context):
+        layout = self.layout
+        layout.operator("grease_pencil.stroke_smooth")
+        pass
+
 
 class VIEW3D_MT_edit_curves(Menu):
     bl_label = "Curves"
@@ -8412,6 +8422,7 @@ classes = (
     VIEW3D_MT_gpencil_autoweights,
     VIEW3D_MT_gpencil_edit_context_menu,
     VIEW3D_MT_edit_greasepencil,
+    VIEW3D_MT_edit_greasepencil_stroke,
     VIEW3D_MT_edit_curve,
     VIEW3D_MT_edit_curve_ctrlpoints,
     VIEW3D_MT_edit_curve_segments,

source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc

@@ -6,8 +6,20 @@
  * \ingroup edgreasepencil
  */
 
-#include "BKE_context.h"
+#include "BLI_index_mask.hh"
+#include "BLI_index_range.hh"
+#include "BLI_math_vector_types.hh"
+#include "BLI_span.hh"
 
+#include "BKE_context.h"
+#include "BKE_grease_pencil.hh"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "DEG_depsgraph.h"
+
+#include "ED_curves.h"
 #include "ED_grease_pencil.h"
 #include "ED_screen.h"
 
@@ -78,8 +90,315 @@ static void keymap_grease_pencil_painting(wmKeyConfig *keyconf)
   keymap->poll = grease_pencil_painting_poll;
 }
 
+/* -------------------------------------------------------------------- */
+/** \name Smooth Stroke Operator.
+ * \{ */
+
+template<typename T>
+static void gaussian_blur_1D(const Span<T> src,
+                             const int64_t iterations,
+                             const float influence,
+                             const bool smooth_ends,
+                             const bool keep_shape,
+                             const bool is_cyclic,
+                             MutableSpan<T> dst)
+{
+  /* 1D Gaussian-like smoothing function.
+   *
+   * Note : This is the algorithm used by BKE_gpencil_stroke_smooth_point (legacy),
+   *        but generalized and written in C++.
+   *
+   * This function uses a binomial kernel, which is the discrete version of gaussian blur.
+   * The weight for a value at the relative index is:
+   * w = nCr(n, j + n/2) / 2^n = (n/1 * (n-1)/2 * ... * (n-j-n/2)/(j+n/2)) / 2^n
+   * All weights together sum up to 1.
+   * This is equivalent to doing multiple iterations of averaging neighbors,
+   * where n = iterations * 2 and -n/2 <= j <= n/2
+   *
+   * Now the problem is that nCr(n, j + n/2) is very hard to compute for n > 500, since even
+   * double precision isn't sufficient. A very good robust approximation for n > 20 is
+   * nCr(n, j + n/2) / 2^n = sqrt(2/(pi*n)) * exp(-2*j*j/n)
+   *
+   * `keep_shape` is a new option to stop the points from severely deforming.
+   * It uses different partially negative weights.
+   * w = 2 * (nCr(n, j + n/2) / 2^n) - (nCr(3*n, j + n) / 2^(3*n))
+   *   ~ 2 * sqrt(2/(pi*n)) * exp(-2*j*j/n) - sqrt(2/(pi*3*n)) * exp(-2*j*j/(3*n))
+   * All weights still sum up to 1.
+   * Note that these weights only work because the averaging is done in relative coordinates.
+   */
+
+  BLI_assert(!src.is_empty());
+  BLI_assert(src.size() == dst.size());
+
+  /* Avoid computation if the there is just one point. */
+  if (src.size() == 1) {
+    return;
+  }
+
+  /* Weight Initialization. */
+  const int64_t n_half = keep_shape ? (iterations * iterations) / 8 + iterations :
+                                      (iterations * iterations) / 4 + 2 * iterations + 12;
+  double w = keep_shape ? 2.0 : 1.0;
+  double w2 = keep_shape ?
+                  (1.0 / M_SQRT3) * exp((2 * iterations * iterations) / double(n_half * 3)) :
+                  0.0;
+  Array<double> total_weight(src.size(), 0.0);
+
+  const int64_t total_points = src.size();
+  const int64_t last_pt = total_points - 1;
+
+  auto is_end_and_fixed = [smooth_ends, is_cyclic, last_pt](int index) {
+    return !smooth_ends && !is_cyclic && ((index == 0) || (index == last_pt));
+  };
+
+  /* Initialize at zero. */
+  threading::parallel_for(dst.index_range(), 256, [&](const IndexRange range) {
+    for (const int64_t index : range) {
+      if (!is_end_and_fixed(index)) {
+        dst[index] = T(0);
+      }
+    }
+  });
+
+  for (const int64_t step : IndexRange(iterations)) {
+    const int64_t offset = iterations - step;
+    threading::parallel_for(dst.index_range(), 256, [&](const IndexRange range) {
+      for (const int64_t index : range) {
+        /* Filter out endpoints. */
+        if (is_end_and_fixed(index)) {
+          continue;
+        }
+
+        double w_before = w - w2;
+        double w_after = w - w2;
+
+        /* Compute the neighboring points. */
+        int64_t before = index - offset;
+        int64_t after = index + offset;
+        if (is_cyclic) {
+          before = (before % total_points + total_points) % total_points;
+          after = after % total_points;
+        }
+        else {
+          if (!smooth_ends && (before < 0)) {
+            w_before *= -before / float(index);
+          }
+          before = std::max(before, 0L);
+
+          if (!smooth_ends && (after > last_pt)) {
+            w_after *= (after - (total_points - 1)) / float(total_points - 1 - index);
+          }
+          after = std::min(after, last_pt);
+        }
+
+        /* Add the neighboring values. */
+        const T bval = src[before];
+        const T aval = src[after];
+        const T cval = src[index];
+
+        dst[index] += (bval - cval) * w_before;
+        dst[index] += (aval - cval) * w_after;
+
+        /* Update the weight values. */
+        total_weight[index] += w_before;
+        total_weight[index] += w_after;
+      }
+    });
+
+    w *= (n_half + offset) / double(n_half + 1 - offset);
+    w2 *= (n_half * 3 + offset) / double(n_half * 3 + 1 - offset);
+  }
+
+  /* Normalize the weights. */
+  threading::parallel_for(dst.index_range(), 256, [&](const IndexRange range) {
+    for (const int64_t index : range) {
+      if (!is_end_and_fixed(index)) {
+        total_weight[index] += w - w2;
+        dst[index] = src[index] + influence * dst[index] / total_weight[index];
+      }
+    }
+  });
+}
+
+void gaussian_blur_1D(const GSpan src,
+                      const int64_t iterations,
+                      const float influence,
+                      const bool smooth_ends,
+                      const bool keep_shape,
+                      const bool is_cyclic,
+                      GMutableSpan dst)
+{
+  bke::attribute_math::convert_to_static_type(src.type(), [&](auto dummy) {
+    using T = decltype(dummy);
+    /* Reduces unnecessary code generation. */
+    if constexpr (std::is_same_v<T, float> || std::is_same_v<T, float3>) {
+      gaussian_blur_1D(src.typed<T>(),
+                       iterations,
+                       influence,
+                       smooth_ends,
+                       keep_shape,
+                       is_cyclic,
+                       dst.typed<T>());
+    }
+  });
+}
+
+static void smooth_curve_attribute(bke::CurvesGeometry &curves,
+                                   bke::GSpanAttributeWriter &attribute,
+                                   const OffsetIndices<int> points_by_curve,
+                                   const VArray<bool> selection,
+                                   const VArray<bool> cyclic,
+                                   const int64_t iterations,
+                                   const float influence,
+                                   const bool smooth_ends,
+                                   const bool keep_shape)
+{
+  GMutableSpan data = attribute.span;
+  if (data.is_empty()) {
+    return;
+  }
+  threading::parallel_for(curves.curves_range(), 512, [&](const IndexRange range) {
+    Vector<std::byte> orig_data;
+    for (const int curve_i : range) {
+      const IndexRange points = points_by_curve[curve_i];
+      IndexMaskMemory memory;
+      const IndexMask selection_mask = IndexMask::from_bools(points, selection, memory);
+      if (selection_mask.is_empty()) {
+        continue;
+      }
+
+      Vector<IndexRange> selection_ranges = selection_mask.to_ranges();
+      for (const IndexRange range : selection_ranges) {
+        GMutableSpan dst_data = data.slice(range);
+        orig_data.resize(dst_data.size_in_bytes());
+        dst_data.type().copy_assign_n(dst_data.data(), orig_data.data(), range.size());
+
+        GSpan src_data(dst_data.type(), orig_data.data(), range.size());
+        gaussian_blur_1D(
+            src_data, iterations, influence, smooth_ends, keep_shape, cyclic[curve_i], dst_data);
+      }
+    }
+  });
+
+  attribute.finish();
+}
+
+static int grease_pencil_stroke_smooth_exec(bContext *C, wmOperator *op)
+{
+  using namespace blender;
+  const Scene *scene = CTX_data_scene(C);
+  Object *object = CTX_data_active_object(C);
+  GreasePencil &grease_pencil = *static_cast<GreasePencil *>(object->data);
+
+  const int iterations = RNA_int_get(op->ptr, "iterations");
+  const float influence = RNA_float_get(op->ptr, "factor");
+  const bool keep_shape = RNA_boolean_get(op->ptr, "keep_shape");
+  const bool smooth_ends = RNA_boolean_get(op->ptr, "smooth_ends");
+
+  const bool smooth_position = RNA_boolean_get(op->ptr, "smooth_position");
+  const bool smooth_radius = RNA_boolean_get(op->ptr, "smooth_radius");
+  const bool smooth_opacity = RNA_boolean_get(op->ptr, "smooth_opacity");
+
+  if (!(smooth_position || smooth_radius || smooth_opacity)) {
+    /* There's nothing to be smoothed, return. */
+    return OPERATOR_FINISHED;
+  }
+
+  grease_pencil.foreach_editable_drawing(
+      scene->r.cfra, [&](int /*drawing_index*/, bke::greasepencil::Drawing &drawing) {
+        bke::CurvesGeometry &curves = drawing.strokes_for_write();
+        if (curves.points_num() == 0) {
+          return;
+        }
+
+        bke::MutableAttributeAccessor attributes = curves.attributes_for_write();
+        const OffsetIndices points_by_curve = curves.points_by_curve();
+        const VArray<bool> cyclic = curves.cyclic();
+        const VArray<bool> selection = *curves.attributes().lookup_or_default<bool>(
+            ".selection", ATTR_DOMAIN_POINT, true);
+
+        if (smooth_position) {
+          bke::GSpanAttributeWriter positions = attributes.lookup_for_write_span("position");
+          smooth_curve_attribute(curves,
+                                 positions,
+                                 points_by_curve,
+                                 selection,
+                                 cyclic,
+                                 iterations,
+                                 influence,
+                                 smooth_ends,
+                                 keep_shape);
+          positions.finish();
+        }
+        if (smooth_opacity && drawing.opacities().is_span()) {
+          bke::GSpanAttributeWriter opcities = attributes.lookup_for_write_span("opacity");
+          smooth_curve_attribute(curves,
+                                 opcities,
+                                 points_by_curve,
+                                 selection,
+                                 cyclic,
+                                 iterations,
+                                 influence,
+                                 smooth_ends,
+                                 false);
+          opcities.finish();
+        }
+        if (smooth_radius && drawing.radii().is_span()) {
+          bke::GSpanAttributeWriter radii = attributes.lookup_for_write_span("radius");
+          smooth_curve_attribute(curves,
+                                 radii,
+                                 points_by_curve,
+                                 selection,
+                                 cyclic,
+                                 iterations,
+                                 influence,
+                                 smooth_ends,
+                                 false);
+          radii.finish();
+        }
+      });
+
+  DEG_id_tag_update(&grease_pencil.id, ID_RECALC_GEOMETRY);
+  WM_event_add_notifier(C, NC_GEOM | ND_DATA, &grease_pencil);
+
+  return OPERATOR_FINISHED;
+}
+
+static void GREASE_PENCIL_OT_stroke_smooth(wmOperatorType *ot)
+{
+  PropertyRNA *prop;
+
+  /* Identifiers. */
+  ot->name = "Smooth Stroke";
+  ot->idname = "GREASE_PENCIL_OT_stroke_smooth";
+  ot->description = "Smooth selected strokes";
+
+  /* Callbacks. */
+  ot->exec = grease_pencil_stroke_smooth_exec;
+  ot->poll = editable_grease_pencil_poll;
+
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* Smooth parameters. */
+  prop = RNA_def_int(ot->srna, "iterations", 10, 1, 100, "Iterations", "", 1, 30);
+  RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+  RNA_def_float(ot->srna, "factor", 1.0f, 0.0f, 1.0f, "Factor", "", 0.0f, 1.0f);
+  RNA_def_boolean(ot->srna, "smooth_ends", false, "Smooth Endpoints", "");
+  RNA_def_boolean(ot->srna, "keep_shape", false, "Keep Shape", "");
+
+  RNA_def_boolean(ot->srna, "smooth_position", true, "Position", "");
+  RNA_def_boolean(ot->srna, "smooth_radius", true, "Radius", "");
+  RNA_def_boolean(ot->srna, "smooth_opacity", false, "Opacity", "");
+}
+
 }  // namespace blender::ed::greasepencil
 
+void ED_operatortypes_grease_pencil_edit(void)
+{
+  using namespace blender::ed::greasepencil;
+  WM_operatortype_append(GREASE_PENCIL_OT_stroke_smooth);
+}
+
 void ED_keymap_grease_pencil(wmKeyConfig *keyconf)
 {
   using namespace blender::ed::greasepencil;

source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc

@@ -14,4 +14,5 @@ void ED_operatortypes_grease_pencil()
   ED_operatortypes_grease_pencil_frames();
   ED_operatortypes_grease_pencil_layers();
   ED_operatortypes_grease_pencil_select();
+  ED_operatortypes_grease_pencil_edit();
 }

source/blender/editors/include/ED_grease_pencil.h

@@ -35,6 +35,7 @@ void ED_operatortypes_grease_pencil_draw(void);
 void ED_operatortypes_grease_pencil_frames(void);
 void ED_operatortypes_grease_pencil_layers(void);
 void ED_operatortypes_grease_pencil_select(void);
+void ED_operatortypes_grease_pencil_edit(void);
 void ED_keymap_grease_pencil(struct wmKeyConfig *keyconf);
 /**
  * Get the selection mode for Grease Pencil selection operators: point, stroke, segment.
@@ -49,6 +50,7 @@ eAttrDomain ED_grease_pencil_selection_domain_get(struct bContext *C);
 
 #ifdef __cplusplus
 
+#  include "BLI_generic_span.hh"
 #  include "BLI_math_matrix_types.hh"
 
 namespace blender::ed::greasepencil {
@@ -62,5 +64,13 @@ void create_blank(Main &bmain, Object &object, int frame_number);
 void create_stroke(Main &bmain, Object &object, float4x4 matrix, int frame_number);
 void create_suzanne(Main &bmain, Object &object, float4x4 matrix, const int frame_number);
 
+void gaussian_blur_1D(const GSpan src,
+                      int64_t iterations,
+                      float influence,
+                      bool smooth_ends,
+                      bool keep_shape,
+                      bool is_cyclic,
+                      GMutableSpan dst);
+
 }  // namespace blender::ed::greasepencil
 #endif