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

GPv3: Python: Add drawing API functions

Browse Source 
This adds `add_curves`, `remove_curves`, and `resize_curves`
functions to the drawing API.

This should replace the old GPv2 API functions:

* `strokes.new`
* `strokes.remove`
* `points.add`
* `points.pop`
* `points.update`

Pull Request: https://projects.blender.org/blender/blender/pulls/125502

Pull Request: https://projects.blender.org/blender/blender/pulls/125502
This commit is contained in:
Falk David
2024-07-26 22:24:03 +02:00
committed by Gitea
parent 6fac4707d5
commit edcc438f5f
3 changed files with 148 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_grease_pencil.cc
View File

@@ -467,6 +467,8 @@ static void rna_def_grease_pencil_drawing(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "User Count", "The number of keyframes this drawing is used by");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_grease_pencil_update");
RNA_api_grease_pencil_drawing(srna);
/* Attributes. */
rna_def_attributes_common(srna, AttributeOwnerType::GreasePencilDrawing);
}

145
source/blender/makesrna/intern/rna_grease_pencil_api.cc
View File

@@ -23,11 +23,84 @@ const EnumPropertyItem rna_enum_tree_node_move_type_items[] = {
#ifdef RNA_RUNTIME
# include "BKE_attribute.hh"
# include "BKE_grease_pencil.hh"
# include "BKE_report.hh"
# include "DEG_depsgraph.hh"
# include "rna_curves_utils.hh"
static void rna_GreasePencilDrawing_add_curves(ID *grease_pencil_id,
GreasePencilDrawing *drawing_ptr,
ReportList *reports,
const int *sizes,
const int sizes_num)
{
using namespace blender;
bke::greasepencil::Drawing &drawing = drawing_ptr->wrap();
bke::CurvesGeometry &curves = drawing.strokes_for_write();
if (!rna_CurvesGeometry_add_curves(curves, reports, sizes, sizes_num)) {
return;
}
drawing.tag_topology_changed();
/* Avoid updates for importers. */
if (grease_pencil_id->us > 0) {
DEG_id_tag_update(grease_pencil_id, ID_RECALC_GEOMETRY);
WM_main_add_notifier(NC_GEOM | ND_DATA, grease_pencil_id);
}
}
static void rna_GreasePencilDrawing_remove_curves(ID *grease_pencil_id,
GreasePencilDrawing *drawing_ptr,
ReportList *reports,
const int *indices_ptr,
const int indices_num)
{
using namespace blender;
bke::greasepencil::Drawing &drawing = drawing_ptr->wrap();
bke::CurvesGeometry &curves = drawing.strokes_for_write();
if (!rna_CurvesGeometry_remove_curves(curves, reports, indices_ptr, indices_num)) {
return;
}
drawing.tag_topology_changed();
/* Avoid updates for importers. */
if (grease_pencil_id->us > 0) {
DEG_id_tag_update(grease_pencil_id, ID_RECALC_GEOMETRY);
WM_main_add_notifier(NC_GEOM | ND_DATA, grease_pencil_id);
}
}
static void rna_GreasePencilDrawing_resize_curves(ID *grease_pencil_id,
GreasePencilDrawing *drawing_ptr,
ReportList *reports,
const int *sizes_ptr,
const int sizes_num,
const int *indices_ptr,
const int indices_num)
{
using namespace blender;
bke::greasepencil::Drawing &drawing = drawing_ptr->wrap();
bke::CurvesGeometry &curves = drawing.strokes_for_write();
if (!rna_CurvesGeometry_resize_curves(
curves, reports, sizes_ptr, sizes_num, indices_ptr, indices_num))
{
return;
}
drawing.tag_topology_changed();
/* Avoid updates for importers. */
if (grease_pencil_id->us > 0) {
DEG_id_tag_update(grease_pencil_id, ID_RECALC_GEOMETRY);
WM_main_add_notifier(NC_GEOM | ND_DATA, grease_pencil_id);
}
}
static GreasePencilFrame *rna_Frames_frame_new(ID *id,
GreasePencilLayer *layer_in,
ReportList *reports,
@@ -304,6 +377,78 @@ static void rna_GreasePencil_layer_group_move_to_layer_group(GreasePencil *greas
#else
void RNA_api_grease_pencil_drawing(StructRNA *srna)
{
FunctionRNA *func;
PropertyRNA *parm;
func = RNA_def_function(srna, "add_curves", "rna_GreasePencilDrawing_add_curves");
RNA_def_function_ui_description(func, "Add new curves with provided sizes at the end");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
parm = RNA_def_int_array(func,
"sizes",
1,
nullptr,
1,
INT_MAX,
"Sizes",
"The number of points in each curve",
1,
10000);
RNA_def_property_array(parm, RNA_MAX_ARRAY_LENGTH);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
func = RNA_def_function(srna, "remove_curves", "rna_GreasePencilDrawing_remove_curves");
RNA_def_function_ui_description(func,
"Remove all curves. If indices are provided, remove only the "
"curves with the given indices.");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
parm = RNA_def_int_array(func,
"indices",
1,
nullptr,
0,
INT_MAX,
"Indices",
"The indices of the curves to remove",
0,
10000);
RNA_def_property_array(parm, RNA_MAX_ARRAY_LENGTH);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, ParameterFlag(0));
func = RNA_def_function(srna, "resize_curves", "rna_GreasePencilDrawing_resize_curves");
RNA_def_function_ui_description(
func,
"Resize all existing curves. If indices are provided, resize only the curves with the given "
"indices. If the new size for a curve is smaller, the curve is trimmed. If "
"the new size for a curve is larger, the new end values are default initialized.");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
parm = RNA_def_int_array(func,
"sizes",
1,
nullptr,
1,
INT_MAX,
"Sizes",
"The number of points in each curve",
1,
10000);
RNA_def_property_array(parm, RNA_MAX_ARRAY_LENGTH);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
parm = RNA_def_int_array(func,
"indices",
1,
nullptr,
0,
INT_MAX,
"Indices",
"The indices of the curves to resize",
0,
10000);
RNA_def_property_array(parm, RNA_MAX_ARRAY_LENGTH);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, ParameterFlag(0));
}
void RNA_api_grease_pencil_frames(StructRNA *srna)
{
FunctionRNA *func;

1
source/blender/makesrna/intern/rna_internal.hh
View File

@@ -428,6 +428,7 @@ void RNA_api_operator(StructRNA *srna);
void RNA_api_macro(StructRNA *srna);
void RNA_api_gizmo(StructRNA *srna);
void RNA_api_gizmogroup(StructRNA *srna);
void RNA_api_grease_pencil_drawing(StructRNA *srna);
void RNA_api_grease_pencil_frames(StructRNA *srna);
void RNA_api_grease_pencil_layer(StructRNA *srna);
void RNA_api_grease_pencil_layers(StructRNA *srna);