diff --git a/crates/bevy_state/src/state/transitions.rs b/crates/bevy_state/src/state/transitions.rs index 5e15ae6293..1e54911df9 100644 --- a/crates/bevy_state/src/state/transitions.rs +++ b/crates/bevy_state/src/state/transitions.rs @@ -32,9 +32,9 @@ pub struct OnExit(pub S); #[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)] pub struct OnTransition { /// The state being exited. - pub from: S, + pub exited: S, /// The state being entered. - pub to: S, + pub entered: S, } /// Runs [state transitions](States). @@ -46,10 +46,10 @@ pub struct StateTransition; /// If you know exactly what state you want to respond to ahead of time, consider [`OnEnter`], [`OnTransition`], or [`OnExit`] #[derive(Debug, Copy, Clone, PartialEq, Eq, Event)] pub struct StateTransitionEvent { - /// the state we were in before - pub before: Option, - /// the state we're in now - pub after: Option, + /// The state being exited. + pub exited: Option, + /// The state being entered. + pub entered: Option, } /// Applies manual state transitions using [`NextState`]. @@ -96,8 +96,8 @@ pub(crate) fn internal_apply_state_transition( let exited = mem::replace(&mut state_resource.0, entered.clone()); event.send(StateTransitionEvent { - before: Some(exited.clone()), - after: Some(entered.clone()), + exited: Some(exited.clone()), + entered: Some(entered.clone()), }); } } @@ -106,8 +106,8 @@ pub(crate) fn internal_apply_state_transition( commands.insert_resource(State(entered.clone())); event.send(StateTransitionEvent { - before: None, - after: Some(entered.clone()), + exited: None, + entered: Some(entered.clone()), }); } }; @@ -118,8 +118,8 @@ pub(crate) fn internal_apply_state_transition( commands.remove_resource::>(); event.send(StateTransitionEvent { - before: Some(resource.get().clone()), - after: None, + exited: Some(resource.get().clone()), + entered: None, }); } } @@ -215,8 +215,8 @@ pub(crate) fn should_run_transition( return ( Some(StateTransitionEvent { - before: None, - after: Some(res.get().clone()), + exited: None, + entered: Some(res.get().clone()), }), PhantomData, ); @@ -232,12 +232,11 @@ pub(crate) fn run_enter( let Some(transition) = transition else { return; }; - - let Some(after) = transition.after else { + let Some(entered) = transition.entered else { return; }; - let _ = world.try_run_schedule(OnEnter(after)); + let _ = world.try_run_schedule(OnEnter(entered)); } pub(crate) fn run_exit( @@ -247,12 +246,11 @@ pub(crate) fn run_exit( let Some(transition) = transition else { return; }; - - let Some(before) = transition.before else { + let Some(exited) = transition.exited else { return; }; - let _ = world.try_run_schedule(OnExit(before)); + let _ = world.try_run_schedule(OnExit(exited)); } pub(crate) fn run_transition( @@ -265,12 +263,12 @@ pub(crate) fn run_transition( let Some(transition) = transition else { return; }; - let Some(from) = transition.before else { + let Some(exited) = transition.exited else { return; }; - let Some(to) = transition.after else { + let Some(entered) = transition.entered else { return; }; - let _ = world.try_run_schedule(OnTransition { from, to }); + let _ = world.try_run_schedule(OnTransition { exited, entered }); } diff --git a/examples/state/computed_states.rs b/examples/state/computed_states.rs index 04d8428151..77f99ad0c2 100644 --- a/examples/state/computed_states.rs +++ b/examples/state/computed_states.rs @@ -337,13 +337,13 @@ fn log_transitions( for transition in transitions.read() { info!( "transition: {:?} => {:?}", - transition.before, transition.after + transition.exited, transition.entered ); } for transition in tutorial_transitions.read() { info!( "tutorial transition: {:?} => {:?}", - transition.before, transition.after + transition.exited, transition.entered ); } } diff --git a/examples/state/state.rs b/examples/state/state.rs index c2acde35be..d695e82e4a 100644 --- a/examples/state/state.rs +++ b/examples/state/state.rs @@ -170,7 +170,7 @@ fn log_transitions(mut transitions: EventReader>) for transition in transitions.read() { info!( "transition: {:?} => {:?}", - transition.before, transition.after + transition.exited, transition.entered ); } } diff --git a/examples/state/sub_states.rs b/examples/state/sub_states.rs index 453a2d73c2..704df87fbb 100644 --- a/examples/state/sub_states.rs +++ b/examples/state/sub_states.rs @@ -162,7 +162,7 @@ fn log_transitions(mut transitions: EventReader>) for transition in transitions.read() { info!( "transition: {:?} => {:?}", - transition.before, transition.after + transition.exited, transition.entered ); } }