From 06db02e23648e53678f409bea16fc1f2662ddfe9 Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 16 May 2023 10:35:01 +0200 Subject: [PATCH 1/8] adds corners of edge topology node --- .../startup/bl_ui/node_add_menu_geometry.py | 1 + source/blender/blenkernel/BKE_node.h | 1 + source/blender/nodes/NOD_static_types.h | 1 + source/blender/nodes/geometry/CMakeLists.txt | 1 + .../nodes/geometry/node_geometry_register.cc | 1 + .../nodes/geometry/node_geometry_register.hh | 1 + .../node_geo_mesh_topology_corners_of_edge.cc | 232 ++++++++++++++++++ 7 files changed, 238 insertions(+) create mode 100644 source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc diff --git a/scripts/startup/bl_ui/node_add_menu_geometry.py b/scripts/startup/bl_ui/node_add_menu_geometry.py index 2544c1d5f96..44dfdcca315 100644 --- a/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -426,6 +426,7 @@ class NODE_MT_geometry_node_mesh_topology(Menu): layout = self.layout node_add_menu.add_node_type(layout, "GeometryNodeCornersOfFace") node_add_menu.add_node_type(layout, "GeometryNodeCornersOfVertex") + node_add_menu.add_node_type(layout, "GeometryNodeCornersOfEdge") node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfCorner") node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfVertex") node_add_menu.add_node_type(layout, "GeometryNodeFaceOfCorner") diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 9b1c8c31a2f..6ae81896d70 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1567,6 +1567,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_MESH_TOPOLOGY_OFFSET_CORNER_IN_FACE 1180 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_FACE 1181 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_VERTEX 1182 +#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2102 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_CORNER 1183 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_VERTEX 1184 #define GEO_NODE_MESH_TOPOLOGY_FACE_OF_CORNER 1185 diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 842d5ab646e..e30b0b85005 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -376,6 +376,7 @@ DefNode(GeometryNode, GEO_NODE_MESH_TO_SDF_VOLUME, def_geo_mesh_to_sdf_volume, " 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_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_CORNERS_OF_EDGE, 0, "CORNERS_OF_EDGE", CornersOfEdge, "Corners of Edge", "Retrieve face corners connected to edges") 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") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_EDGES_OF_VERTEX, 0, "EDGES_OF_VERTEX", EdgesOfVertex, "Edges of Vertex", "Retrieve the edges connected to each vertex") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_FACE_OF_CORNER, 0, "FACE_OF_CORNER", FaceOfCorner, "Face of Corner", "Retrieve the face each face corner is part of") diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 0e675fe58df..d1c7fc09f2b 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -131,6 +131,7 @@ set(SRC nodes/node_geo_mesh_to_volume.cc nodes/node_geo_mesh_topology_corners_of_face.cc nodes/node_geo_mesh_topology_corners_of_vertex.cc + nodes/node_geo_mesh_topology_corners_of_edge.cc nodes/node_geo_mesh_topology_edges_of_corner.cc nodes/node_geo_mesh_topology_edges_of_vertex.cc nodes/node_geo_mesh_topology_face_of_corner.cc diff --git a/source/blender/nodes/geometry/node_geometry_register.cc b/source/blender/nodes/geometry/node_geometry_register.cc index acf5c5981f1..4e845ae2688 100644 --- a/source/blender/nodes/geometry/node_geometry_register.cc +++ b/source/blender/nodes/geometry/node_geometry_register.cc @@ -115,6 +115,7 @@ void register_geometry_nodes() register_node_type_geo_mesh_to_volume(); register_node_type_geo_mesh_topology_corners_of_face(); register_node_type_geo_mesh_topology_corners_of_vertex(); + register_node_type_geo_mesh_topology_corners_of_edge(); register_node_type_geo_mesh_topology_edges_of_corner(); register_node_type_geo_mesh_topology_edges_of_vertex(); register_node_type_geo_mesh_topology_face_of_corner(); diff --git a/source/blender/nodes/geometry/node_geometry_register.hh b/source/blender/nodes/geometry/node_geometry_register.hh index ff69c68a9b0..be24a86eabd 100644 --- a/source/blender/nodes/geometry/node_geometry_register.hh +++ b/source/blender/nodes/geometry/node_geometry_register.hh @@ -112,6 +112,7 @@ 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_face(); void register_node_type_geo_mesh_topology_corners_of_vertex(); +void register_node_type_geo_mesh_topology_corners_of_edge(); void register_node_type_geo_mesh_topology_edges_of_corner(); void register_node_type_geo_mesh_topology_edges_of_vertex(); void register_node_type_geo_mesh_topology_face_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..fe60475bec6 --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc @@ -0,0 +1,232 @@ +/* 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 used to sort corners attached to the edge. Uses indices by default")); + 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 connected to the face, 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")); +} + +static void conedge_span(const Span src, MutableSpan dst) +{ + for (const int i : src.index_range()) { + dst[i] = src[i]; + } +} + +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); + const Span corner_edges = mesh.corner_edges(); + Array> edge_to_loop_map = bke::mesh_topology::build_edge_to_loop_map(corner_edges, + mesh.totedge); + + 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()); + threading::parallel_for(mask.index_range(), 1024, [&](const IndexRange range) { + /* Reuse arrays to avoid allocation. */ + Array corner_indices; + Array sort_weights; + Array sort_indices; + + for (const int selection_i : mask.slice(range)) { + 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 the connected edge indices as 64 bit integers for #materialize_compressed. */ + corner_indices.reinitialize(corners.size()); + conedge_span(corners, corner_indices); + + /* Retrieve a compressed array of weights for each edge. */ + sort_weights.reinitialize(corners.size()); + all_sort_weights.materialize_compressed(IndexMask(corner_indices), + 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] = corner_indices[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); + } + + uint64_t hash() const final + { + return 125394805703121; + } + + bool is_equal_to(const fn::FieldNode &other) const final + { + if (const auto *typed = dynamic_cast(&other)) { + return typed->edge_index_ == edge_index_ && typed->sort_index_ == sort_index_ && + typed->sort_weight_ == sort_weight_; + } + return false; + } + + 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)); + } + + uint64_t hash() const final + { + return 253098745374645; + } + + bool is_equal_to(const fn::FieldNode &other) const final + { + if (dynamic_cast(&other)) { + return true; + } + return false; + } + + 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); +} -- 2.30.2 From 5bbcedb17d16bed625cc406105668f1e49cfebba Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 16 May 2023 17:44:15 +0200 Subject: [PATCH 2/8] Different Register ID --- source/blender/blenkernel/BKE_node.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 2a0015bcd3f..2d6cd8ce7ed 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1283,7 +1283,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_MESH_TOPOLOGY_OFFSET_CORNER_IN_FACE 1180 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_FACE 1181 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_VERTEX 1182 -#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2102 +#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2103 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_CORNER 1183 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_VERTEX 1184 #define GEO_NODE_MESH_TOPOLOGY_FACE_OF_CORNER 1185 -- 2.30.2 From d2d8370c7a0e78769974b85f6f7d935c2632263f Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 16 May 2023 18:38:10 +0200 Subject: [PATCH 3/8] Fixed order and removed unecessary functions --- .../startup/bl_ui/node_add_menu_geometry.py | 2 +- source/blender/blenkernel/BKE_node.h | 2 +- source/blender/nodes/NOD_static_types.h | 2 +- source/blender/nodes/geometry/CMakeLists.txt | 2 +- .../nodes/geometry/node_geometry_register.cc | 2 +- .../nodes/geometry/node_geometry_register.hh | 2 +- .../node_geo_mesh_topology_corners_of_edge.cc | 27 ------------------- 7 files changed, 6 insertions(+), 33 deletions(-) diff --git a/scripts/startup/bl_ui/node_add_menu_geometry.py b/scripts/startup/bl_ui/node_add_menu_geometry.py index cb709960356..e2e8ef08a44 100644 --- a/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -424,9 +424,9 @@ 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, "GeometryNodeCornersOfEdge") node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfCorner") node_add_menu.add_node_type(layout, "GeometryNodeEdgesOfVertex") node_add_menu.add_node_type(layout, "GeometryNodeFaceOfCorner") diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 2d6cd8ce7ed..0bdb3c1c10b 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1281,9 +1281,9 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_CURVE_TOPOLOGY_CURVE_OF_POINT 1178 #define GEO_NODE_CURVE_TOPOLOGY_POINTS_OF_CURVE 1179 #define GEO_NODE_MESH_TOPOLOGY_OFFSET_CORNER_IN_FACE 1180 +#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2103 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_FACE 1181 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_VERTEX 1182 -#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2103 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_CORNER 1183 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_VERTEX 1184 #define GEO_NODE_MESH_TOPOLOGY_FACE_OF_CORNER 1185 diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 05c0f1ae8dc..f0116718f8d 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -375,9 +375,9 @@ 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_CORNERS_OF_EDGE, 0, "CORNERS_OF_EDGE", CornersOfEdge, "Corners of Edge", "Retrieve face corners connected to edges") 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") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_EDGES_OF_VERTEX, 0, "EDGES_OF_VERTEX", EdgesOfVertex, "Edges of Vertex", "Retrieve the edges connected to each vertex") DefNode(GeometryNode, GEO_NODE_MESH_TOPOLOGY_FACE_OF_CORNER, 0, "FACE_OF_CORNER", FaceOfCorner, "Face of Corner", "Retrieve the face each face corner is part of") diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 2b4baffe0bd..6eb71315fc5 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -130,9 +130,9 @@ 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_corners_of_edge.cc nodes/node_geo_mesh_topology_edges_of_corner.cc nodes/node_geo_mesh_topology_edges_of_vertex.cc nodes/node_geo_mesh_topology_face_of_corner.cc diff --git a/source/blender/nodes/geometry/node_geometry_register.cc b/source/blender/nodes/geometry/node_geometry_register.cc index 1b99309013a..2fb66582dbc 100644 --- a/source/blender/nodes/geometry/node_geometry_register.cc +++ b/source/blender/nodes/geometry/node_geometry_register.cc @@ -114,9 +114,9 @@ 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_corners_of_edge(); register_node_type_geo_mesh_topology_edges_of_corner(); register_node_type_geo_mesh_topology_edges_of_vertex(); register_node_type_geo_mesh_topology_face_of_corner(); diff --git a/source/blender/nodes/geometry/node_geometry_register.hh b/source/blender/nodes/geometry/node_geometry_register.hh index acb87fbea30..4d110d7fca3 100644 --- a/source/blender/nodes/geometry/node_geometry_register.hh +++ b/source/blender/nodes/geometry/node_geometry_register.hh @@ -111,9 +111,9 @@ 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_corners_of_edge(); void register_node_type_geo_mesh_topology_edges_of_corner(); void register_node_type_geo_mesh_topology_edges_of_vertex(); void register_node_type_geo_mesh_topology_face_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 index fe60475bec6..bcc363261a3 100644 --- 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 @@ -138,20 +138,6 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { sort_weight_.node().for_each_field_input_recursive(fn); } - uint64_t hash() const final - { - return 125394805703121; - } - - bool is_equal_to(const fn::FieldNode &other) const final - { - if (const auto *typed = dynamic_cast(&other)) { - return typed->edge_index_ == edge_index_ && typed->sort_index_ == sort_index_ && - typed->sort_weight_ == sort_weight_; - } - return false; - } - std::optional preferred_domain(const Mesh & /*mesh*/) const final { return ATTR_DOMAIN_EDGE; @@ -180,19 +166,6 @@ class CornersOfEdgeCountInput final : public bke::MeshFieldInput { return VArray::ForContainer(std::move(counts)); } - uint64_t hash() const final - { - return 253098745374645; - } - - bool is_equal_to(const fn::FieldNode &other) const final - { - if (dynamic_cast(&other)) { - return true; - } - return false; - } - std::optional preferred_domain(const Mesh & /*mesh*/) const final { return ATTR_DOMAIN_EDGE; -- 2.30.2 From b923448ac773b95fce7c5e20795c409dd7827494 Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 16 May 2023 19:04:36 +0200 Subject: [PATCH 4/8] made edge_to_loop_map constant --- .../geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index bcc363261a3..4c2dde0fb5e 100644 --- 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 @@ -61,7 +61,7 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { { const IndexRange edge_range(mesh.totedge); const Span corner_edges = mesh.corner_edges(); - Array> edge_to_loop_map = bke::mesh_topology::build_edge_to_loop_map(corner_edges, + const Array> edge_to_loop_map = bke::mesh_topology::build_edge_to_loop_map(corner_edges, mesh.totedge); const bke::MeshFieldContext context{mesh, domain}; -- 2.30.2 From d3b42285b27a3f466e579021a87a79a22c149f63 Mon Sep 17 00:00:00 2001 From: Soeren Schmidt-Clausen Date: Tue, 16 May 2023 22:19:26 +0200 Subject: [PATCH 5/8] Update source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc fixed bad renaming --- .../geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 4c2dde0fb5e..fdfdfec183d 100644 --- 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 @@ -33,7 +33,7 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_("The number of faces or corners connected to each edge")); } -static void conedge_span(const Span src, MutableSpan dst) +static void convert_span(const Span src, MutableSpan dst) { for (const int i : src.index_range()) { dst[i] = src[i]; -- 2.30.2 From b97975776e4e44a241e5a62836b609f64d9afd1a Mon Sep 17 00:00:00 2001 From: Soeren Schmidt-Clausen Date: Tue, 16 May 2023 22:41:14 +0200 Subject: [PATCH 6/8] Update source/blender/blenkernel/BKE_node.h moved node define to be more organized --- source/blender/blenkernel/BKE_node.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 0bdb3c1c10b..38421a00174 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1281,7 +1281,6 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_CURVE_TOPOLOGY_CURVE_OF_POINT 1178 #define GEO_NODE_CURVE_TOPOLOGY_POINTS_OF_CURVE 1179 #define GEO_NODE_MESH_TOPOLOGY_OFFSET_CORNER_IN_FACE 1180 -#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2103 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_FACE 1181 #define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_VERTEX 1182 #define GEO_NODE_MESH_TOPOLOGY_EDGES_OF_CORNER 1183 @@ -1305,6 +1304,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i #define GEO_NODE_SIMULATION_INPUT 2100 #define GEO_NODE_SIMULATION_OUTPUT 2101 #define GEO_NODE_INPUT_SIGNED_DISTANCE 2102 +#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2103 /** \} */ -- 2.30.2 From e10552d75e6592cb55f280ac6ac340147e7ccefd Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 30 May 2023 12:36:29 +0200 Subject: [PATCH 7/8] Changed Description and Fixed naming mixmatch --- .../nodes/node_geo_mesh_topology_corners_of_edge.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index fdfdfec183d..0e769ae4ddc 100644 --- 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 @@ -19,14 +19,14 @@ static void node_declare(NodeDeclarationBuilder &b) .supports_field() .hide_value() .description( - N_("Values used to sort corners attached to the edge. Uses indices by default")); + 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 connected to the face, chosen by the sort index")); + .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}) @@ -104,7 +104,7 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { if (use_sorting) { /* Retrieve the connected edge indices as 64 bit integers for #materialize_compressed. */ corner_indices.reinitialize(corners.size()); - conedge_span(corners, corner_indices); + convert_span(corners, corner_indices); /* Retrieve a compressed array of weights for each edge. */ sort_weights.reinitialize(corners.size()); -- 2.30.2 From 5e6eaf0f4796f78b3ceb73271eb3ee73b9459293 Mon Sep 17 00:00:00 2001 From: Soeren Sc Date: Tue, 30 May 2023 16:06:37 +0200 Subject: [PATCH 8/8] corrected for newer blender --- .../node_geo_mesh_topology_corners_of_edge.cc | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) 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 index 0e769ae4ddc..ae5cd4657e7 100644 --- 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 @@ -33,13 +33,6 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_("The number of faces or corners connected to each edge")); } -static void convert_span(const Span src, MutableSpan dst) -{ - for (const int i : src.index_range()) { - dst[i] = src[i]; - } -} - class CornersOfEdgeInput final : public bke::MeshFieldInput { const Field edge_index_; const Field sort_index_; @@ -57,12 +50,14 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - const IndexMask mask) const final + 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 Array> edge_to_loop_map = bke::mesh_topology::build_edge_to_loop_map(corner_edges, - mesh.totedge); + 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}; @@ -80,13 +75,13 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { const bool use_sorting = !all_sort_weights.is_single(); Array corner_of_edge(mask.min_array_size()); - threading::parallel_for(mask.index_range(), 1024, [&](const IndexRange range) { + 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 : mask.slice(range)) { + 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)) { @@ -102,13 +97,10 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { const int index_in_sort_wrapped = mod_i(index_in_sort, corners.size()); if (use_sorting) { - /* Retrieve the connected edge indices as 64 bit integers for #materialize_compressed. */ - corner_indices.reinitialize(corners.size()); - convert_span(corners, corner_indices); - /* Retrieve a compressed array of weights for each edge. */ sort_weights.reinitialize(corners.size()); - all_sort_weights.materialize_compressed(IndexMask(corner_indices), + 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. @@ -120,7 +112,7 @@ class CornersOfEdgeInput final : public bke::MeshFieldInput { 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] = corner_indices[sort_indices[index_in_sort_wrapped]]; + corner_of_edge[selection_i] = corners[sort_indices[index_in_sort_wrapped]]; } else { corner_of_edge[selection_i] = corners[index_in_sort_wrapped]; @@ -153,7 +145,7 @@ class CornersOfEdgeCountInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - const IndexMask /*mask*/) const final + const IndexMask & /*mask*/) const final { if (domain != ATTR_DOMAIN_EDGE) { return {}; -- 2.30.2