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

GPv3: Set Curve Tilt

Browse Source 
Part of #113602.
This commit is contained in:
Dalai Felinto
2023-10-13 19:10:02 +02:00
parent 3a998fc461
commit 493674435f
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc
View File

@@ -3,6 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "BKE_curves.hh"
#include "BKE_grease_pencil.hh"
#include "node_geometry_util.hh"
@@ -10,15 +11,17 @@ namespace blender::nodes::node_geo_set_curve_tilt_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Geometry>("Curve").supported_type(GeometryComponent::Type::Curve);
b.add_input<decl::Geometry>("Curve").supported_type(
{GeometryComponent::Type::Curve, GeometryComponent::Type::GreasePencil});
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().field_on_all();
b.add_input<decl::Float>("Tilt").subtype(PROP_ANGLE).field_on_all();
b.add_output<decl::Geometry>("Curve").propagate_all();
}
static void set_tilt(bke::CurvesGeometry &curves,
const Field<bool> &selection_field,
const Field<float> &tilt_field)
static void set_curve_tilt(bke::CurvesGeometry &curves,
const fn::FieldContext &field_context,
const Field<bool> &selection_field,
const Field<float> &tilt_field)
{
if (curves.points_num() == 0) {
return;
@@ -26,8 +29,6 @@ static void set_tilt(bke::CurvesGeometry &curves,
MutableAttributeAccessor attributes = curves.attributes_for_write();
AttributeWriter<float> tilts = attributes.lookup_or_add_for_write<float>("tilt",
ATTR_DOMAIN_POINT);
const bke::CurvesFieldContext field_context{curves, ATTR_DOMAIN_POINT};
fn::FieldEvaluator evaluator{field_context, curves.points_num()};
evaluator.set_selection(selection_field);
evaluator.add_with_destination(tilt_field, tilts.varray);
@@ -36,6 +37,23 @@ static void set_tilt(bke::CurvesGeometry &curves,
tilts.finish();
}
static void set_grease_pencil_tilt(GreasePencil &grease_pencil,
const Field<bool> &selection_field,
const Field<float> &tilt_field)
{
using namespace blender::bke::greasepencil;
for (const int layer_index : grease_pencil.layers().index_range()) {
Drawing *drawing = get_eval_grease_pencil_layer_drawing_for_write(grease_pencil, layer_index);
if (drawing == nullptr) {
continue;
}
bke::CurvesGeometry &curves = drawing->strokes_for_write();
const bke::GreasePencilLayerFieldContext field_context(
grease_pencil, ATTR_DOMAIN_POINT, layer_index);
set_curve_tilt(curves, field_context, selection_field, tilt_field);
}
}
static void node_geo_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Curve");
@@ -44,7 +62,13 @@ static void node_geo_exec(GeoNodeExecParams params)
geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
if (Curves *curves_id = geometry_set.get_curves_for_write()) {
set_tilt(curves_id->geometry.wrap(), selection_field, tilt_field);
bke::CurvesGeometry &curves = curves_id->geometry.wrap();
const bke::CurvesFieldContext field_context{curves, ATTR_DOMAIN_POINT};
set_curve_tilt(curves, field_context, selection_field, tilt_field);
}
if (geometry_set.has_grease_pencil()) {
set_grease_pencil_tilt(
*geometry_set.get_grease_pencil_for_write(), selection_field, tilt_field);
}
});