From 63be57307eba75c05e7584a2e43373e489b451fb Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 21 Jul 2022 08:15:06 -0500 Subject: Cleanup: Rename length parameterization interpolation function The name makes more sense as an action, other interpolation methods besides linear probably don't make sense here anyway. --- source/blender/blenlib/BLI_length_parameterize.hh | 8 ++++---- .../editors/sculpt_paint/curves_sculpt_brush.cc | 2 +- .../sculpt_paint/curves_sculpt_grow_shrink.cc | 2 +- source/blender/geometry/intern/resample_curves.cc | 24 +++++++++++----------- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/BLI_length_parameterize.hh b/source/blender/blenlib/BLI_length_parameterize.hh index c44bb94f65d..035d4d04787 100644 --- a/source/blender/blenlib/BLI_length_parameterize.hh +++ b/source/blender/blenlib/BLI_length_parameterize.hh @@ -42,10 +42,10 @@ void accumulate_lengths(const Span values, const bool cyclic, MutableSpan -inline void linear_interpolation(const Span src, - const Span indices, - const Span factors, - MutableSpan dst) +inline void interpolate(const Span src, + const Span indices, + const Span factors, + MutableSpan dst) { BLI_assert(indices.size() == factors.size()); BLI_assert(indices.size() == dst.size()); diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index 10564942ab9..ff27c16dc36 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -366,7 +366,7 @@ void move_last_point_and_resample(MutableSpan positions, const float3 &n length_parameterize::sample_at_lengths(orig_lengths, new_lengths, indices, factors); Array new_positions(positions.size() - 1); - length_parameterize::linear_interpolation(positions, indices, factors, new_positions); + length_parameterize::interpolate(positions, indices, factors, new_positions); positions.drop_back(1).copy_from(new_positions); positions.last() = new_last_position; } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index 408139d6653..8ef18ba7da7 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -127,7 +127,7 @@ class ShrinkCurvesEffect : public CurvesEffect { lp::sample_at_lengths(data.old_lengths, data.sample_lengths, data.indices, data.factors); - lp::linear_interpolation(data.old_positions, data.indices, data.factors, positions); + lp::interpolate(data.old_positions, data.indices, data.factors, positions); } }; diff --git a/source/blender/geometry/intern/resample_curves.cc b/source/blender/geometry/intern/resample_curves.cc index 2c3a6c6e0cf..29e358cc3f4 100644 --- a/source/blender/geometry/intern/resample_curves.cc +++ b/source/blender/geometry/intern/resample_curves.cc @@ -252,10 +252,10 @@ static Curves *resample_to_uniform(const CurveComponent &src_component, const IndexRange dst_points = dst_curves.points_for_curve(i_curve); if (curve_types[i_curve] == CURVE_TYPE_POLY) { - length_parameterize::linear_interpolation(src.slice(src_points), - sample_indices.as_span().slice(dst_points), - sample_factors.as_span().slice(dst_points), - dst.slice(dst_points)); + length_parameterize::interpolate(src.slice(src_points), + sample_indices.as_span().slice(dst_points), + sample_factors.as_span().slice(dst_points), + dst.slice(dst_points)); } else { const int evaluated_size = src_curves.evaluated_points_for_curve(i_curve).size(); @@ -264,10 +264,10 @@ static Curves *resample_to_uniform(const CurveComponent &src_component, MutableSpan evaluated = evaluated_buffer.as_mutable_span().cast(); src_curves.interpolate_to_evaluated(i_curve, src.slice(src_points), evaluated); - length_parameterize::linear_interpolation(evaluated.as_span(), - sample_indices.as_span().slice(dst_points), - sample_factors.as_span().slice(dst_points), - dst.slice(dst_points)); + length_parameterize::interpolate(evaluated.as_span(), + sample_indices.as_span().slice(dst_points), + sample_factors.as_span().slice(dst_points), + dst.slice(dst_points)); } } }); @@ -277,10 +277,10 @@ static Curves *resample_to_uniform(const CurveComponent &src_component, for (const int i_curve : sliced_selection) { const IndexRange src_points = src_curves.evaluated_points_for_curve(i_curve); const IndexRange dst_points = dst_curves.points_for_curve(i_curve); - length_parameterize::linear_interpolation(evaluated_positions.slice(src_points), - sample_indices.as_span().slice(dst_points), - sample_factors.as_span().slice(dst_points), - dst_positions.slice(dst_points)); + length_parameterize::interpolate(evaluated_positions.slice(src_points), + sample_indices.as_span().slice(dst_points), + sample_factors.as_span().slice(dst_points), + dst_positions.slice(dst_points)); } /* Fill the default value for non-interpolating attributes that still must be copied. */ -- cgit v1.2.3