From feb6fd632f6d6c645c715c5e5e8bcdb9b3eab057 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sun, 20 Jun 2021 22:05:57 -0500 Subject: 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. --- source/blender/blenkernel/intern/spline_base.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel/intern/spline_base.cc') 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 Spline::evaluated_normals() const } /* Rotate the generated normals with the interpolated tilt data. */ - GVArray_Typed tilts = this->interpolate_to_evaluated_points(this->tilts()); + GVArray_Typed 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 index_factors, - GMutableSpan dst) const +void Spline::sample_with_index_factors(const GVArray &src, + Span index_factors, + GMutableSpan dst) const { BLI_assert(src.size() == this->evaluated_points_size()); -- cgit v1.2.3