forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use variadics_please to implement StableInterpolate on tuples. (#16931)

Browse Source 
# Objective

Now that `variadics_please` has a 1.1 release, we can re-implement the
original solution.

## Solution

Copy-paste the code from the [original
PR](https://github.com/bevyengine/bevy/pull/15931) branch :)
This commit is contained in:
Matty Weatherley 2024-12-23 21:53:43 -05:00 committed by GitHub
parent bacc693fec
commit ee9bea1ba9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/bevy_math/Cargo.toml
View File

@ -28,6 +28,7 @@ smallvec = { version = "1.11" }
bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [
"glam", "glam",
], optional = true } ], optional = true }
variadics_please = "1.1"
[dev-dependencies] [dev-dependencies]
approx = "0.5" approx = "0.5"

95
crates/bevy_math/src/common_traits.rs
View File

@ -5,6 +5,7 @@ use core::{
fmt::Debug, fmt::Debug,
ops::{Add, Div, Mul, Neg, Sub}, ops::{Add, Div, Mul, Neg, Sub},
}; };
use variadics_please::all_tuples_enumerated;
/// A type that supports the mathematical operations of a real vector space, irrespective of dimension. /// A type that supports the mathematical operations of a real vector space, irrespective of dimension.
/// In particular, this means that the implementing type supports: /// In particular, this means that the implementing type supports:
@ -393,31 +394,9 @@ impl StableInterpolate for Dir3A {
} }
} }
// If you're confused about how #[doc(fake_variadic)] works,
// then the `all_tuples` macro is nicely documented (it can be found in the `bevy_utils` crate).
// tl;dr: `#[doc(fake_variadic)]` goes on the impl of tuple length one.
// the others have to be hidden using `#[doc(hidden)]`.
macro_rules! impl_stable_interpolate_tuple { macro_rules! impl_stable_interpolate_tuple {
(($T:ident, $n:tt)) => { ($(#[$meta:meta])* $(($n:tt, $T:ident)),*) => {
impl_stable_interpolate_tuple! { $(#[$meta])*
@impl
#[cfg_attr(any(docsrs, docsrs_dep), doc(fake_variadic))]
#[cfg_attr(
any(docsrs, docsrs_dep),
doc = "This trait is implemented for tuples up to 11 items long."
)]
($T, $n)
}
};
($(($T:ident, $n:tt)),*) => {
impl_stable_interpolate_tuple! {
@impl
#[cfg_attr(any(docsrs, docsrs_dep), doc(hidden))]
$(($T, $n)),*
}
};
(@impl $(#[$($meta:meta)*])* $(($T:ident, $n:tt)),*) => {
$(#[$($meta)*])*
impl<$($T: StableInterpolate),*> StableInterpolate for ($($T,)*) { impl<$($T: StableInterpolate),*> StableInterpolate for ($($T,)*) {
fn interpolate_stable(&self, other: &Self, t: f32) -> Self { fn interpolate_stable(&self, other: &Self, t: f32) -> Self {
( (
@ -430,68 +409,12 @@ macro_rules! impl_stable_interpolate_tuple {
}; };
} }
// (See `macro_metavar_expr`, which might make this better.) all_tuples_enumerated!(
// This currently implements `StableInterpolate` for tuples of up to 11 elements. #[doc(fake_variadic)]
impl_stable_interpolate_tuple!((T, 0)); impl_stable_interpolate_tuple,
impl_stable_interpolate_tuple!((T0, 0), (T1, 1)); 1,
impl_stable_interpolate_tuple!((T0, 0), (T1, 1), (T2, 2)); 11,
impl_stable_interpolate_tuple!((T0, 0), (T1, 1), (T2, 2), (T3, 3)); T
impl_stable_interpolate_tuple!((T0, 0), (T1, 1), (T2, 2), (T3, 3), (T4, 4));
impl_stable_interpolate_tuple!((T0, 0), (T1, 1), (T2, 2), (T3, 3), (T4, 4), (T5, 5));
impl_stable_interpolate_tuple!(
(T0, 0),
(T1, 1),
(T2, 2),
(T3, 3),
(T4, 4),
(T5, 5),
(T6, 6)
);
impl_stable_interpolate_tuple!(
(T0, 0),
(T1, 1),
(T2, 2),
(T3, 3),
(T4, 4),
(T5, 5),
(T6, 6),
(T7, 7)
);
impl_stable_interpolate_tuple!(
(T0, 0),
(T1, 1),
(T2, 2),
(T3, 3),
(T4, 4),
(T5, 5),
(T6, 6),
(T7, 7),
(T8, 8)
);
impl_stable_interpolate_tuple!(
(T0, 0),
(T1, 1),
(T2, 2),
(T3, 3),
(T4, 4),
(T5, 5),
(T6, 6),
(T7, 7),
(T8, 8),
(T9, 9)
);
impl_stable_interpolate_tuple!(
(T0, 0),
(T1, 1),
(T2, 2),
(T3, 3),
(T4, 4),
(T5, 5),
(T6, 6),
(T7, 7),
(T8, 8),
(T9, 9),
(T10, 10)
); );
/// A type that has tangents. /// A type that has tangents.