Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-28 15:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up substate code a bit (#13638)

Browse source 
# Objective

Small substate code cleanup.

1. Format closure arguments inside macros.
2. Replace `match bool` blocks with `if-else` blocks.
3. Replace `match` block in substate macro with the same one-liner as in
the non-macro version.
This commit is contained in:
Ben Frankel 2024-06-03 06:49:00 -07:00 committed by GitHub
parent 25f7a29a2f
commit 52ace67f0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
crates/bevy_state/src/state/state_set.rs
View file

@ -172,19 +172,17 @@ impl<S: InnerStateSet> StateSet for S {
let current_state = current_state_res.as_ref().map(|s| s.get()).cloned(); let current_state = current_state_res.as_ref().map(|s| s.get()).cloned();
let should_exist = match parent_changed { let initial_state = if parent_changed {
true => { if let Some(state_set) = S::convert_to_usable_state(state_set.as_deref()) {
if let Some(state_set) = S::convert_to_usable_state(state_set.as_deref()) { T::should_exist(state_set)
T::should_exist(state_set) } else {
} else { None
None
}
} }
false => current_state.clone(), } else {
current_state.clone()
}; };
let new_state = initial_state.map(|x| next_state.or(current_state).unwrap_or(x));
let new_state = should_exist
.map(|initial_state| next_state.or(current_state).unwrap_or(initial_state));
internal_apply_state_transition(event, commands, current_state_res, new_state); internal_apply_state_transition(event, commands, current_state_res, new_state);
}; };
@ -225,21 +223,26 @@ macro_rules! impl_state_set_sealed_tuples {
fn register_computed_state_systems_in_schedule<T: ComputedStates<SourceStates = Self>>( fn register_computed_state_systems_in_schedule<T: ComputedStates<SourceStates = Self>>(
schedule: &mut Schedule, schedule: &mut Schedule,
) { ) {
let apply_state_transition = |($(mut $evt),*,): ($(EventReader<StateTransitionEvent<$param::RawState>>),*,), event: EventWriter<StateTransitionEvent<T>>, commands: Commands, current_state: Option<ResMut<State<T>>>, ($($val),*,): ($(Option<Res<State<$param::RawState>>>),*,)| { let apply_state_transition =
if ($($evt.is_empty())&&*) { |($(mut $evt),*,): ($(EventReader<StateTransitionEvent<$param::RawState>>),*,),
return; event: EventWriter<StateTransitionEvent<T>>,
} commands: Commands,
$($evt.clear();)* current_state: Option<ResMut<State<T>>>,
($($val),*,): ($(Option<Res<State<$param::RawState>>>),*,)| {
if ($($evt.is_empty())&&*) {
return;
}
$($evt.clear();)*
let new_state = if let ($(Some($val)),*,) = ($($param::convert_to_usable_state($val.as_deref())),*,) { let new_state = if let ($(Some($val)),*,) = ($($param::convert_to_usable_state($val.as_deref())),*,) {
T::compute(($($val),*, )) T::compute(($($val),*, ))
} else { } else {
None None
};
internal_apply_state_transition(event, commands, current_state, new_state);
}; };
internal_apply_state_transition(event, commands, current_state, new_state);
};
schedule schedule
.add_systems(apply_state_transition.in_set(ApplyStateTransition::<T>::apply())) .add_systems(apply_state_transition.in_set(ApplyStateTransition::<T>::apply()))
.add_systems(last_transition::<T>.pipe(run_enter::<T>).in_set(StateTransitionSteps::EnterSchedules)) .add_systems(last_transition::<T>.pipe(run_enter::<T>).in_set(StateTransitionSteps::EnterSchedules))
@ -255,46 +258,35 @@ macro_rules! impl_state_set_sealed_tuples {
fn register_sub_state_systems_in_schedule<T: SubStates<SourceStates = Self>>( fn register_sub_state_systems_in_schedule<T: SubStates<SourceStates = Self>>(
schedule: &mut Schedule, schedule: &mut Schedule,
) { ) {
let apply_state_transition = |($(mut $evt),*,): ($(EventReader<StateTransitionEvent<$param::RawState>>),*,), event: EventWriter<StateTransitionEvent<T>>, commands: Commands, current_state_res: Option<ResMut<State<T>>>, next_state_res: Option<ResMut<NextState<T>>>, ($($val),*,): ($(Option<Res<State<$param::RawState>>>),*,)| { let apply_state_transition =
let parent_changed = ($($evt.read().last().is_some())&&*); |($(mut $evt),*,): ($(EventReader<StateTransitionEvent<$param::RawState>>),*,),
let next_state = take_next_state(next_state_res); event: EventWriter<StateTransitionEvent<T>>,
commands: Commands,
current_state_res: Option<ResMut<State<T>>>,
next_state_res: Option<ResMut<NextState<T>>>,
($($val),*,): ($(Option<Res<State<$param::RawState>>>),*,)| {
let parent_changed = ($($evt.read().last().is_some())&&*);
let next_state = take_next_state(next_state_res);
if !parent_changed && next_state.is_none() { if !parent_changed && next_state.is_none() {
return; return;
} }
let current_state = current_state_res.as_ref().map(|s| s.get()).cloned(); let current_state = current_state_res.as_ref().map(|s| s.get()).cloned();
let should_exist = match parent_changed { let initial_state = if parent_changed {
true => {
if let ($(Some($val)),*,) = ($($param::convert_to_usable_state($val.as_deref())),*,) { if let ($(Some($val)),*,) = ($($param::convert_to_usable_state($val.as_deref())),*,) {
T::should_exist(($($val),*, )) T::should_exist(($($val),*, ))
} else { } else {
None None
} }
} } else {
false => current_state.clone(), current_state.clone()
}; };
let new_state = initial_state.map(|x| next_state.or(current_state).unwrap_or(x));
match should_exist { internal_apply_state_transition(event, commands, current_state_res, new_state);
Some(initial_state) => {
let new_state = match (current_state, next_state) {
(_, Some(next_state)) => next_state,
(Some(current_state), None) => current_state,
(None, None) => initial_state,
};
internal_apply_state_transition(
event,
commands,
current_state_res,
Some(new_state),
);
}
None => {
internal_apply_state_transition(event, commands, current_state_res, None);
}
}; };
};
schedule schedule
.add_systems(apply_state_transition.in_set(ApplyStateTransition::<T>::apply())) .add_systems(apply_state_transition.in_set(ApplyStateTransition::<T>::apply()))