diff --git a/scripts/startup/bl_ui/node_add_menu_geometry.py b/scripts/startup/bl_ui/node_add_menu_geometry.py index 73cdc4f3e8c..ea7c40f1178 100644 --- a/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -424,6 +424,7 @@ class NODE_MT_geometry_node_mesh_topology(Menu): def draw(self, _context): layout = self.layout + node_add_menu.add_node_type(layout, "GeometryNodeCornersOfEdge") node_add_menu.add_node_type(layout, "GeometryNodeCornersOfFace") node_add_menu.add_node_type(layout, "GeometryNodeCornersOfVertex") node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfCorner") diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 6f3a0d5112d..ed7bdfaa7e3 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1308,6 +1308,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_SIMULATION_OUTPUT 2101 #define GEO_NODE_INPUT_SIGNED_DISTANCE 2102 #define GEO_NODE_SAMPLE_VOLUME 2103 +#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2104 /** \} */ diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index e24c2f4570b..31de5535458 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -374,6 +374,7 @@ DefNode(GeometryNode, GEO_NODE_MESH_TO_CURVE, 0, "MESH_TO_CURVE", MeshToCurve, " DefNode(GeometryNode, GEO_NODE_MESH_TO_POINTS, def_geo_mesh_to_points, "MESH_TO_POINTS", MeshToPoints, "Mesh to Points", "Generate a point cloud from a mesh's vertices") DefNode(GeometryNode, GEO_NODE_MESH_TO_SDF_VOLUME, def_geo_mesh_to_sdf_volume, "MESH_TO_SDF_VOLUME", MeshToSDFVolume, "Mesh to SDF Volume", "Create an SDF volume with the shape of the input mesh's surface") DefNode(GeometryNode, GEO_NODE_MESH_TO_VOLUME, def_geo_mesh_to_volume, "MESH_TO_VOLUME", MeshToVolume, "Mesh to Volume", "Create a fog volume with the shape of the input mesh's surface") +DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE, 0, "CORNERS_OF_EDGE", CornersOfEdge, "Corners of Edge", "Retrieve face corners connected to edges") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_FACE, 0, "CORNERS_OF_FACE", CornersOfFace, "Corners of Face", "Retrieve corners that make up a face") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_VERTEX, 0, "CORNERS_OF_VERTEX", CornersOfVertex, "Corners of Vertex", "Retrieve face corners connected to vertices") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_EDGES_OF_CORNER, 0, "EDGES_OF_CORNER", EdgesOfCorner, "Edges of Corner", "Retrieve the edges on both sides of a face corner") diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index a332400c7c3..60d3a096ddb 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -130,6 +130,7 @@ set(SRC nodes/node_geo_mesh_to_points.cc nodes/node_geo_mesh_to_sdf_volume.cc nodes/node_geo_mesh_to_volume.cc + nodes/node_geo_mesh_topology_corners_of_edge.cc nodes/node_geo_mesh_topology_corners_of_face.cc nodes/node_geo_mesh_topology_corners_of_vertex.cc nodes/node_geo_mesh_topology_edges_of_corner.cc diff --git a/source/blender/nodes/geometry/node_geometry_register.cc b/source/blender/nodes/geometry/node_geometry_register.cc index 45de3a4f5e1..f5e9a25b017 100644 --- a/source/blender/nodes/geometry/node_geometry_register.cc +++ b/source/blender/nodes/geometry/node_geometry_register.cc @@ -114,6 +114,7 @@ void register_geometry_nodes() register_node_type_geo_mesh_to_points(); register_node_type_geo_mesh_to_sdf_volume(); register_node_type_geo_mesh_to_volume(); + register_node_type_geo_mesh_topology_corners_of_edge(); register_node_type_geo_mesh_topology_corners_of_face(); register_node_type_geo_mesh_topology_corners_of_vertex(); register_node_type_geo_mesh_topology_edges_of_corner(); diff --git a/source/blender/nodes/geometry/node_geometry_register.hh b/source/blender/nodes/geometry/node_geometry_register.hh index 39efd11639c..df78df75d3c 100644 --- a/source/blender/nodes/geometry/node_geometry_register.hh +++ b/source/blender/nodes/geometry/node_geometry_register.hh @@ -111,6 +111,7 @@ void register_node_type_geo_mesh_to_curve(); void register_node_type_geo_mesh_to_points(); void register_node_type_geo_mesh_to_sdf_volume(); void register_node_type_geo_mesh_to_volume(); +void register_node_type_geo_mesh_topology_corners_of_edge(); void register_node_type_geo_mesh_topology_corners_of_face(); void register_node_type_geo_mesh_topology_corners_of_vertex(); void register_node_type_geo_mesh_topology_edges_of_corner(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc new file mode 100644 index 00000000000..ae5cd4657e7 --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc @@ -0,0 +1,197 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "BKE_mesh.hh" +#include "BKE_mesh_mapping.h" + +#include "BLI_task.hh" + +#include "node_geometry_util.hh" + +namespace blender::nodes::node_geo_mesh_topology_corners_of_edge_cc { + +static void node_declare(NodeDeclarationBuilder &b) +{ + b.add_input(N_("Edge Index")) + .implicit_field(implicit_field_inputs::index) + .description( + N_("The edge to retrieve data from. Defaults to the edge from the context")); + b.add_input(N_("Weights")) + .supports_field() + .hide_value() + .description( + N_("Values that sort the corners attached to the edge")); + b.add_input(N_("Sort Index")) + .min(0) + .supports_field() + .description(N_("Which of the sorted corners to output")); + b.add_output(N_("Corner Index")) + .field_source_reference_all() + .description(N_("A corner of the input edge in its face's winding order, chosen by the sort index")); + b.add_output(N_("Total")) + .field_source() + .reference_pass({0}) + .description(N_("The number of faces or corners connected to each edge")); +} + +class CornersOfEdgeInput final : public bke::MeshFieldInput { + const Field edge_index_; + const Field sort_index_; + const Field sort_weight_; + + public: + CornersOfEdgeInput(Field edge_index, Field sort_index, Field sort_weight) + : bke::MeshFieldInput(CPPType::get(), "Corner of Edge"), + edge_index_(std::move(edge_index)), + sort_index_(std::move(sort_index)), + sort_weight_(std::move(sort_weight)) + { + category_ = Category::Generated; + } + + GVArray get_varray_for_context(const Mesh &mesh, + const eAttrDomain domain, + const IndexMask &mask) const final + { + const IndexRange edge_range(mesh.totedge); + Array map_offsets; + Array map_indices; + const Span corner_edges = mesh.corner_edges(); + const GroupedSpan edge_to_loop_map = bke::mesh::build_edge_to_loop_map( + mesh.corner_edges(), mesh.totedge, map_offsets, map_indices); + + const bke::MeshFieldContext context{mesh, domain}; + fn::FieldEvaluator evaluator{context, &mask}; + evaluator.add(edge_index_); + evaluator.add(sort_index_); + evaluator.evaluate(); + const VArray edge_indices = evaluator.get_evaluated(0); + const VArray indices_in_sort = evaluator.get_evaluated(1); + + const bke::MeshFieldContext corner_context{mesh, ATTR_DOMAIN_CORNER}; + fn::FieldEvaluator corner_evaluator{corner_context, corner_edges.size()}; + corner_evaluator.add(sort_weight_); + corner_evaluator.evaluate(); + const VArray all_sort_weights = corner_evaluator.get_evaluated(0); + const bool use_sorting = !all_sort_weights.is_single(); + + Array corner_of_edge(mask.min_array_size()); + mask.foreach_segment(GrainSize(1024), [&](const IndexMaskSegment segment) { + /* Reuse arrays to avoid allocation. */ + Array corner_indices; + Array sort_weights; + Array sort_indices; + + for (const int selection_i : segment) { + const int edge_i = edge_indices[selection_i]; + const int index_in_sort = indices_in_sort[selection_i]; + if (!edge_range.contains(edge_i)) { + corner_of_edge[selection_i] = 0; + continue; + } + + const Span corners = edge_to_loop_map[edge_i]; + if (corners.is_empty()) { + corner_of_edge[selection_i] = 0; + continue; + } + + const int index_in_sort_wrapped = mod_i(index_in_sort, corners.size()); + if (use_sorting) { + /* Retrieve a compressed array of weights for each edge. */ + sort_weights.reinitialize(corners.size()); + IndexMaskMemory memory; + all_sort_weights.materialize_compressed(IndexMask::from_indices(corners, memory), + sort_weights.as_mutable_span()); + + /* Sort a separate array of compressed indices corresponding to the compressed weights. + * This allows using `materialize_compressed` to avoid virtual function call overhead + * when accessing values in the sort weights. However, it means a separate array of + * indices within the compressed array is necessary for sorting. */ + sort_indices.reinitialize(corners.size()); + std::iota(sort_indices.begin(), sort_indices.end(), 0); + std::stable_sort(sort_indices.begin(), sort_indices.end(), [&](int a, int b) { + return sort_weights[a] < sort_weights[b]; + }); + corner_of_edge[selection_i] = corners[sort_indices[index_in_sort_wrapped]]; + } + else { + corner_of_edge[selection_i] = corners[index_in_sort_wrapped]; + } + } + }); + + return VArray::ForContainer(std::move(corner_of_edge)); + } + + void for_each_field_input_recursive(FunctionRef fn) const override + { + edge_index_.node().for_each_field_input_recursive(fn); + sort_index_.node().for_each_field_input_recursive(fn); + sort_weight_.node().for_each_field_input_recursive(fn); + } + + std::optional preferred_domain(const Mesh & /*mesh*/) const final + { + return ATTR_DOMAIN_EDGE; + } +}; + +class CornersOfEdgeCountInput final : public bke::MeshFieldInput { + public: + CornersOfEdgeCountInput() : bke::MeshFieldInput(CPPType::get(), "Edge Corner Count") + { + category_ = Category::Generated; + } + + GVArray get_varray_for_context(const Mesh &mesh, + const eAttrDomain domain, + const IndexMask & /*mask*/) const final + { + if (domain != ATTR_DOMAIN_EDGE) { + return {}; + } + const Span corner_edges = mesh.corner_edges(); + Array counts(mesh.totedge, 0); + for (const int i : corner_edges.index_range()) { + counts[corner_edges[i]]++; + } + return VArray::ForContainer(std::move(counts)); + } + + std::optional preferred_domain(const Mesh & /*mesh*/) const final + { + return ATTR_DOMAIN_EDGE; + } +}; + +static void node_geo_exec(GeoNodeExecParams params) +{ + const Field edge_index = params.extract_input>("Edge Index"); + if (params.output_is_required("Total")) { + params.set_output("Total", + Field(std::make_shared( + edge_index, + Field(std::make_shared()), + ATTR_DOMAIN_EDGE))); + } + if (params.output_is_required("Corner Index")) { + params.set_output("Corner Index", + Field(std::make_shared( + edge_index, + params.extract_input>("Sort Index"), + params.extract_input>("Weights")))); + } +} +} // namespace blender::nodes::node_geo_mesh_topology_corners_of_edge_cc + +void register_node_type_geo_mesh_topology_corners_of_edge() +{ + namespace file_ns = blender::nodes::node_geo_mesh_topology_corners_of_edge_cc; + + static bNodeType ntype; + geo_node_type_base( + &ntype, GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE, "Corners of Edge", NODE_CLASS_INPUT); + ntype.geometry_node_execute = file_ns::node_geo_exec; + ntype.declare = file_ns::node_declare; + nodeRegisterType(&ntype); +}