Skip to content

Commit f5909aa

Browse files
david-cattermoledavid-cattermole
committed
Rename InterpolationMethod enum to Interpolation
Because the "Method" suffix seems unnecessary and it's a very long name.
1 parent a0e1ca9 commit f5909aa

18 files changed

Lines changed: 90 additions & 90 deletions

‎lib/cppbind/mmscenegraph/include/mmscenegraph/_cxxbridge.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ namespace mmscenegraph {
827827
struct ShimFlatScene;
828828
struct ShimEvaluationObjects;
829829
enum class ControlPointDistribution : ::std::uint8_t;
830-
enum class InterpolationMethod : ::std::uint8_t;
830+
enum class Interpolation : ::std::uint8_t;
831831
}
832832

833833
namespace mmscenegraph {
@@ -1196,15 +1196,15 @@ enum class ControlPointDistribution : ::std::uint8_t {
11961196
};
11971197
#endif // CXXBRIDGE1_ENUM_mmscenegraph$ControlPointDistribution
11981198

1199-
#ifndef CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1200-
#define CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1201-
enum class InterpolationMethod : ::std::uint8_t {
1199+
#ifndef CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
1200+
#define CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
1201+
enum class Interpolation : ::std::uint8_t {
12021202
kLinear = 1,
12031203
kCubicNUBS = 2,
12041204
kCubicSpline = 3,
12051205
kUnknown = 255,
12061206
};
1207-
#endif // CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1207+
#endif // CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
12081208

12091209
MMSCENEGRAPH_API_EXPORT ::rust::Box<::mmscenegraph::ShimAttrDataBlock> shim_create_attr_data_block_box() noexcept;
12101210

@@ -1228,5 +1228,5 @@ MMSCENEGRAPH_API_EXPORT bool shim_detect_curve_pops(::rust::Slice<const double>
12281228

12291229
MMSCENEGRAPH_API_EXPORT bool shim_filter_curve_pops(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, double threshold, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
12301230

1231-
MMSCENEGRAPH_API_EXPORT bool shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::InterpolationMethod interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
1231+
MMSCENEGRAPH_API_EXPORT bool shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::Interpolation interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
12321232
} // namespace mmscenegraph

‎lib/cppbind/mmscenegraph/include/mmscenegraph/curve_simplify.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bool curve_simplify(rust::Slice<const Real> &values_x,
3434
rust::Slice<const Real> &values_y,
3535
const size_t control_point_count,
3636
const ControlPointDistribution distribution,
37-
const InterpolationMethod interpolation_method,
37+
const Interpolation interpolation_method,
3838
rust::Vec<Real> &out_values_x,
3939
rust::Vec<Real> &out_values_y) noexcept;
4040

‎lib/cppbind/mmscenegraph/src/_cxxbridge.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ namespace mmscenegraph {
855855
struct ShimFlatScene;
856856
struct ShimEvaluationObjects;
857857
enum class ControlPointDistribution : ::std::uint8_t;
858-
enum class InterpolationMethod : ::std::uint8_t;
858+
enum class Interpolation : ::std::uint8_t;
859859
}
860860

861861
namespace mmscenegraph {
@@ -1224,15 +1224,15 @@ enum class ControlPointDistribution : ::std::uint8_t {
12241224
};
12251225
#endif // CXXBRIDGE1_ENUM_mmscenegraph$ControlPointDistribution
12261226

1227-
#ifndef CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1228-
#define CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1229-
enum class InterpolationMethod : ::std::uint8_t {
1227+
#ifndef CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
1228+
#define CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
1229+
enum class Interpolation : ::std::uint8_t {
12301230
kLinear = 1,
12311231
kCubicNUBS = 2,
12321232
kCubicSpline = 3,
12331233
kUnknown = 255,
12341234
};
1235-
#endif // CXXBRIDGE1_ENUM_mmscenegraph$InterpolationMethod
1235+
#endif // CXXBRIDGE1_ENUM_mmscenegraph$Interpolation
12361236

12371237
extern "C" {
12381238
bool mmscenegraph$cxxbridge1$Point3$operator$eq(const Point3 &, const Point3 &) noexcept;
@@ -1366,7 +1366,7 @@ bool mmscenegraph$cxxbridge1$shim_detect_curve_pops(::rust::Slice<const double>
13661366

13671367
bool mmscenegraph$cxxbridge1$shim_filter_curve_pops(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, double threshold, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
13681368

1369-
bool mmscenegraph$cxxbridge1$shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::InterpolationMethod interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
1369+
bool mmscenegraph$cxxbridge1$shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::Interpolation interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept;
13701370
} // extern "C"
13711371
} // namespace mmscenegraph
13721372

@@ -1810,7 +1810,7 @@ MMSCENEGRAPH_API_EXPORT bool shim_filter_curve_pops(::rust::Slice<const double>
18101810
return mmscenegraph$cxxbridge1$shim_filter_curve_pops(x_values, y_values, threshold, out_x_values, out_y_values);
18111811
}
18121812

1813-
MMSCENEGRAPH_API_EXPORT bool shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::InterpolationMethod interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept {
1813+
MMSCENEGRAPH_API_EXPORT bool shim_curve_simplify(::rust::Slice<const double> x_values, ::rust::Slice<const double> y_values, ::std::size_t control_point_count, ::mmscenegraph::ControlPointDistribution distribution, ::mmscenegraph::Interpolation interpolation_method, ::rust::Vec<double> &out_x_values, ::rust::Vec<double> &out_y_values) noexcept {
18141814
return mmscenegraph$cxxbridge1$shim_curve_simplify(x_values, y_values, control_point_count, distribution, interpolation_method, out_x_values, out_y_values);
18151815
}
18161816
} // namespace mmscenegraph

‎lib/cppbind/mmscenegraph/src/curve_simplify.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool curve_simplify(rust::Slice<const Real> &values_x,
3030
rust::Slice<const Real> &values_y,
3131
const size_t control_point_count,
3232
const ControlPointDistribution distribution,
33-
const InterpolationMethod interpolation_method,
33+
const Interpolation interpolation_method,
3434
rust::Vec<Real> &out_values_x,
3535
rust::Vec<Real> &out_values_y) noexcept {
3636
return shim_curve_simplify(values_x, values_y, control_point_count,

‎lib/cppbind/mmscenegraph/src/curve_simplify.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//
2020

2121
use crate::cxxbridge::ffi::ControlPointDistribution as BindControlPointDistribution;
22-
use crate::cxxbridge::ffi::InterpolationMethod as BindInterpolationMethod;
22+
use crate::cxxbridge::ffi::Interpolation as BindInterpolation;
2323
use crate::math::bind_to_core_interpolation_method;
2424
use crate::math::bind_to_core_control_point_distribution;
2525
use crate::shim_utilities::copy_vec_xy_to_x_y;
@@ -32,7 +32,7 @@ pub fn shim_curve_simplify(
3232
values_y: &[CoreReal],
3333
control_point_count: usize,
3434
distribution: BindControlPointDistribution,
35-
interpolation_method: BindInterpolationMethod,
35+
interpolation_method: BindInterpolation,
3636
out_values_x: &mut Vec<CoreReal>,
3737
out_values_y: &mut Vec<CoreReal>,
3838
) -> bool {

‎lib/cppbind/mmscenegraph/src/cxxbridge.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ pub mod ffi {
450450

451451
#[repr(u8)]
452452
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
453-
pub(crate) enum InterpolationMethod {
453+
pub(crate) enum Interpolation {
454454
// #[cxx_name = "kNearest"]
455455
// Nearest = 0,
456456
#[cxx_name = "kLinear"]
@@ -492,7 +492,7 @@ pub mod ffi {
492492
y_values: &[f64],
493493
control_point_count: usize,
494494
distribution: ControlPointDistribution,
495-
interpolation_method: InterpolationMethod,
495+
interpolation_method: Interpolation,
496496
out_x_values: &mut Vec<f64>,
497497
out_y_values: &mut Vec<f64>,
498498
) -> bool;

‎lib/cppbind/mmscenegraph/src/math.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
use crate::cxxbridge::ffi::ControlPointDistribution as BindControlPointDistribution;
2222
use crate::cxxbridge::ffi::FilmFit as BindFilmFit;
23-
use crate::cxxbridge::ffi::InterpolationMethod as BindInterpolationMethod;
23+
use crate::cxxbridge::ffi::Interpolation as BindInterpolation;
2424
use crate::cxxbridge::ffi::RotateOrder as BindRotateOrder;
2525
use mmscenegraph_rust::curve::simplify::ControlPointDistribution as CoreControlPointDistribution;
2626
use mmscenegraph_rust::math::camera::FilmFit as CoreFilmFit;
27-
use mmscenegraph_rust::math::interpolate::InterpolationMethod as CoreInterpolationMethod;
27+
use mmscenegraph_rust::math::interpolate::Interpolation as CoreInterpolation;
2828
use mmscenegraph_rust::math::rotate::euler::RotateOrder as CoreRotateOrder;
2929

3030
pub fn bind_to_core_rotate_order(value: BindRotateOrder) -> CoreRotateOrder {
@@ -97,32 +97,32 @@ pub fn core_to_bind_control_point_distribution(
9797
}
9898

9999
pub fn bind_to_core_interpolation_method(
100-
value: BindInterpolationMethod,
101-
) -> CoreInterpolationMethod {
100+
value: BindInterpolation,
101+
) -> CoreInterpolation {
102102
match value {
103-
// BindInterpolationMethod::Nearest => CoreInterpolationMethod::Nearest,
104-
BindInterpolationMethod::Linear => CoreInterpolationMethod::Linear,
105-
BindInterpolationMethod::CubicNUBS => {
106-
CoreInterpolationMethod::CubicNUBS
103+
// BindInterpolation::Nearest => CoreInterpolation::Nearest,
104+
BindInterpolation::Linear => CoreInterpolation::Linear,
105+
BindInterpolation::CubicNUBS => {
106+
CoreInterpolation::CubicNUBS
107107
}
108-
BindInterpolationMethod::CubicSpline => {
109-
CoreInterpolationMethod::CubicSpline
108+
BindInterpolation::CubicSpline => {
109+
CoreInterpolation::CubicSpline
110110
}
111111
_ => panic!("Invalid interpolation method: {:?}", value),
112112
}
113113
}
114114

115115
pub fn core_to_bind_interpolation_method(
116-
value: CoreInterpolationMethod,
117-
) -> BindInterpolationMethod {
116+
value: CoreInterpolation,
117+
) -> BindInterpolation {
118118
match value {
119-
// CoreInterpolationMethod::Nearest => BindInterpolationMethod::Nearest,
120-
CoreInterpolationMethod::Linear => BindInterpolationMethod::Linear,
121-
CoreInterpolationMethod::CubicNUBS => {
122-
BindInterpolationMethod::CubicNUBS
119+
// CoreInterpolation::Nearest => BindInterpolation::Nearest,
120+
CoreInterpolation::Linear => BindInterpolation::Linear,
121+
CoreInterpolation::CubicNUBS => {
122+
BindInterpolation::CubicNUBS
123123
}
124-
CoreInterpolationMethod::CubicSpline => {
125-
BindInterpolationMethod::CubicSpline
124+
CoreInterpolation::CubicSpline => {
125+
BindInterpolation::CubicSpline
126126
}
127127
}
128128
}

‎lib/rust/mmscenegraph/src/curve/pyramid.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use crate::curve::detect::keypoints::filter_keypoints_by_type_and_level;
3232
use crate::curve::detect::keypoints::KeypointType;
3333
use crate::curve::smooth::gaussian::gaussian_smooth_2d;
3434
use crate::math::interpolate::evaluate_curve_points;
35-
use crate::math::interpolate::InterpolationMethod;
35+
use crate::math::interpolate::Interpolation;
3636

3737
/// Represents a level in the animation curve pyramid.
3838
#[derive(Debug)]
@@ -164,7 +164,7 @@ fn downsample_curve_points(
164164

165165
// Because cubic spline interpolation allows a smooth re-sampling between
166166
// points, and does not have tangent issues on the boundaries.
167-
let interpolation_method = InterpolationMethod::CubicSpline;
167+
let interpolation_method = Interpolation::CubicSpline;
168168

169169
let downsampled_xy =
170170
evaluate_curve_points(&out_times, times, values, interpolation_method);

‎lib/rust/mmscenegraph/src/curve/resample.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ use log::debug;
2424

2525
use crate::constant::Real;
2626
use crate::math::interpolate::evaluate_curve_points;
27-
use crate::math::interpolate::InterpolationMethod;
27+
use crate::math::interpolate::Interpolation;
2828

2929
pub fn resample_uniform_xy(
3030
values_xy: &[(Real, Real)],
3131
start: Real,
3232
end: Real,
3333
increment: Real,
34-
interpolation_method: InterpolationMethod,
34+
interpolation_method: Interpolation,
3535
) -> Result<Vec<(Real, Real)>> {
3636
if values_xy.is_empty() {
3737
bail!("Input value slices must have values.");

‎lib/rust/mmscenegraph/src/curve/simplify.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use crate::math::curve_fit::nonlinear_line_n3;
2929
use crate::math::curve_fit::nonlinear_line_n_points;
3030
use crate::math::curve_fit::nonlinear_line_n_points_with_initial;
3131
use crate::math::interpolate::evaluate_curve_points;
32-
use crate::math::interpolate::InterpolationMethod;
32+
use crate::math::interpolate::Interpolation;
3333

3434
#[repr(u8)]
3535
#[derive(Debug, Clone, Copy, PartialEq)]
@@ -43,15 +43,15 @@ pub fn simplify(
4343
values_y: &[Real],
4444
control_point_count: usize,
4545
distribution: ControlPointDistribution,
46-
interpolation_method: InterpolationMethod,
46+
interpolation_method: Interpolation,
4747
) -> Result<Vec<(Real, Real)>> {
4848
debug!("target_control_points={control_point_count:?}");
4949
debug!("interpolation_method={interpolation_method:?}");
5050
debug!("distribution={distribution:?}");
5151

5252
let eval_values_xy = if control_point_count == 2 {
5353
assert!(
54-
interpolation_method == InterpolationMethod::Linear,
54+
interpolation_method == Interpolation::Linear,
5555
"It only makes sense to have a linear line with two keypoints."
5656
);
5757

@@ -81,7 +81,7 @@ pub fn simplify(
8181
interpolation_method,
8282
)
8383
} else if control_point_count == 3
84-
&& interpolation_method == InterpolationMethod::Linear
84+
&& interpolation_method == Interpolation::Linear
8585
{
8686
// Linear - 3 points.
8787
let (control_point_a, control_point_b, control_point_c) =

0 commit comments

Comments
 (0)