diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-06-22 07:02:00 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-06-22 07:02:00 +0300 |
| commit | dc3b7602eeb08df788c6dcd1dee6860d58a5010d (patch) | |
| tree | 6ee717350a157d278df6d663f1c0a30e3e214e3c /source/blender/blenkernel/BKE_spline.hh | |
| parent | d086570c7a364f90d4d80badad30afb3ac580309 (diff) | |
Cleanup: Rename variables, use shorter names
`src` and `dst` are perfectly clear, and avoid repeating unecessary
characters when writing the variables many times, allowing more space
for everything else.
Diffstat (limited to 'source/blender/blenkernel/BKE_spline.hh')
| -rw-r--r-- | source/blender/blenkernel/BKE_spline.hh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_spline.hh b/source/blender/blenkernel/BKE_spline.hh index b5d06da4651..38a6d41a4d3 100644 --- a/source/blender/blenkernel/BKE_spline.hh +++ b/source/blender/blenkernel/BKE_spline.hh @@ -196,7 +196,7 @@ class Spline { * exceed the lifetime of the input data. */ virtual blender::fn::GVArrayPtr interpolate_to_evaluated( - const blender::fn::GVArray &source_data) const = 0; + const blender::fn::GVArray &src) const = 0; blender::fn::GVArrayPtr interpolate_to_evaluated(blender::fn::GSpan data) const; template<typename T> blender::fn::GVArray_Typed<T> interpolate_to_evaluated(blender::Span<T> data) const @@ -332,8 +332,7 @@ class BezierSpline final : public Spline { }; InterpolationData interpolation_data_from_index_factor(const float index_factor) const; - virtual blender::fn::GVArrayPtr interpolate_to_evaluated( - const blender::fn::GVArray &source_data) const override; + virtual blender::fn::GVArrayPtr interpolate_to_evaluated(const blender::fn::GVArray &src) const; void evaluate_segment(const int index, const int next_index, @@ -455,13 +454,12 @@ class NURBSpline final : public Spline { blender::Span<blender::float3> evaluated_positions() const final; - blender::fn::GVArrayPtr interpolate_to_evaluated( - const blender::fn::GVArray &source_data) const final; + blender::fn::GVArrayPtr interpolate_to_evaluated(const blender::fn::GVArray &src) const final; protected: void correct_end_tangents() const final; void calculate_knots() const; - void calculate_basis_cache() const; + blender::Span<BasisCache> calculate_basis_cache() const; }; /** @@ -505,8 +503,7 @@ class PolySpline final : public Spline { blender::Span<blender::float3> evaluated_positions() const final; - blender::fn::GVArrayPtr interpolate_to_evaluated( - const blender::fn::GVArray &source_data) const final; + blender::fn::GVArrayPtr interpolate_to_evaluated(const blender::fn::GVArray &src) const final; protected: void correct_end_tangents() const final; |