ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #114275: Geometry Nodes: Blur Attribute handle Face Corner domain

Browse source 
Adds support for Face Corner domain in the Blur Attribute node.
Implemented as described in #114275.

Additionally, as Face Corner domain is now supported, face corner can be
proposed if preferred domain is used. Hence, reverts !113905.

Pull Request: https://projects.blender.org/blender/blender/pulls/127914
This commit is contained in:
Anirudh Vempati 2026-09-04 09:10:53 +02:00 • committed by Lukas Tönne
parent 6c10f4ac9c
commit 9aa1ff1ac0
1 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

64
source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
View file

@ -204,6 +204,49 @@ static void build_face_to_face_by_edge_map(const OffsetIndices<int> faces,
});
}
static void build_corner_to_corner_by_vert_map(const GroupedSpan<int> vert_to_corner_map,
const OffsetIndices<int> faces,
const Span<int> corner_verts,
const int corners_num,
Array<int> &r_offsets,
Array<int> &r_indices)
{
r_offsets = Array<int>(corners_num + 1, 0);
threading::parallel_for(faces.index_range(), 4096, [&](const IndexRange range) {
for (const int face : range) {
for (const int corner : faces[face]) {
const int vert = corner_verts[corner];
constexpr int self_corner = -1;
constexpr int prev_and_next_corners = 2;
r_offsets[corner] += vert_to_corner_map.offsets[vert].size() + self_corner +
prev_and_next_corners;
}
}
});
const OffsetIndices<int> offsets = offset_indices::accumulate_counts_to_offsets(r_offsets);
r_indices.reinitialize(offsets.total_size());
threading::parallel_for(faces.index_range(), 4096, [&](IndexRange range) {
for (const int face : range) {
for (const int corner : faces[face]) {
const int vert = corner_verts[corner];
const int prev_corner = bke::mesh::face_corner_prev(faces[face], corner);
const int next_corner = bke::mesh::face_corner_next(faces[face], corner);
MutableSpan<int> neighbors = r_indices.as_mutable_span().slice(offsets[corner]);
MutableSpan<int> vert_neighbors = neighbors.drop_back(1);
vert_neighbors.copy_from(vert_to_corner_map[vert]);
int *self_corner = std::find(vert_neighbors.begin(), vert_neighbors.end(), corner);
*self_corner = prev_corner;
neighbors.last() = next_corner;
}
}
});
}
static GroupedSpan<int> create_mesh_map(const Mesh &mesh,
const AttrDomain domain,
Array<int> &r_offsets,
@ -220,6 +263,14 @@ static GroupedSpan<int> create_mesh_map(const Mesh &mesh,
build_face_to_face_by_edge_map(
mesh.faces(), mesh.corner_edges(), mesh.edges_num, r_offsets, r_indices);
break;
case AttrDomain::Corner:
build_corner_to_corner_by_vert_map(mesh.vert_to_corner_map(),
mesh.faces(),
mesh.corner_verts(),
mesh.corners_num,
r_offsets,
r_indices);
break;
default:
BLI_assert_unreachable();
break;
@ -400,7 +451,12 @@ class BlurAttributeFieldInput final : public bke::GeometryFieldInput {
GSpan result_buffer = buffer_a.as_span();
switch (context.type()) {
case GeometryComponent::Type::Mesh:
if (ELEM(context.domain(), AttrDomain::Point, AttrDomain::Edge, AttrDomain::Face)) {
if (ELEM(context.domain(),
AttrDomain::Point,
AttrDomain::Edge,
AttrDomain::Face,
AttrDomain::Corner))
{
if (const Mesh *mesh = context.mesh()) {
result_buffer = blur_on_mesh(
*mesh, context.domain(), iterations_, neighbor_weights, buffer_a, buffer_b);
@ -444,11 +500,7 @@ class BlurAttributeFieldInput final : public bke::GeometryFieldInput {
std::optional<AttrDomain> preferred_domain(const GeometryComponent &component) const override
{
const std::optional<AttrDomain> domain = bke::try_detect_field_domain(component, value_field_);
if (domain.has_value() && *domain == AttrDomain::Corner) {
return AttrDomain::Point;
}
return domain;
return bke::try_detect_field_domain(component, value_field_);
}
};