Geometry Nodes: Handle Type Selection Node Update
This node creates a boolean field selection of bezier spline points that have a handle of the given type on the selected 'side' of the contol point. This is evaluated on the point domain. Differential Revision: https://developer.blender.org/D12559
This commit is contained in:
parent
adc084a3e9
commit
2305f270c5
|
@ -532,6 +532,7 @@ geometry_node_categories = [
|
|||
NodeItem("GeometryNodeCurveSetHandles"),
|
||||
NodeItem("GeometryNodeInputTangent"),
|
||||
NodeItem("GeometryNodeCurveSample"),
|
||||
NodeItem("GeometryNodeCurveHandleTypeSelection"),
|
||||
NodeItem("GeometryNodeCurveFillet"),
|
||||
NodeItem("GeometryNodeCurveReverse"),
|
||||
]),
|
||||
|
|
|
@ -1514,6 +1514,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
|
|||
#define GEO_NODE_CURVE_SPLINE_TYPE 1099
|
||||
#define GEO_NODE_CURVE_SET_HANDLES 1100
|
||||
#define GEO_NODE_POINTS_TO_VOLUME 1101
|
||||
#define GEO_NODE_CURVE_HANDLE_TYPE_SELECTION 1102
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
@ -5717,8 +5717,8 @@ static void registerGeometryNodes()
|
|||
register_node_type_geo_legacy_select_by_material();
|
||||
register_node_type_geo_legacy_curve_spline_type();
|
||||
register_node_type_geo_legacy_curve_reverse();
|
||||
register_node_type_geo_legacy_select_by_handle_type();
|
||||
register_node_type_geo_legacy_curve_subdivide();
|
||||
|
||||
register_node_type_geo_align_rotation_to_vector();
|
||||
register_node_type_geo_attribute_capture();
|
||||
register_node_type_geo_attribute_clamp();
|
||||
|
@ -5744,6 +5744,7 @@ static void registerGeometryNodes()
|
|||
register_node_type_geo_curve_endpoints();
|
||||
register_node_type_geo_curve_fill();
|
||||
register_node_type_geo_curve_fillet();
|
||||
register_node_type_geo_curve_handle_type_selection();
|
||||
register_node_type_geo_curve_length();
|
||||
register_node_type_geo_curve_parameter();
|
||||
register_node_type_geo_curve_primitive_bezier_segment();
|
||||
|
@ -5801,7 +5802,6 @@ static void registerGeometryNodes()
|
|||
register_node_type_geo_raycast();
|
||||
register_node_type_geo_realize_instances();
|
||||
register_node_type_geo_sample_texture();
|
||||
register_node_type_geo_select_by_handle_type();
|
||||
register_node_type_geo_separate_components();
|
||||
register_node_type_geo_set_position();
|
||||
register_node_type_geo_string_join();
|
||||
|
|
|
@ -9706,6 +9706,24 @@ static void def_geo_curve_select_handles(StructRNA *srna)
|
|||
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
|
||||
}
|
||||
|
||||
static void def_geo_curve_handle_type_selection(StructRNA *srna)
|
||||
{
|
||||
PropertyRNA *prop;
|
||||
|
||||
RNA_def_struct_sdna_from(srna, "NodeGeometryCurveSelectHandles", "storage");
|
||||
|
||||
prop = RNA_def_property(srna, "handle_type", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_sdna(prop, NULL, "handle_type");
|
||||
RNA_def_property_enum_items(prop, rna_node_geometry_curve_handle_type_items);
|
||||
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
|
||||
|
||||
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_items(prop, rna_node_geometry_curve_handle_side_items);
|
||||
RNA_def_property_ui_text(prop, "Mode", "Whether to check the type of left and right handles");
|
||||
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
|
||||
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
|
||||
}
|
||||
|
||||
static void def_geo_curve_primitive_circle(StructRNA *srna)
|
||||
{
|
||||
static const EnumPropertyItem mode_items[] = {
|
||||
|
|
|
@ -198,6 +198,7 @@ set(SRC
|
|||
geometry/nodes/node_geo_convex_hull.cc
|
||||
geometry/nodes/node_geo_curve_fill.cc
|
||||
geometry/nodes/node_geo_curve_fillet.cc
|
||||
geometry/nodes/node_geo_curve_handle_type_selection.cc
|
||||
geometry/nodes/node_geo_curve_length.cc
|
||||
geometry/nodes/node_geo_curve_parameter.cc
|
||||
geometry/nodes/node_geo_curve_primitive_bezier_segment.cc
|
||||
|
|
|
@ -37,6 +37,7 @@ void register_node_type_geo_legacy_points_to_volume(void);
|
|||
void register_node_type_geo_legacy_select_by_material(void);
|
||||
void register_node_type_geo_legacy_curve_spline_type(void);
|
||||
void register_node_type_geo_legacy_curve_reverse(void);
|
||||
void register_node_type_geo_legacy_select_by_handle_type(void);
|
||||
void register_node_type_geo_legacy_curve_subdivide(void);
|
||||
|
||||
void register_node_type_geo_align_rotation_to_vector(void);
|
||||
|
@ -64,6 +65,7 @@ void register_node_type_geo_convex_hull(void);
|
|||
void register_node_type_geo_curve_endpoints(void);
|
||||
void register_node_type_geo_curve_fill(void);
|
||||
void register_node_type_geo_curve_fillet(void);
|
||||
void register_node_type_geo_curve_handle_type_selection(void);
|
||||
void register_node_type_geo_curve_length(void);
|
||||
void register_node_type_geo_curve_parameter(void);
|
||||
void register_node_type_geo_curve_primitive_bezier_segment(void);
|
||||
|
|
|
@ -326,6 +326,7 @@ DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info, "COLLEC
|
|||
DefNode(GeometryNode, GEO_NODE_CONVEX_HULL, 0, "CONVEX_HULL", ConvexHull, "Convex Hull", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_FILL, def_geo_curve_fill, "CURVE_FILL", CurveFill, "Curve Fill", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_FILLET, def_geo_curve_fillet, "CURVE_FILLET", CurveFillet, "Curve Fillet", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_HANDLE_TYPE_SELECTION, def_geo_curve_handle_type_selection, "CURVE_HANDLE_TYPE_SELECTION", CurveHandleTypeSelection, "Handle Type Selection", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength, "Curve Length", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_PARAMETER, 0, "CURVE_PARAMETER", CurveParameter, "Curve Parameter", "")
|
||||
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, def_geo_curve_primitive_bezier_segment, "CURVE_PRIMITIVE_BEZIER_SEGMENT", CurvePrimitiveBezierSegment, "Bezier Segment", "")
|
||||
|
|
|
@ -123,7 +123,7 @@ static void geo_node_select_by_handle_type_exec(GeoNodeExecParams params)
|
|||
|
||||
} // namespace blender::nodes
|
||||
|
||||
void register_node_type_geo_select_by_handle_type()
|
||||
void register_node_type_geo_legacy_select_by_handle_type()
|
||||
{
|
||||
static bNodeType ntype;
|
||||
|
||||
|
|
|
@ -0,0 +1,180 @@
|
|||
/*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "BLI_task.hh"
|
||||
|
||||
#include "BKE_spline.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
|
||||
#include "node_geometry_util.hh"
|
||||
|
||||
namespace blender::nodes {
|
||||
|
||||
static void geo_node_curve_handle_type_selection_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_output<decl::Bool>("Selection").field_source();
|
||||
}
|
||||
|
||||
static void geo_node_curve_handle_type_selection_layout(uiLayout *layout,
|
||||
bContext *UNUSED(C),
|
||||
PointerRNA *ptr)
|
||||
{
|
||||
uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
|
||||
uiItemR(layout, ptr, "handle_type", 0, "", ICON_NONE);
|
||||
}
|
||||
|
||||
static void geo_node_curve_handle_type_selection_init(bNodeTree *UNUSED(tree), bNode *node)
|
||||
{
|
||||
NodeGeometryCurveSelectHandles *data = (NodeGeometryCurveSelectHandles *)MEM_callocN(
|
||||
sizeof(NodeGeometryCurveSelectHandles), __func__);
|
||||
|
||||
data->handle_type = GEO_NODE_CURVE_HANDLE_AUTO;
|
||||
data->mode = GEO_NODE_CURVE_HANDLE_LEFT | GEO_NODE_CURVE_HANDLE_RIGHT;
|
||||
node->storage = data;
|
||||
}
|
||||
|
||||
static BezierSpline::HandleType handle_type_from_input_type(const GeometryNodeCurveHandleType type)
|
||||
{
|
||||
switch (type) {
|
||||
case GEO_NODE_CURVE_HANDLE_AUTO:
|
||||
return BezierSpline::HandleType::Auto;
|
||||
case GEO_NODE_CURVE_HANDLE_ALIGN:
|
||||
return BezierSpline::HandleType::Align;
|
||||
case GEO_NODE_CURVE_HANDLE_FREE:
|
||||
return BezierSpline::HandleType::Free;
|
||||
case GEO_NODE_CURVE_HANDLE_VECTOR:
|
||||
return BezierSpline::HandleType::Vector;
|
||||
}
|
||||
BLI_assert_unreachable();
|
||||
return BezierSpline::HandleType::Auto;
|
||||
}
|
||||
|
||||
static void select_by_handle_type(const CurveEval &curve,
|
||||
const BezierSpline::HandleType type,
|
||||
const GeometryNodeCurveHandleMode mode,
|
||||
const IndexMask mask,
|
||||
const MutableSpan<bool> r_selection)
|
||||
{
|
||||
int offset = 0;
|
||||
for (const SplinePtr &spline : curve.splines()) {
|
||||
if (spline->type() != Spline::Type::Bezier) {
|
||||
r_selection.slice(offset, spline->size()).fill(false);
|
||||
offset += spline->size();
|
||||
}
|
||||
else {
|
||||
BezierSpline *b = static_cast<BezierSpline *>(spline.get());
|
||||
for (int i : IndexRange(b->size())) {
|
||||
if (mode & GeometryNodeCurveHandleMode::GEO_NODE_CURVE_HANDLE_LEFT) {
|
||||
r_selection[offset++] = b->handle_types_left()[i] == type;
|
||||
}
|
||||
else if (mode & GeometryNodeCurveHandleMode::GEO_NODE_CURVE_HANDLE_RIGHT) {
|
||||
r_selection[offset++] = b->handle_types_right()[i] == type;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class HandleTypeFieldInput final : public fn::FieldInput {
|
||||
BezierSpline::HandleType type_;
|
||||
GeometryNodeCurveHandleMode mode_;
|
||||
|
||||
public:
|
||||
HandleTypeFieldInput(BezierSpline::HandleType type, GeometryNodeCurveHandleMode mode)
|
||||
: FieldInput(CPPType::get<bool>(), "Selection"), type_(type), mode_(mode)
|
||||
{
|
||||
}
|
||||
|
||||
const GVArray *get_varray_for_context(const fn::FieldContext &context,
|
||||
IndexMask mask,
|
||||
ResourceScope &scope) const final
|
||||
{
|
||||
if (const GeometryComponentFieldContext *geometry_context =
|
||||
dynamic_cast<const GeometryComponentFieldContext *>(&context)) {
|
||||
|
||||
const GeometryComponent &component = geometry_context->geometry_component();
|
||||
const AttributeDomain domain = geometry_context->domain();
|
||||
if (component.type() != GEO_COMPONENT_TYPE_CURVE) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
|
||||
const CurveEval *curve = curve_component.get_for_read();
|
||||
if (curve == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (domain == ATTR_DOMAIN_POINT) {
|
||||
Array<bool> selection(mask.min_array_size());
|
||||
select_by_handle_type(*curve, type_, mode_, mask, selection);
|
||||
return &scope.construct<fn::GVArray_For_ArrayContainer<Array<bool>>>(std::move(selection));
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
};
|
||||
|
||||
uint64_t hash() const override
|
||||
{
|
||||
return get_default_hash_2((int)mode_, (int)type_);
|
||||
}
|
||||
|
||||
bool is_equal_to(const fn::FieldNode &other) const override
|
||||
{
|
||||
return dynamic_cast<const HandleTypeFieldInput *>(&other) != nullptr;
|
||||
if (const HandleTypeFieldInput *other_handle_selection =
|
||||
dynamic_cast<const HandleTypeFieldInput *>(&other)) {
|
||||
return mode_ == other_handle_selection->mode_ && type_ == other_handle_selection->type_;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
static void geo_node_curve_handle_type_selection_exec(GeoNodeExecParams params)
|
||||
{
|
||||
const NodeGeometryCurveSelectHandles *storage =
|
||||
(const NodeGeometryCurveSelectHandles *)params.node().storage;
|
||||
const BezierSpline::HandleType handle_type = handle_type_from_input_type(
|
||||
(GeometryNodeCurveHandleType)storage->handle_type);
|
||||
const GeometryNodeCurveHandleMode mode = (GeometryNodeCurveHandleMode)storage->mode;
|
||||
|
||||
Field<bool> selection_field{std::make_shared<HandleTypeFieldInput>(handle_type, mode)};
|
||||
params.set_output("Selection", std::move(selection_field));
|
||||
}
|
||||
|
||||
} // namespace blender::nodes
|
||||
|
||||
void register_node_type_geo_curve_handle_type_selection()
|
||||
{
|
||||
static bNodeType ntype;
|
||||
|
||||
geo_node_type_base(&ntype,
|
||||
GEO_NODE_CURVE_HANDLE_TYPE_SELECTION,
|
||||
"Handle Type Selection",
|
||||
NODE_CLASS_GEOMETRY,
|
||||
0);
|
||||
ntype.declare = blender::nodes::geo_node_curve_handle_type_selection_declare;
|
||||
ntype.geometry_node_execute = blender::nodes::geo_node_curve_handle_type_selection_exec;
|
||||
node_type_init(&ntype, blender::nodes::geo_node_curve_handle_type_selection_init);
|
||||
node_type_storage(&ntype,
|
||||
"NodeGeometryCurveSelectHandles",
|
||||
node_free_standard_storage,
|
||||
node_copy_standard_storage);
|
||||
ntype.draw_buttons = blender::nodes::geo_node_curve_handle_type_selection_layout;
|
||||
|
||||
nodeRegisterType(&ntype);
|
||||
}
|
Loading…
Reference in New Issue