Spread state context architecture (Fixes #18)

src/fighter/state/run.rs

@@ -1,6 +1,9 @@
 use bevy::prelude::*;
 
-use super::{FighterStateContext, FighterStateImpl, ground, wait, walk};
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground,
+    wait, walk,
+};
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
 use crate::fighter::state::fall::FallState;
@@ -14,7 +17,7 @@ pub struct RunState {
 
 impl FighterStateImpl for RunState {
     const NAME: &'static str = "Run";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if let Some(state) =
             ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
         {
@@ -32,21 +35,20 @@ impl FighterStateImpl for RunState {
         }
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Run, true);
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         let last_frame = state_context.input.get_last_frame();
         let (accel, target_vel) = state_context
-            .fighter_manifest
-            .attributes
+            .fighter_attributes
             .get_accel_and_target_dashrun(&last_frame, FGi32::ONE);
         let accel = ground::compute_ground_accel(
             accel,
             target_vel,
             state_context.velocity.x,
-            &state_context.fighter_manifest.attributes,
+            state_context.fighter_attributes,
             state_context.game_settings,
         );
         state_context.velocity.x += accel;
@@ -60,7 +62,7 @@ impl FighterStateImpl for RunState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
         if let GroundedMotionResult::InAir =
             ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
@@ -73,7 +75,7 @@ impl FighterStateImpl for RunState {
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_state_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();