GPv3: Build modifier

This reverts commit 45c5e554cc.

@@ -2019,2 +2046,4 @@
 }
 
+const EnumPropertyItem *grease_pencil_build_time_mode_filter(bContext * /*C*/,
+                                                       PointerRNA *ptr,

@@ -0,0 +17,4 @@
+
+#include "DNA_defaults.h"
+#include "DNA_gpencil_modifier_types.h"
+#include "DNA_node_types.h" /* For `GeometryNodeCurveSampleMode` */

@@ -0,0 +94,4 @@
+                                              const int time_alignment,
+                                              const int transition,
+                                              const float factor,
+                                              int &out_curves_num,

@@ -0,0 +112,4 @@
+                                   math::clamp(factor, 0.0f, 1.0f) :
+                                   math::clamp(1.0f - factor, 0.0f, 1.0f);
+
+  auto get_factor = [&](const float factor_to_keep, const int index) {

@@ -0,0 +185,4 @@
+                                   const IndexMask &selection,
+                                   const int transition,
+                                   const float factor,
+                                   int &out_curves_num,

@@ -0,0 +278,4 @@
+  return dst_curves;
+}
+
+static float get_factor(const int time_mode,

@@ -0,0 +284,4 @@
+                        const int length,
+                        const float percentage)
+{
+  if (time_mode == MOD_GREASE_PENCIL_BUILD_TIMEMODE_FRAMES) {

@@ -0,0 +315,4 @@
+  const float factor = get_factor(
+      mmd.time_mode, current_time, mmd.start_delay, mmd.length, mmd.percentage_fac);
+
+  if (mmd.mode == MOD_GREASE_PENCIL_BUILD_MODE_CONCURRENT) {

@@ -0,0 +418,4 @@
+
+  // TODO: Time offset modifier not merged yet:
+
+  // if (BKE_gpencil_modifiers_findby_type(ob, eGpencilModifierType_Time) != nullptr) {

@@ -0,0 +601,4 @@
+
+  threading::parallel_for_each(drawings, [&](bke::greasepencil::Drawing *drawing) {
+    const bke::greasepencil::Drawing *prev_drawing=nullptr;
+    //modifier::greasepencil::get_drawing_infos_by_layer(,)

@@ -0,0 +451,4 @@
+  PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
+
+  const int mode = RNA_enum_get(ptr, "mode");
+  int time_mode = RNA_enum_get(ptr, "time_mode");

@@ -0,0 +473,4 @@
+  }
+}
+
+static void deform_drawing(const ModifierData &md,

@@ -983,12 +983,6 @@
     .shadow_camera_size = 200.0f, \
   }
 
-#define _DNA_DEFAULT_GreasePencilArmatureModifierData \

@@ -0,0 +607,4 @@
+                                mmd.target_vgname);
+      break;
+    case MOD_GREASE_PENCIL_BUILD_MODE_ADDITIVE:
+      // Todo: I'm not sure what this mode means, looks like the same to me.

@@ -0,0 +641,4 @@
+  IndexMaskMemory mask_memory;
+  const IndexMask layer_mask = modifier::greasepencil::get_filtered_layer_mask(
+      grease_pencil, mmd->influence, mask_memory);
+  const Vector<bke::greasepencil::Drawing *> drawings =

@@ -0,0 +147,4 @@
+  selection.to_bools(select.as_mutable_span());
+  Array<int> result(stroke_count);
+  for (const int i : IndexRange(stroke_count)) {
+    const float local_factor = (select[i] ? get_stroke_factor(factor_to_keep, i) : 1.0f);

@@ -0,0 +206,4 @@
+  const bool is_vanishing = transition == MOD_GREASE_PENCIL_BUILD_TRANSITION_VANISH;
+
+  bke::CurvesGeometry dst_curves(dst_points_num, dst_curves_num);
+  Array<int> dst_offsets(dst_curves_num + 1);

@@ -0,0 +210,4 @@
+  Array<int> dst_to_src_point(dst_points_num);
+  dst_offsets[0] = 0;
+
+  int next_curve = 0, next_point = 0;

@@ -0,0 +212,4 @@
+
+  int next_curve = 0, next_point = 0;
+  for (const int i : IndexRange(curves.curves_num())) {
+    if (points_per_curve[i]) {

@@ -0,0 +219,4 @@
+      auto get_fade_weight = [&](const int local_index) {
+        if (is_vanishing) {
+          return 1.0f - std::clamp(float(local_index - curve_size + ends_per_curve[i]) /
+                                       float(abs(ends_per_curve[i] - starts_per_curve[i])),

@@ -0,0 +259,4 @@
+  const bke::AttributeAccessor src_attributes = curves.attributes();
+  bke::MutableAttributeAccessor dst_attributes = dst_curves.attributes_for_write();
+
+  gather_attributes(

@@ -0,0 +274,4 @@
+                                   int &r_points_num)
+{
+  const int stroke_count = curves.curves_num();
+  const OffsetIndices<int> &points_by_curve = curves.points_by_curve();

@@ -0,0 +304,4 @@
+    if (select[stroke] && counted_points_num >= effective_points_num) {
+      continue;
+    }
+    else {

@@ -0,0 +427,4 @@
+  const Span<float3> positions = curves.positions();
+  const float3 center = object.object_to_world().location();
+
+  struct _Pair {

@@ -0,0 +448,4 @@
+      distances.begin(), distances.end(), [](_Pair &a, _Pair &b) { return a.value < b.value; });
+
+  Array<int> new_order(curves.curves_num());
+  threading::parallel_for(curves.curves_range(), 65536, [&](const IndexRange range) {

@@ -0,0 +1,812 @@
+/* SPDX-FileCopyrightText: 2005 Blender Authors

@@ -0,0 +115,4 @@
+  curves.ensure_evaluated_lengths();
+  float max_length = 0;
+  for (const int stroke : curves.curves_range()) {
+    const float len = curves.evaluated_lengths_for_curve(stroke, false).last();

@@ -0,0 +347,4 @@
+  const bool is_vanishing = transition == MOD_GREASE_PENCIL_BUILD_TRANSITION_VANISH;
+
+  bke::CurvesGeometry dst_curves(dst_points_num, dst_curves_num);
+  Array<int> dst_offsets(dst_curves_num + 1);

@@ -0,0 +611,4 @@
+                                mmd.target_vgname);
+      break;
+    case MOD_GREASE_PENCIL_BUILD_MODE_ADDITIVE:
+      // Todo: I'm not sure what this mode means, looks like the same to me.

@@ -0,0 +634,4 @@
+                                const ModifierEvalContext *ctx,
+                                blender::bke::GeometrySet *geometry_set)
+{
+  auto *mmd = reinterpret_cast<GreasePencilBuildModifierData *>(md);

@@ -0,0 +543,4 @@
+
+  /* Remove a count of #prev_strokes.  */
+  if (mmd.mode == MOD_GREASE_PENCIL_BUILD_MODE_ADDITIVE && previous_drawing != nullptr) {
+    const bke::CurvesGeometry &prev_curves = drawing.strokes_for_write();

@@ -0,0 +134,4 @@
+      }
+      return factor * max_factor;
+    }
+    /* Else: (#MOD_GREASE_PENCIL_BUILD_TIMEALIGN_END). */

@@ -0,0 +148,4 @@
+  Array<int> result(stroke_count);
+  for (const int i : IndexRange(stroke_count)) {
+    const float local_factor = select[i] ? get_stroke_factor(factor_to_keep, i) : 1.0f;
+    const int points = points_by_curve[i].size() * local_factor;

@@ -0,0 +152,4 @@
+    result[i] = points;
+    if (clamp_points) {
+      r_points_num += points;
+      if (points) {

@@ -2089,6 +2116,35 @@ static void rna_GreasePencilDashModifier_segments_begin(CollectionPropertyIterat
                            nullptr);
 }
 
+const EnumPropertyItem *grease_pencil_build_time_mode_filter(bContext * /*C*/,

@@ -0,0 +256,4 @@
+  weights.finish();
+
+  offset_indices::accumulate_counts_to_offsets(dst_offsets);
+  array_utils::copy(dst_offsets.as_span(), dst_curves.offsets_for_write());

@@ -0,0 +262,4 @@
+  bke::MutableAttributeAccessor dst_attributes = dst_curves.attributes_for_write();
+
+  gather_attributes(
+      src_attributes, bke::AttrDomain::Point, {}, {}, dst_to_src_point, dst_attributes);

@@ -0,0 +305,4 @@
+  selection.to_bools(select.as_mutable_span());
+
+  int counted_points_num = 0;
+  for (const int i : IndexRange(stroke_count)) {

@@ -0,0 +472,4 @@
+  const OffsetIndices<int> points_by_curve = curves.points_by_curve();
+  Array<float> times(curves.points_num());
+  bke::AttributeAccessor time_attributes = curves.attributes();
+  bke::AttributeReader<float> init_times = time_attributes.lookup_or_default<float>(

@@ -0,0 +479,4 @@
+
+  float current_time = 0;
+  float previous_init_time = init_times.varray[0];
+  for (const int i : IndexRange(curves.curves_num())) {

@@ -0,0 +480,4 @@
+  float current_time = 0;
+  float previous_init_time = init_times.varray[0];
+  for (const int i : IndexRange(curves.curves_num())) {
+    if (i > 0) {

@@ -0,0 +484,4 @@
+      current_time += math::max(init_times.varray[i] - previous_init_time, max_gap);
+      previous_init_time = init_times.varray[i];
+    }
+    for (const int p : points_by_curve[i].index_range()) {

@@ -0,0 +551,4 @@
+    if (added_strokes > 0) {
+      Array<bool> work_on_select(curves.curves_num());
+      selection.to_bools(work_on_select.as_mutable_span());
+      for (const int i : IndexRange(prev_strokes)) {

@@ -0,0 +554,4 @@
+      for (const int i : IndexRange(prev_strokes)) {
+        work_on_select[i] = false;
+      }
+      selection.from_bools(work_on_select, memory);

@@ -0,0 +499,4 @@
+  return 1.0f;
+}
+
+static float get_build_factor(const int time_mode,

@@ -0,0 +510,4 @@
+                              const float max_gap,
+                              const float fade)
+{
+

@@ -0,0 +520,4 @@
+      return get_factor_from_draw_speed(
+                 curves, float(current_frame) / scene_fps, speed_fac, max_gap) *
+             (1.0f + fade);
+    default:

@@ -0,0 +148,4 @@
+  Array<bool> select(stroke_count);
+  selection.to_bools(select.as_mutable_span());
+  Array<int> result(stroke_count);
+  for (const int i : IndexRange(stroke_count)) {

@@ -0,0 +216,4 @@
+  int next_curve = 0;
+  int next_point = 0;
+  for (const int curve : curves.curves_range()) {
+    if (!points_per_curve[curve]) {

@@ -0,0 +236,4 @@
+                                 points_by_curve[curve].size() - points_per_curve[curve] :
+                                 0;
+    for (const int stroke_point : IndexRange(points_per_curve[curve])) {
+      if (stroke_point >= points_per_curve[curve]) {

@@ -0,0 +469,4 @@
+                                        const float max_gap)
+{
+  const OffsetIndices<int> points_by_curve = curves.points_by_curve();
+  const bke::AttributeAccessor time_attributes = curves.attributes();

@@ -0,0 +483,4 @@
+      current_time += math::max(init_times[curve] - previous_init_time, max_gap);
+      previous_init_time = init_times[curve];
+    }
+    const IndexRange points = points_by_curve[curve].index_range();

@@ -0,0 +175,4 @@
+{
+  int dst_curves_num, dst_points_num;
+  const bool has_fade = factor_start != factor;
+  const Array<int> points_per_curve = points_per_curve_concurrent(

@@ -0,0 +110,4 @@
+                                              int &r_points_num)
+{
+  const int stroke_count = curves.curves_num();
+  const OffsetIndices<int> &points_by_curve = curves.points_by_curve();

@@ -0,0 +220,4 @@
+      continue;
+    }
+    dst_offsets[next_curve] = points_per_curve[curve];
+    const int curve_size = points_by_curve[curve].size();

@@ -0,0 +380,4 @@
+                        1.0f);
+    };
+
+    for (const int point : points_by_curve[stroke]) {

@@ -0,0 +441,4 @@
+
+  Array<Pair> distances(curves.curves_num());
+  for (const int stroke : curves.curves_range()) {
+    const float3 p1 = positions[points_by_curve[stroke].first()];

@@ -0,0 +127,4 @@
+  }
+
+  auto get_stroke_factor = [&](const float factor, const int index) {
+    const float max_factor = max_length / curves.evaluated_lengths_for_curve(index, false).last();

@@ -0,0 +654,4 @@
+        const bke::greasepencil::Drawing *prev_drawing = grease_pencil.get_drawing_at(
+            *layers[drawing_info.layer_index], eval_frame - 1);
+        build_drawing(
+            *md, *ctx->object, *drawing_info.drawing, prev_drawing, eval_frame, scene_fps);