GPv3: WIP: Primitive Tools

@@ -8077,0 +8090,4 @@
+            {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+            {"items": [
+                ("grease_pencil.primitive_line", params.tool_maybe_tweak_event,
+                 {"properties": [("wait_for_input", False)]}),

@@ -1441,0 +1454,4 @@
+
+        if props is not None:
+            row = layout.row(align=True)
+            row.prop(props, "interpolate_mode", icon="VIEW_ORTHO", text="", invert_checkbox=True)

@@ -0,0 +79,4 @@
+  /* The points that are at the end of segments. */
+  JOIN_POINT = 0,
+  /* The points inside of the segments. */
+  EXTRINSIC_POINT = 1,

@@ -0,0 +122,4 @@
+  InterpolationMode interpolate_mode;
+  float4x4 projection;
+  /* Helper class to project screen space coordinates to 3D. */
+  ed::greasepencil::DrawingPlacement placement_;

@@ -0,0 +181,4 @@
+  ColorGeometry4f color_gizmo_primary;
+  ColorGeometry4f color_gizmo_secondary;
+  ColorGeometry4f color_gizmo_a;
+  UI_GetThemeColor4fv(TH_REDALERT, color_redalert);

@@ -0,0 +703,4 @@
+                                                float4(0.0f);
+  srgb_to_linearrgb_v4(ptd.vertex_color_, ptd.vertex_color_);
+
+  /* TODO: Add UI. */

@@ -0,0 +719,4 @@
+  /* Updates indicator in header. */
+  grease_pencil_primitive_status_indicators(C, op, ptd);
+
+  /* add a modal handler for this operator */

@@ -0,0 +1000,4 @@
+
+  const ControlPointType control_point_type = get_control_point_type(ptd, ui_id);
+
+  if (control_point_type == ControlPointType::JOIN_POINT) {

@@ -0,0 +1353,4 @@
+  /* Identifiers. */
+  ot->name = "Grease Pencil Box Shape";
+  ot->idname = "GREASE_PENCIL_OT_primitive_box";
+  ot->description = "Create predefined grease pencil stroke boxs";

@@ -130,3 +130,3 @@
 }
 
-static int grease_pencil_brush_stroke_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+int grease_pencil_draw_operator_invoke(bContext *C, wmOperator *op)

@@ -0,0 +1260,4 @@
+                                                 const int default_subdiv,
+                                                 const PrimitiveType default_type)
+{
+  /* Callbacks. */

@@ -0,0 +1308,4 @@
+                      "Whether the interpolation happens in 2D view space or in 3D world space");
+}
+
+void GREASE_PENCIL_OT_primitive_line(wmOperatorType *ot)

@@ -0,0 +101,4 @@
+static constexpr float UI_POINT_MAX_HIT_SIZE_PX = 600.0f;
+
+/* The center point for `Box` and `Circle` type. */
+static constexpr int CONTROL_POINT_CENTER = 1;

@@ -0,0 +103,4 @@
+/* The center point for `Box` and `Circle` type. */
+static constexpr int CONTROL_POINT_CENTER = 1;
+
+struct PrimitiveTool_OpData {

@@ -0,0 +593,4 @@
+/* Invoke handler: Initialize the operator. */
+static int grease_pencil_primitive_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+  int return_value = ed::sculpt_paint::grease_pencil_draw_operator_invoke(C, op);

@@ -0,0 +1436,4 @@
+  WM_operatortype_append(GREASE_PENCIL_OT_primitive_circle);
+}
+
+wmKeyMap *ED_primitivetool_modal_keymap(wmKeyConfig *keyconf)

@@ -0,0 +1,1471 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +120,4 @@
+  int subdivision;
+  float4x4 projection;
+  /* Helper class to project screen space coordinates to 3D. */
+  ed::greasepencil::DrawingPlacement placement;

@@ -0,0 +264,4 @@
+
+static void grease_pencil_primitive_draw(const bContext * /*C*/, ARegion * /*region*/, void *arg)
+{
+  PrimitiveToolOperation &ptd = *((PrimitiveToolOperation *)arg);

@@ -0,0 +428,4 @@
+static void grease_pencil_primitive_update_curves(PrimitiveToolOperation &ptd)
+{
+  bke::CurvesGeometry &curves = ptd.drawing->strokes_for_write();
+  bke::MutableAttributeAccessor attributes = curves.attributes_for_write();

@@ -0,0 +430,4 @@
+  bke::CurvesGeometry &curves = ptd.drawing->strokes_for_write();
+  bke::MutableAttributeAccessor attributes = curves.attributes_for_write();
+
+  const int last_points = curves.points_by_curve()[curves.curves_range().last()].size();

@@ -0,0 +432,4 @@
+
+  const int last_points = curves.points_by_curve()[curves.curves_range().last()].size();
+
+  int new_points_num = grease_pencil_primitive_curve_points_number(ptd);

@@ -0,0 +451,4 @@
+
+  new_vertex_colors.fill(ColorGeometry4f(ptd.vertex_color));
+
+  ToolSettings *ts = ptd.vc.scene->toolsettings;

@@ -0,0 +452,4 @@
+  new_vertex_colors.fill(ColorGeometry4f(ptd.vertex_color));
+
+  ToolSettings *ts = ptd.vc.scene->toolsettings;
+  GP_Sculpt_Settings *gset = &ts->gp_sculpt;

@@ -0,0 +507,4 @@
+    end_caps.finish();
+  }
+
+  cyclic.span.last() = ELEM(ptd.type, PrimitiveType::BOX, PrimitiveType::CIRCLE);

@@ -0,0 +650,4 @@
+  GreasePencil *grease_pencil = static_cast<GreasePencil *>(vc.obact->data);
+
+  /* Initialize helper class for projecting screen space coordinates. */
+  ed::greasepencil::DrawingPlacement placement = ed::greasepencil::DrawingPlacement(

@@ -0,0 +716,4 @@
+                                               float4(0.0f);
+  srgb_to_linearrgb_v4(ptd.vertex_color, ptd.vertex_color);
+
+  /* TODO: Add UI. */

@@ -0,0 +841,4 @@
+static void grease_pencil_primitive_grab_update(PrimitiveToolOperation &ptd, const wmEvent *event)
+{
+  BLI_assert(ptd.active_control_point_index != -1);
+  float3 pos = ptd.placement.project(float2(event->mval));

@@ -0,0 +877,4 @@
+  const float2 start_pos2 = ED_view3d_project_float_v2_m4(
+      ptd.vc.region, ptd.temp_control_points[ptd.active_control_point_index], ptd.projection);
+
+  float3 pos = ptd.placement.project(start_pos2 + dif);

@@ -0,0 +918,4 @@
+    const float s = math::sin(rotation);
+    const float2x2 rot = float2x2(float2(c, s), float2(-s, c));
+    const float2 pos2 = rot * dif + center_of_mass;
+    float3 pos = ptd.placement.project(pos2);

@@ -0,0 +938,4 @@
+        ptd.vc.region, ptd.temp_control_points[point_index], ptd.projection);
+
+    const float2 pos2 = (start_pos2 - center_of_mass) * scale + center_of_mass;
+    float3 pos = ptd.placement.project(pos2);

@@ -0,0 +1216,4 @@
+      grease_pencil_primitive_rotate_all_update(ptd, event);
+      break;
+    }
+    case OperatorMode::IDLE: {

@@ -0,0 +1224,4 @@
+/* Modal handler: Events handling during interactive part. */
+static int grease_pencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *event)
+{
+  PrimitiveToolOperation &ptd = *((PrimitiveToolOperation *)op->customdata);

@@ -0,0 +1289,4 @@
+                                                 const PrimitiveType default_type)
+{
+  /* Flags. */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;

@@ -0,0 +1467,4 @@
+  WM_modalkeymap_assign(keymap, "GREASE_PENCIL_OT_primitive_box");
+  WM_modalkeymap_assign(keymap, "GREASE_PENCIL_OT_primitive_circle");
+
+  return;

@@ -160,3 +133,1 @@
-  if (!ed::greasepencil::ensure_active_keyframe(*scene, grease_pencil)) {
-    BKE_report(op->reports, RPT_ERROR, "No Grease Pencil frame to draw on");
-    return OPERATOR_CANCELLED;
+  int return_value = ed::sculpt_paint::greasepencil::grease_pencil_draw_operator_invoke(C, op);

@@ -25,9 +25,22 @@ class GreasePencilStrokeOperation {
 
 namespace greasepencil {
 
+float opacity_from_input_sample(const float pressure,

@@ -0,0 +51,4 @@
+namespace blender::ed::greasepencil {
+
+enum class PrimitiveType : int8_t {
+  LINE = 0,

@@ -0,0 +265,4 @@
+static void grease_pencil_primitive_draw(const bContext * /*C*/, ARegion * /*region*/, void *arg)
+{
+  PrimitiveToolOperation &ptd = *((PrimitiveToolOperation *)arg);
+  draw_control_points(ptd);

@@ -0,0 +282,4 @@
+  array_utils::copy(ptd.temp_control_points.as_span(), ptd.control_points.as_mutable_span());
+}
+
+template<typename T>

@@ -0,0 +283,4 @@
+}
+
+template<typename T>
+static void primitive_calulate_curve_positions_exec(PrimitiveToolOperation &ptd,

@@ -0,0 +454,4 @@
+  ToolSettings *ts = ptd.vc.scene->toolsettings;
+  GP_Sculpt_Settings *gset = &ts->gp_sculpt;
+
+  for (const int point_id : curve_points.index_range()) {

@@ -0,0 +652,4 @@
+  /* Initialize helper class for projecting screen space coordinates. */
+  ed::greasepencil::DrawingPlacement placement = ed::greasepencil::DrawingPlacement(
+      *vc.scene, *vc.region, *view3d, *vc.obact, *grease_pencil->get_active_layer());
+  if (placement.use_project_to_surface()) {

@@ -1392,3 +1392,3 @@
 
 
-def brush_basic_grease_pencil_paint_settings(layout, context, brush, *, compact=False):
+def brush_basic_grease_pencil_paint_settings(layout, context, brush, *, compact=False, props=None):