diff options
author | Hans Goudey <h.goudey@me.com> | 2021-06-21 06:05:57 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-06-21 06:05:57 +0300 |
commit | feb6fd632f6d6c645c715c5e5e8bcdb9b3eab057 (patch) | |
tree | 767e68a6bd4e1a84fbf75b0b53517ae7a9c56da2 /source/blender/blenkernel/intern | |
parent | a1c3e451002b79b5822da78e9562f12a6f1b0cc6 (diff) |
Cleanup: Rename spline interpolation functions
The names were slightly longer than they needed to be clear,
and when they are shorter they tend to fit on one line better.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/spline_base.cc | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/spline_bezier.cc | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/spline_nurbs.cc | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/spline_poly.cc | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/spline_base.cc b/source/blender/blenkernel/intern/spline_base.cc index e375fa929ed..b3514f23784 100644 --- a/source/blender/blenkernel/intern/spline_base.cc +++ b/source/blender/blenkernel/intern/spline_base.cc @@ -331,7 +331,7 @@ Span<float3> Spline::evaluated_normals() const } /* Rotate the generated normals with the interpolated tilt data. */ - GVArray_Typed<float> tilts = this->interpolate_to_evaluated_points(this->tilts()); + GVArray_Typed<float> tilts = this->interpolate_to_evaluated(this->tilts()); for (const int i : normals.index_range()) { normals[i] = rotate_direction_around_axis(normals[i], tangents[i], tilts[i]); } @@ -438,9 +438,9 @@ void Spline::bounds_min_max(float3 &min, float3 &max, const bool use_evaluated) } } -GVArrayPtr Spline::interpolate_to_evaluated_points(GSpan data) const +GVArrayPtr Spline::interpolate_to_evaluated(GSpan data) const { - return this->interpolate_to_evaluated_points(GVArray_For_GSpan(data)); + return this->interpolate_to_evaluated(GVArray_For_GSpan(data)); } /** @@ -448,9 +448,9 @@ GVArrayPtr Spline::interpolate_to_evaluated_points(GSpan data) const * points) to arbitrary parameters in between the evaluated points. The interpolation is quite * simple, but this handles the cyclic and end point special cases. */ -void Spline::sample_based_on_index_factors(const GVArray &src, - Span<float> index_factors, - GMutableSpan dst) const +void Spline::sample_with_index_factors(const GVArray &src, + Span<float> index_factors, + GMutableSpan dst) const { BLI_assert(src.size() == this->evaluated_points_size()); diff --git a/source/blender/blenkernel/intern/spline_bezier.cc b/source/blender/blenkernel/intern/spline_bezier.cc index 88b680850cf..2aacc5cf720 100644 --- a/source/blender/blenkernel/intern/spline_bezier.cc +++ b/source/blender/blenkernel/intern/spline_bezier.cc @@ -545,9 +545,9 @@ BezierSpline::InterpolationData BezierSpline::interpolation_data_from_index_fact /* Use a spline argument to avoid adding this to the header. */ template<typename T> -static void interpolate_to_evaluated_points_impl(const BezierSpline &spline, - const blender::VArray<T> &source_data, - MutableSpan<T> result_data) +static void interpolate_to_evaluated_impl(const BezierSpline &spline, + const blender::VArray<T> &source_data, + MutableSpan<T> result_data) { Span<float> mappings = spline.evaluated_mappings(); @@ -562,7 +562,7 @@ static void interpolate_to_evaluated_points_impl(const BezierSpline &spline, } } -blender::fn::GVArrayPtr BezierSpline::interpolate_to_evaluated_points( +blender::fn::GVArrayPtr BezierSpline::interpolate_to_evaluated( const blender::fn::GVArray &source_data) const { BLI_assert(source_data.size() == this->size()); @@ -581,7 +581,7 @@ blender::fn::GVArrayPtr BezierSpline::interpolate_to_evaluated_points( using T = decltype(dummy); if constexpr (!std::is_void_v<blender::attribute_math::DefaultMixer<T>>) { Array<T> values(eval_size); - interpolate_to_evaluated_points_impl<T>(*this, source_data.typed<T>(), values); + interpolate_to_evaluated_impl<T>(*this, source_data.typed<T>(), values); new_varray = std::make_unique<blender::fn::GVArray_For_ArrayContainer<Array<T>>>( std::move(values)); } diff --git a/source/blender/blenkernel/intern/spline_nurbs.cc b/source/blender/blenkernel/intern/spline_nurbs.cc index bfb0d652b1a..569b6abcef8 100644 --- a/source/blender/blenkernel/intern/spline_nurbs.cc +++ b/source/blender/blenkernel/intern/spline_nurbs.cc @@ -374,9 +374,9 @@ void NURBSpline::calculate_basis_cache() const } template<typename T> -void interpolate_to_evaluated_points_impl(Span<NURBSpline::BasisCache> weights, - const blender::VArray<T> &source_data, - MutableSpan<T> result_data) +void interpolate_to_evaluated_impl(Span<NURBSpline::BasisCache> weights, + const blender::VArray<T> &source_data, + MutableSpan<T> result_data) { const int points_len = source_data.size(); BLI_assert(result_data.size() == weights.size()); @@ -395,7 +395,7 @@ void interpolate_to_evaluated_points_impl(Span<NURBSpline::BasisCache> weights, mixer.finalize(); } -blender::fn::GVArrayPtr NURBSpline::interpolate_to_evaluated_points( +blender::fn::GVArrayPtr NURBSpline::interpolate_to_evaluated( const blender::fn::GVArray &source_data) const { BLI_assert(source_data.size() == this->size()); @@ -412,7 +412,7 @@ blender::fn::GVArrayPtr NURBSpline::interpolate_to_evaluated_points( using T = decltype(dummy); if constexpr (!std::is_void_v<blender::attribute_math::DefaultMixer<T>>) { Array<T> values(this->evaluated_points_size()); - interpolate_to_evaluated_points_impl<T>(weights, source_data.typed<T>(), values); + interpolate_to_evaluated_impl<T>(weights, source_data.typed<T>(), values); new_varray = std::make_unique<blender::fn::GVArray_For_ArrayContainer<Array<T>>>( std::move(values)); } @@ -436,7 +436,7 @@ Span<float3> NURBSpline::evaluated_positions() const evaluated_position_cache_.resize(eval_size); /* TODO: Avoid copying the evaluated data from the temporary array. */ - GVArray_Typed<float3> evaluated = Spline::interpolate_to_evaluated_points(positions_.as_span()); + GVArray_Typed<float3> evaluated = Spline::interpolate_to_evaluated(positions_.as_span()); evaluated->materialize(evaluated_position_cache_); position_cache_dirty_ = false; diff --git a/source/blender/blenkernel/intern/spline_poly.cc b/source/blender/blenkernel/intern/spline_poly.cc index 5f8e81d5ad0..ebbe595e319 100644 --- a/source/blender/blenkernel/intern/spline_poly.cc +++ b/source/blender/blenkernel/intern/spline_poly.cc @@ -115,7 +115,7 @@ Span<float3> PolySpline::evaluated_positions() const * the original data. Therefore the lifetime of the returned virtual array must not be longer than * the source data. */ -blender::fn::GVArrayPtr PolySpline::interpolate_to_evaluated_points( +blender::fn::GVArrayPtr PolySpline::interpolate_to_evaluated( const blender::fn::GVArray &source_data) const { BLI_assert(source_data.size() == this->size()); |