blender/blender
162
515
Fork 780
Code Issues 6.8k Pull Requests 933 Projects 19 Wiki Activity

Sculpt: Initialize hairs with custom radius #118339

Merged
Hans Goudey merged 10 commits from Zyq-XDz/blender:custom-hair-radius into main 2024-02-27 18:22:16 +01:00
Conversation 6 Commits 10 Files Changed 10 +7 -15
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit afc669348c - Show all commits

16
source/blender/geometry/intern/add_curves_on_mesh.cc
View File

@ -237,21 +237,14 @@ static void interpolate_position_with_interpolation(CurvesGeometry &curves,
}
static void calc_radius_without_interpolation(CurvesGeometry &curves,
Zyq-XDz marked this conversation as resolved Outdated
Hans Goudey commented 2024-02-20 19:45:39 +01:00
Outdated
Review
Copy Link

"do thing without doing thing" is a confusing name! How about "calc_radius_without_interpolation"?

"do thing without doing thing" is a confusing name! How about "calc_radius_without_interpolation"?
const int old_curves_num,
const int added_curves_num,
const IndexRange new_points_range,
const float radius)
{
const OffsetIndices points_by_curve = curves.points_by_curve();
Zyq-XDz marked this conversation as resolved
Hans Goudey commented 2024-02-27 17:24:49 +01:00
Review
Copy Link

points_by_curve is unused

`points_by_curve` is unused
bke::SpanAttributeWriter radius_attr =
curves.attributes_for_write().lookup_or_add_for_write_span<float>("radius",
bke::AttrDomain::Point);
threading::parallel_for(IndexRange(added_curves_num), 256, [&](const IndexRange range) {
for (const int i : range) {
const int curve_i = old_curves_num + i;
const IndexRange points = points_by_curve[curve_i];
radius_attr.span.slice(points).fill(radius);
}
});
radius_attr.span.slice(new_points_range).fill(radius);
radius_attr.finish();
Zyq-XDz marked this conversation as resolved
Hans Goudey commented 2024-02-27 15:33:30 +01:00
Review
Copy Link

This can be replaced with radius_attr.span.slice(new_points_range).fill(radius);

This can be replaced with `radius_attr.span.slice(new_points_range).fill(radius);`
}
@ -287,12 +280,11 @@ static void calc_radius_with_interpolation(CurvesGeometry &curves,
continue;
}
Zyq-XDz marked this conversation as resolved
Hans Goudey commented 2024-02-20 19:46:43 +01:00
Review
Copy Link

If there are no neighbors, where is root_radiuses_cu coming from?

If there are no neighbors, where is `root_radiuses_cu` coming from?
radii_cu.slice(points).fill(0);
radii_cu.slice(points).fill(0.0f);
for (const NeighborCurve &neighbor : neighbors) {
const int neighbor_curve_i = neighbor.index;
const IndexRange neighbor_points = points_by_curve[neighbor_curve_i];
const float3 &neighbor_root_cu = positions_cu[neighbor_points[0]];
const Span<float3> neighbor_positions_cu = positions_cu.slice(neighbor_points);
const Span<float> neighbor_radii_cu = radius_attr.span.slice(neighbor_points);
Zyq-XDz marked this conversation as resolved Outdated
Hans Goudey commented 2024-02-27 15:54:39 +01:00
Outdated
Review
Copy Link

0 -> 0.0f

`0` -> `0.0f`
@ -474,7 +466,7 @@ AddCurvesOnMeshOutputs add_curves_on_mesh(CurvesGeometry &curves,
}
else {
calc_radius_without_interpolation(
curves, old_curves_num, added_curves_num, inputs.fallback_curve_radius);
curves, outputs.new_points_range, inputs.fallback_curve_radius);
}
curves.fill_curve_types(new_curves_range, CURVE_TYPE_CATMULL_ROM);

6
source/blender/makesdna/DNA_brush_enums.h
View File

@ -654,9 +654,9 @@ typedef enum eBrushCurvesSculptFlag {
BRUSH_CURVES_SCULPT_FLAG_SCALE_UNIFORM = (1 << 0),
BRUSH_CURVES_SCULPT_FLAG_GROW_SHRINK_INVERT = (1 << 1),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_LENGTH = (1 << 2),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_RADIUS = (1 << 3),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_SHAPE = (1 << 4),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_POINT_COUNT = (1 << 5),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_SHAPE = (1 << 3),
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_POINT_COUNT = (1 << 4),
Zyq-XDz marked this conversation as resolved Outdated
Hans Goudey commented 2024-02-27 15:29:10 +01:00
Outdated
Review
Copy Link

Best not to change these values, since they're stored in files. You can just add the new one at the end

Best not to change these values, since they're stored in files. You can just add the new one at the end
BRUSH_CURVES_SCULPT_FLAG_INTERPOLATE_RADIUS = (1 << 5),
} eBrushCurvesSculptFlag;
typedef enum eBrushCurvesSculptDensityMode {