blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Geometry Nodes: Add "Corners of Edge" node #107968

Merged
Hans Goudey merged 15 commits from F_Scociety/blender:corners_of_edge into main 2023-05-31 15:25:54 +02:00
Conversation 5 Commits 15 Files Changed 7 +11 -19
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e6eaf0f47 - Show all commits

30
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_edge.cc
View File

@ -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<int> src, MutableSpan<int64_t> dst)
{
for (const int i : src.index_range()) {
dst[i] = src[i];
}
}
class CornersOfEdgeInput final : public bke::MeshFieldInput {
F_Scociety marked this conversation as resolved Outdated
Hans Goudey commented 2023-05-16 14:50:32 +02:00
Outdated
Review
Copy Link

Heh, find and replace mistake here

Heh, find and replace mistake here
Soeren Schmidt-Clausen commented 2023-05-16 18:39:11 +02:00
Outdated
Review
Copy Link

Iam sorry, but i cant find anything wrong about this.

Iam sorry, but i cant find anything wrong about this.
Iliya Katushenock commented 2023-05-16 19:29:32 +02:00
Outdated
Review
Copy Link

Is the existence of conedge_span really necessary?

Is the existence of `conedge_span` really necessary?
Hans Goudey commented 2023-05-16 21:47:10 +02:00
Outdated
Review
Copy Link

conedge_span should be convert_span. I assume you did a vert -> edge find and replace

`conedge_span` should be `convert_span`. I assume you did a `vert` -> `edge` find and replace
Hans Goudey commented 2023-05-16 21:47:54 +02:00
Outdated
Review
Copy Link

Is the existence of conedge_span really necessary?

This is the same in two other existing topology nodes. It's not really worth changing in this PR

> Is the existence of conedge_span really necessary? This is the same in two other existing topology nodes. It's not really worth changing in this PR
Soeren Schmidt-Clausen commented 2023-05-16 22:14:49 +02:00
Outdated
Review
Copy Link

conedge_span should be convert_span. I assume you did a vert -> edge find and replace

jep, corrected it. this one was actually manual, but misunderstood the name

> `conedge_span` should be `convert_span`. I assume you did a `vert` -> `edge` find and replace jep, corrected it. this one was actually manual, but misunderstood the name
const Field<int> edge_index_;
const Field<int> 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<int> map_offsets;
Array<int> map_indices;
const Span<int> corner_edges = mesh.corner_edges();
const Array<Vector<int>> edge_to_loop_map = bke::mesh_topology::build_edge_to_loop_map(corner_edges,
mesh.totedge);
const GroupedSpan<int> 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<int> 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<int64_t> corner_indices;
Array<float> sort_weights;
Array<int> 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<int>(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 {};