Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/effect.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
use bevy::ecs::system::SystemParam;
use bevy::prelude::*;
use variadics_please::all_tuples;

/// Define a state transition in `bevy`'s ECS.
///
Expand All @@ -14,19 +12,3 @@ pub trait Effect {
/// Perform the state transition on the parameter.
fn affect(self, param: &mut <Self::MutParam as SystemParam>::Item<'_, '_>);
}

macro_rules! impl_effect {
($(($E:ident, $e:ident, $p:ident)),*) => {
impl<$($E),*> Effect for ($($E,)*)
where $($E: Effect,)* {
type MutParam = ParamSet<'static, 'static, ($(<$E as Effect>::MutParam,)*)>;

fn affect(self, param: &mut <Self::MutParam as SystemParam>::Item<'_, '_>) {
let ($($e,)*) = self;
$($e.affect(&mut param.$p());)*
}
}
};
}

all_tuples!(impl_effect, 1, 8, E, e, p);
2 changes: 2 additions & 0 deletions src/effects/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ pub use entity_components::{EntityComponentsPut, EntityComponentsWith};
mod command;
pub use command::{CommandInsertResource, CommandQueue, CommandRemoveResource};

mod variadic;

#[cfg(test)]
mod one_way_fn;

Expand Down
23 changes: 23 additions & 0 deletions src/effects/variadic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//! Implements [`Effect`] for tuples of effects up to size 8.

use bevy::ecs::system::SystemParam;
use bevy::prelude::*;
use variadics_please::all_tuples;

use crate::Effect;

macro_rules! impl_effect {
($(($E:ident, $e:ident, $p:ident)),*) => {
impl<$($E),*> Effect for ($($E,)*)
where $($E: Effect,)* {
type MutParam = ParamSet<'static, 'static, ($(<$E as Effect>::MutParam,)*)>;

fn affect(self, param: &mut <Self::MutParam as SystemParam>::Item<'_, '_>) {
let ($($e,)*) = self;
$($e.affect(&mut param.$p());)*
}
}
};
}

all_tuples!(impl_effect, 1, 8, E, e, p);