Geometry Nodes: Fields version of edge split node
This changes the edge split node to have a selection input, which is more aligned with the other design changes. This loses the ability to split edges based on an angle, but the edge angle can be added as a field input node in the future, which will make for a much more flexible system. Differential Revision: https://developer.blender.org/D12829
This commit is contained in:
parent
96876305e1
commit
366cea95c5
Notes:
blender-bot
2023-02-14 08:47:25 +01:00
Referenced by issue #91764, Updated version of edge split node
|
@ -143,6 +143,7 @@ def mesh_node_items(context):
|
|||
yield NodeItem("GeometryNodeLegacySubdivisionSurface", poll=geometry_nodes_legacy_poll)
|
||||
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
|
||||
|
||||
yield NodeItem("GeometryNodeEdgeSplit")
|
||||
yield NodeItem("GeometryNodeBoolean")
|
||||
yield NodeItem("GeometryNodeMeshSubdivide")
|
||||
yield NodeItem("GeometryNodePointsToVertices")
|
||||
|
|
|
@ -1535,6 +1535,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
|
|||
#define GEO_NODE_TRANSLATE_INSTANCES 1120
|
||||
#define GEO_NODE_SCALE_INSTANCES 1121
|
||||
#define GEO_NODE_ROTATE_INSTANCES 1122
|
||||
#define GEO_NODE_EDGE_SPLIT 1123
|
||||
|
||||
/** \} */
|
||||
|
||||
|
|
|
@ -5720,6 +5720,7 @@ static void registerGeometryNodes()
|
|||
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_legacy_edge_split();
|
||||
|
||||
register_node_type_geo_align_rotation_to_vector();
|
||||
register_node_type_geo_attribute_capture();
|
||||
|
|
|
@ -220,6 +220,7 @@ set(SRC
|
|||
geometry/nodes/node_geo_curve_trim.cc
|
||||
geometry/nodes/node_geo_delete_geometry.cc
|
||||
geometry/nodes/node_geo_distribute_points_on_faces.cc
|
||||
geometry/nodes/node_geo_edge_split.cc
|
||||
geometry/nodes/node_geo_input_curve_handles.cc
|
||||
geometry/nodes/node_geo_input_curve_tilt.cc
|
||||
geometry/nodes/node_geo_input_index.cc
|
||||
|
|
|
@ -40,6 +40,7 @@ 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_legacy_edge_split(void);
|
||||
|
||||
void register_node_type_geo_align_rotation_to_vector(void);
|
||||
void register_node_type_geo_attribute_capture(void);
|
||||
|
|
|
@ -348,6 +348,7 @@ DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "
|
|||
DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Trim Curve", "")
|
||||
DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, def_geo_delete_geometry, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "")
|
||||
DefNode(GeometryNode, GEO_NODE_DISTRIBUTE_POINTS_ON_FACES, def_geo_distribute_points_on_faces, "DISTRIBUTE_POINTS_ON_FACES", DistributePointsOnFaces, "Distribute Points on Faces", "")
|
||||
DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge Split", "")
|
||||
DefNode(GeometryNode, GEO_NODE_INPUT_CURVE_HANDLES, 0, "INPUT_CURVE_HANDLES", InputCurveHandlePositions, "Curve Handle Positions", "")
|
||||
DefNode(GeometryNode, GEO_NODE_INPUT_CURVE_TILT, 0, "INPUT_CURVE_TILT", InputCurveTilt, "Curve Tilt", "")
|
||||
DefNode(GeometryNode, GEO_NODE_INPUT_INDEX, 0, "INDEX", InputIndex, "Index", "")
|
||||
|
|
|
@ -78,7 +78,7 @@ static void geo_node_edge_split_exec(GeoNodeExecParams params)
|
|||
|
||||
} // namespace blender::nodes
|
||||
|
||||
void register_node_type_geo_edge_split()
|
||||
void register_node_type_geo_legacy_edge_split()
|
||||
{
|
||||
static bNodeType ntype;
|
||||
|
||||
|
|
|
@ -0,0 +1,94 @@
|
|||
/*
|
||||
* 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 "BKE_mesh.h"
|
||||
#include "BKE_mesh_runtime.h"
|
||||
|
||||
#include "bmesh.h"
|
||||
#include "bmesh_tools.h"
|
||||
|
||||
#include "node_geometry_util.hh"
|
||||
|
||||
namespace blender::nodes {
|
||||
|
||||
static void geo_node_edge_split_declare(NodeDeclarationBuilder &b)
|
||||
{
|
||||
b.add_input<decl::Geometry>("Mesh");
|
||||
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().supports_field();
|
||||
b.add_output<decl::Geometry>("Mesh");
|
||||
}
|
||||
|
||||
static Mesh *mesh_edge_split(const Mesh &mesh, const IndexMask selection)
|
||||
{
|
||||
const BMeshCreateParams bmcp = {true};
|
||||
const BMAllocTemplate allocsize = {0, 0, 0, 0};
|
||||
BMesh *bm = BM_mesh_create(&allocsize, &bmcp);
|
||||
|
||||
BMeshFromMeshParams params{};
|
||||
BM_mesh_bm_from_me(bm, &mesh, ¶ms);
|
||||
|
||||
BM_mesh_elem_table_ensure(bm, BM_EDGE);
|
||||
for (const int i : selection) {
|
||||
BMEdge *edge = BM_edge_at_index(bm, i);
|
||||
BM_elem_flag_enable(edge, BM_ELEM_TAG);
|
||||
}
|
||||
|
||||
BM_mesh_edgesplit(bm, false, true, false);
|
||||
|
||||
Mesh *result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, &mesh);
|
||||
BM_mesh_free(bm);
|
||||
|
||||
BKE_mesh_normals_tag_dirty(result);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static void geo_node_edge_split_exec(GeoNodeExecParams params)
|
||||
{
|
||||
GeometrySet geometry_set = params.extract_input<GeometrySet>("Mesh");
|
||||
|
||||
const Field<bool> selection_field = params.extract_input<Field<bool>>("Selection");
|
||||
|
||||
geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
|
||||
if (!geometry_set.has_mesh()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const MeshComponent &mesh_component = *geometry_set.get_component_for_read<MeshComponent>();
|
||||
GeometryComponentFieldContext field_context{mesh_component, ATTR_DOMAIN_EDGE};
|
||||
const int domain_size = mesh_component.attribute_domain_size(ATTR_DOMAIN_EDGE);
|
||||
fn::FieldEvaluator selection_evaluator{field_context, domain_size};
|
||||
selection_evaluator.add(selection_field);
|
||||
selection_evaluator.evaluate();
|
||||
const IndexMask selection = selection_evaluator.get_evaluated_as_mask(0);
|
||||
|
||||
geometry_set.replace_mesh(mesh_edge_split(*mesh_component.get_for_read(), selection));
|
||||
});
|
||||
|
||||
params.set_output("Mesh", std::move(geometry_set));
|
||||
}
|
||||
|
||||
} // namespace blender::nodes
|
||||
|
||||
void register_node_type_geo_edge_split()
|
||||
{
|
||||
static bNodeType ntype;
|
||||
|
||||
geo_node_type_base(&ntype, GEO_NODE_EDGE_SPLIT, "Edge Split", NODE_CLASS_GEOMETRY, 0);
|
||||
ntype.geometry_node_execute = blender::nodes::geo_node_edge_split_exec;
|
||||
ntype.declare = blender::nodes::geo_node_edge_split_declare;
|
||||
nodeRegisterType(&ntype);
|
||||
}
|
Loading…
Reference in New Issue