blender
/
blender
137
409
Fork 592
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Cleanup: Geometry Nodes: Density field computation simplification #118976

Closed
Iliya Katushenock wants to merge 1 commits from mod_moder:tmp_cleanup_reduce_args into main
pull from: mod_moder:tmp_cleanup_reduce_args
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 1 Files Changed 1 +11 -13
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
View File

@ -463,23 +463,19 @@ static Array<float> calc_full_density_factors_with_selection(const Mesh &mesh,
}
static void distribute_points_random(const Mesh &mesh,
const Field<float> &density_field,
const Field<bool> &selection_field,
const Span<float> densities,
const int seed,
Vector<float3> &positions,
Vector<float3> &bary_coords,
Vector<int> &tri_indices)
{
const Array<float> densities = calc_full_density_factors_with_selection(
mesh, density_field, selection_field);
sample_mesh_surface(mesh, 1.0f, densities, seed, positions, bary_coords, tri_indices);
}
static void distribute_points_poisson_disk(const Mesh &mesh,
const float minimum_distance,
const float max_density,
const Field<float> &density_factor_field,
const Field<bool> &selection_field,
const Span<float> density_factors,
const int seed,
Vector<float3> &positions,
Vector<float3> &bary_coords,
@ -490,9 +486,6 @@ static void distribute_points_poisson_disk(const Mesh &mesh,
Array<bool> elimination_mask(positions.size(), false);
update_elimination_mask_for_close_points(positions, minimum_distance, elimination_mask);
const Array<float> density_factors = calc_full_density_factors_with_selection(
mesh, density_factor_field, selection_field);
update_elimination_mask_based_on_density_factors(
mesh, density_factors, bary_coords, tri_indices, elimination_mask.as_mutable_span());
@ -519,19 +512,24 @@ static void point_distribution_calculate(GeometrySet &geometry_set,
switch (method) {
case GEO_NODE_POINT_DISTRIBUTE_POINTS_ON_FACES_RANDOM: {
const Field<float> density_field = params.get_input<Field<float>>("Density");
distribute_points_random(
mesh, density_field, selection_field, seed, positions, bary_coords, tri_indices);
const Array<float> densities = calc_full_density_factors_with_selection(
mesh, density_field, selection_field);
distribute_points_random(mesh, densities, seed, positions, bary_coords, tri_indices);
break;
}
case GEO_NODE_POINT_DISTRIBUTE_POINTS_ON_FACES_POISSON: {
const float minimum_distance = params.get_input<float>("Distance Min");
const float density_max = params.get_input<float>("Density Max");
const Field<float> density_factors_field = params.get_input<Field<float>>("Density Factor");
const Array<float> density_factors = calc_full_density_factors_with_selection(
mesh, density_factors_field, selection_field);
distribute_points_poisson_disk(mesh,
minimum_distance,
density_max,
density_factors_field,
selection_field,
density_factors,
seed,
positions,
bary_coords,