Add authoritative fighter surface state

## Summary
- signal GameCube poll thread shutdown unconditionally when the snapshot is dropped
- retain and join the poll thread during resource cleanup
- add bounded, shutdown-aware backoff for recoverable parse and short-read errors
- add unit coverage for backoff capping and shutdown-aware waits

Fixes #25

Reviewed-on: #55
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>

src/debug_tools.rs

@@ -3,11 +3,9 @@
 use std::{collections::HashMap, time::Duration};
 
 use bevy::{
-    input::InputSystems,
+    camera::{CameraOutputMode, visibility::RenderLayers}, input::InputSystems, prelude::*, render::render_resource::BlendState, settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
-    prelude::*,
-    settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
 };
-use bevy_egui::{EguiContexts, EguiPrimaryContextPass, egui};
+use bevy_egui::{EguiContexts, EguiGlobalSettings, EguiPrimaryContextPass, PrimaryEguiContext, egui};
 use bevy_ggrs::{RollbackFrameRate, RunGgrsSystems};
 use enum_cycling::EnumCycle;
 use enum_cycling_derive::EnumCycle;
@@ -397,6 +395,7 @@ impl Plugin for DebugToolsPlugin {
                     .before(RunGgrsSystems)
                     .run_if(in_state(AppState::InMatch)),
             )
+            .add_systems(Startup, spawn_egui_camera)
             .add_systems(PreUpdate, restore_frame_step_time.after(RunGgrsSystems))
             .add_systems(
                 Update,
@@ -408,6 +407,26 @@ impl Plugin for DebugToolsPlugin {
     }
 }
 
+pub fn spawn_egui_camera(mut commands: Commands, mut egui_global_settings: ResMut<EguiGlobalSettings>,) {
+    egui_global_settings.auto_create_primary_context = false;
+    commands.spawn((
+        // The `PrimaryEguiContext` component requires everything needed to render a primary context.
+        PrimaryEguiContext,
+        Camera2d,
+        // Setting RenderLayers to none makes sure we won't render anything apart from the UI.
+        RenderLayers::none(),
+        Camera {
+            order: 2,
+            output_mode: CameraOutputMode::Write {
+                blend_state: Some(BlendState::ALPHA_BLENDING),
+                clear_color: ClearColorConfig::None,
+            },
+            clear_color: ClearColorConfig::Custom(Color::NONE),
+            ..default()
+        },
+    ));
+}
+
 fn player_handles(players: &Query<&Player>) -> Vec<usize> {
     let mut handles = players
         .iter()

src/debug_tools/save_state.rs

@@ -1,12 +1,22 @@
 use bevy::prelude::*;
 
 use crate::{
-    camera::MatchCamera, fighter::{
+    camera::MatchCamera,
-        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation, FighterVelocity, Grounded, animation::FighterAnimationFrame, attack::{
+    fighter::{
+        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake,
+        FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState,
+        FighterTranslation, FighterVelocity,
+        animation::FighterAnimationFrame,
+        attack::{
             FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
             FighterSolvedHurtboxes, FighterStaleMoveQueue,
-        }, baked_animation::FighterBoneMatrices, state::FighterState,
+        },
-    }, input::FighterInput, player::Player, stage::line::StageCollision,
+        baked_animation::FighterBoneMatrices,
+        state::FighterState,
+    },
+    input::FighterInput,
+    player::Player,
+    stage::line::StageCollision,
 };
 
 #[derive(Resource, Default)]
@@ -44,7 +54,7 @@ struct FighterCheckpoint {
     hitboxes: FighterHitboxes,
     solved_hurtboxes: FighterSolvedHurtboxes,
     bone_matrices: FighterBoneMatrices,
-    grounded: bool,
+    surface: FighterSurfaceState,
 }
 
 pub(super) fn save_or_restore(world: &mut World) {
@@ -143,11 +153,7 @@ pub(super) fn save_or_restore(world: &mut World) {
         entity.insert(saved.hitboxes.clone());
         entity.insert(saved.solved_hurtboxes.clone());
         entity.insert(saved.bone_matrices.clone());
-        if saved.grounded {
+        entity.insert(saved.surface);
-            entity.insert(Grounded);
-        } else {
-            entity.remove::<Grounded>();
-        }
     }
     world.insert_resource(checkpoint.pending_hits.clone());
     world.insert_resource(checkpoint.stage_collision);
@@ -181,7 +187,7 @@ fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
         hitboxes: fighter.get::<FighterHitboxes>()?.clone(),
         solved_hurtboxes: fighter.get::<FighterSolvedHurtboxes>()?.clone(),
         bone_matrices: fighter.get::<FighterBoneMatrices>()?.clone(),
-        grounded: fighter.contains::<Grounded>(),
+        surface: *fighter.get::<FighterSurfaceState>()?,
     })
 }
 

src/fighter/mod.rs

@@ -18,6 +18,7 @@ pub mod hurtbox;
 pub mod manifest;
 pub mod motion;
 pub mod state;
+pub mod surface;
 pub mod visual;
 
 // The fighter components are re-exported so the rest of the crate can say
@@ -28,18 +29,29 @@ pub use attributes::FighterAttributes;
 pub use ecb::FighterECB;
 pub use manifest::FighterId;
 pub use motion::{
-    FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation,
+    FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
-    FighterVelocity, Grounded,
 };
+pub use surface::FighterSurfaceState;
 
 use crate::{
-    AppState, fighter::{
+    AppState,
+    fighter::{
         attack::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
             FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
             FighterStaleMoveQueue,
-        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::FighterAnimations,
+        },
-    }, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
+        baked_animation::{FighterBoneIndexMap, FighterBoneMatrices},
+        manifest::FighterManifest,
+        state::{FighterState, air::AirborneStateCommon, fall::FallState},
+        visual::FighterAnimations,
+    },
+    input::FighterInput,
+    math::{int::FGi32, vec::FGVec2},
+    player::Player,
+    schedule::GameplaySet,
+    scripting::FighterAttackScript,
+    stage::line::StageCollision,
 };
 use state::state_interrupt_system;
 
@@ -58,14 +70,14 @@ pub enum FighterFacingDirection {
 pub enum FighterHitstopShakeKind {
     #[default]
     Horizontal,
-    Vertical
+    Vertical,
 }
 
 #[derive(Component, Copy, Clone, Hash, Debug, PartialEq, Reflect, Default)]
 pub enum FighterHitstopShakeRole {
     #[default]
     Attacker,
-    Receiver
+    Receiver,
 }
 
 #[derive(Component, Default, Copy, Clone, Hash)]
@@ -73,7 +85,7 @@ pub struct FighterHitstopShake {
     pub remaining_frames: u32,
     pub total_frames: u32,
     pub kind: FighterHitstopShakeKind,
-    pub role: FighterHitstopShakeRole
+    pub role: FighterHitstopShakeRole,
 }
 
 #[derive(Component, Default, Copy, Clone, Hash)]
@@ -133,7 +145,7 @@ pub struct FighterVisual;
     FighterPendingHitReaction,
     FighterHitstop,
     FighterKnockbackVelocity,
-    FighterTranslation,
+    FighterTranslation
 )]
 pub struct Fighter {
     pub manifest: Handle<FighterManifest>,
@@ -200,8 +212,8 @@ impl Plugin for FighterPlugin {
             .checksum_component_with_hash::<FighterPreviousFacingDirection>()
             .rollback_component_with_copy::<animation::FighterAnimationFrame>()
             .checksum_component_with_hash::<animation::FighterAnimationFrame>()
-            .rollback_component_with_copy::<Grounded>()
+            .rollback_component_with_copy::<FighterSurfaceState>()
-            .checksum_component_with_hash::<Grounded>()
+            .checksum_component_with_hash::<FighterSurfaceState>()
             .rollback_component_with_copy::<FighterFacingDirection>()
             .rollback_component_with_copy::<FighterDamage>()
             .checksum_component_with_hash::<FighterDamage>()
@@ -259,7 +271,7 @@ pub struct FighterActiveAttack {
     pub active_hitboxes: Vec<usize>,
     pub solved_hitboxes: Vec<attack::FighterSolvedHitbox>,
     pub hit_fighters: Vec<Entity>,
-    pub stalled: bool
+    pub stalled: bool,
 }
 
 #[derive(Component, Clone, Debug, Default, Hash)]
@@ -284,6 +296,7 @@ pub fn spawn_fighter(
             Fighter { manifest: manifest },
             FighterFacingDirection::Right,
             FighterPreviousFacingDirection(FighterFacingDirection::Right),
+            FighterSurfaceState::Airborne,
             Transform::from_scale(Vec3::splat(model_scale.to_num())),
             (
                 FighterECB {

src/fighter/motion.rs

@@ -5,7 +5,7 @@ use bevy::prelude::*;
 use bevy_ggrs::GgrsFrameTiming;
 
 use crate::debug_tools::PresentationMotionMode;
-use crate::fighter::{FighterHitstopShake};
+use crate::fighter::FighterHitstopShake;
 use crate::game_settings::GameSettings;
 use crate::{
     fighter::{FighterECB, FighterFacingDirection, baked_animation::FixedMat4},
@@ -15,9 +15,6 @@ use crate::{
 #[derive(Component, Clone, Copy, Hash)]
 pub struct FighterPreviousFacingDirection(pub FighterFacingDirection);
 
-#[derive(Component, Clone, Copy, Hash)]
-pub struct Grounded;
-
 #[derive(Component, Deref, DerefMut, Default, Debug, Clone, Copy, Hash)]
 pub struct FighterVelocity(pub FGVec2);
 
@@ -82,19 +79,29 @@ pub fn apply_fighter_translation_to_visuals(
             0.0,
         );
 
-        if hitstop_shake.remaining_frames > 0 && hitstop_shake.total_frames > 0 && !game_settings.fighter_common.visual_shake_table.is_empty() {
+        if hitstop_shake.remaining_frames > 0
+            && hitstop_shake.total_frames > 0
+            && !game_settings.fighter_common.visual_shake_table.is_empty()
+        {
             let total = hitstop_shake.total_frames as f32;
             let curr = hitstop_shake.remaining_frames as f32;
             let elapsed = 1.0 - curr / total;
 
-            
+            let access_index = (hitstop_shake.remaining_frames as usize)
-            let access_index = (hitstop_shake.remaining_frames as usize) % game_settings.fighter_common.visual_shake_table.len();
+                % game_settings.fighter_common.visual_shake_table.len();
             let shake_multiplier = match hitstop_shake.role {
-                super::FighterHitstopShakeRole::Attacker => game_settings.fighter_common.attacker_visual_shake_multiplier,
+                super::FighterHitstopShakeRole::Attacker => {
+                    game_settings
+                        .fighter_common
+                        .attacker_visual_shake_multiplier
+                }
                 super::FighterHitstopShakeRole::Receiver => 1.0,
             };
-            let shake_amount: f32 = 1.0 - EaseFunction::QuinticIn.sample(elapsed).unwrap_or_default();
+            let shake_amount: f32 =
-            let shake_amount = game_settings.fighter_common.visual_shake_table[access_index] * shake_amount * shake_multiplier;
+                1.0 - EaseFunction::QuinticIn.sample(elapsed).unwrap_or_default();
+            let shake_amount = game_settings.fighter_common.visual_shake_table[access_index]
+                * shake_amount
+                * shake_multiplier;
 
             let shake_offset = match hitstop_shake.kind {
                 super::FighterHitstopShakeKind::Horizontal => Vec3::new(shake_amount, 0.0, 0.0),

src/fighter/state/air.rs

@@ -1,4 +1,3 @@
-use crate::fighter::state::ground::GroundedStateCommon;
 use crate::fighter::state::land::{LandingState, LandingType};
 use crate::fighter::state::{CollisionContext, FighterState};
 use crate::fighter::*;
@@ -30,7 +29,7 @@ pub fn process_fast_fall(
 pub fn integrate_gravity(
     velocity: &mut FighterVelocity,
     attributes: &FighterAttributes,
-    fast_fall: bool
+    fast_fall: bool,
 ) {
     velocity.y -= attributes.gravity;
 
@@ -84,7 +83,9 @@ pub fn apply_air_motion(
     velocity: &FighterVelocity,
     translation: &mut FighterTranslation,
     prev_translation: &mut FighterPreviousTranslation,
+    surface: &mut FighterSurfaceState,
 ) {
+    surface.leave_ground();
     // Vertical velocity should be 0 on the ground
     prev_translation.0 = translation.0;
     translation.0 += velocity.0;
@@ -94,10 +95,24 @@ pub fn update_standard_motion(
     ctx: &mut crate::fighter::state::UpdateContext,
     airborne_common: &mut AirborneStateCommon,
 ) {
-    process_fast_fall(airborne_common, ctx.input, &mut ctx.velocity, ctx.fighter_attributes);
+    process_fast_fall(
-    integrate_gravity(ctx.velocity, ctx.fighter_attributes, airborne_common.is_fast_falling);
+        airborne_common,
+        ctx.input,
+        &mut ctx.velocity,
+        ctx.fighter_attributes,
+    );
+    integrate_gravity(
+        ctx.velocity,
+        ctx.fighter_attributes,
+        airborne_common.is_fast_falling,
+    );
     apply_air_drift(ctx.velocity, ctx.fighter_attributes, ctx.input);
-    apply_air_motion(ctx.velocity, ctx.translation, ctx.prev_translation);
+    apply_air_motion(
+        ctx.velocity,
+        ctx.translation,
+        ctx.prev_translation,
+        ctx.surface,
+    );
 }
 
 pub fn collision_interrupt(
@@ -106,13 +121,8 @@ pub fn collision_interrupt(
 ) -> Option<FighterState> {
     let res = ctx.air_collide_with_stage()?;
     ctx.translation.0 = res.hit_position - ctx.ecb.get_bottom_point();
-    let grounded_common = GroundedStateCommon {
+    ctx.surface.land(res.line_id);
-        current_line_id: res.line_id,
+    Some(FighterState::Land(LandingState::create(landing_type)))
-    };
-    Some(FighterState::Land(LandingState::create(
-        grounded_common,
-        landing_type,
-    )))
 }
 
 #[cfg(test)]

src/fighter/state/air_dodge.rs

@@ -1,9 +1,16 @@
 use crate::{
     fighter::{
-        animation::AnimKind, state::{
+        animation::AnimKind,
-            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, fall::FallState, land::LandingType,
+        state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
+            UpdateContext,
+            air::{self, AirborneStateCommon},
+            fall::FallState,
+            land::LandingType,
         },
-    }, input, math::vec::FGVec2,
+    },
+    input,
+    math::vec::FGVec2,
 };
 
 #[derive(Debug, Clone, Hash)]
@@ -16,7 +23,9 @@ impl FighterStateImpl for AirDodgeState {
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
-            Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
+            Some(FighterState::Fall(FallState::new(
+                AirborneStateCommon::default(),
+            )))
         } else {
             None
         }
@@ -29,6 +38,7 @@ impl FighterStateImpl for AirDodgeState {
             state_context.velocity,
             state_context.translation,
             state_context.prev_translation,
+            state_context.surface,
         );
     }
 
@@ -46,9 +56,7 @@ impl FighterStateImpl for AirDodgeState {
             self.direction * state_context.fighter_attributes.air_dodge_velocity;
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         false
     }
 }

src/fighter/state/dash.rs

@@ -5,52 +5,43 @@ use super::{
 use crate::fighter::FighterFacingDirection;
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight};
 
 #[derive(Debug, Clone, Hash)]
 pub struct DashState {
     direction: FighterFacingDirection,
-    pub ground_common: GroundedStateCommon,
 }
 
 impl DashState {
-    pub fn new(direction: FighterFacingDirection, ground_common: GroundedStateCommon) -> Self {
+    pub fn new(direction: FighterFacingDirection) -> Self {
-        Self {
+        Self { direction }
-            direction,
-            ground_common,
-        }
     }
 }
 
 impl FighterStateImpl for DashState {
     const NAME: &'static str = "Dash";
     fn check_interrupt(&self, ctx: &mut InterruptContext) -> Option<FighterState> {
-        let ground = &self.ground_common;
         let attributes = ctx.fighter_attributes;
 
         // A reverse dash can interrupt before IASA
         if let Some(direction) =
             check_smash_input_with_dir(ctx).filter(|direction| *direction != self.direction)
         {
-            return Some(FighterState::Dash(DashState::new(
+            return Some(FighterState::Dash(DashState::new(direction)));
-                direction,
-                ground.clone(),
-            )));
         }
 
-        if let Some(state) = ground::grounded_movement_common_interrupts(ctx, ground) {
+        if let Some(state) = ground::grounded_movement_common_interrupts(ctx) {
             return Some(state);
         }
 
         if ctx.is_current_animation_finished() {
-            return run::check_input(ctx, ground)
+            return run::check_input(ctx)
-                .or_else(|| walk::check_input(ctx, ground))
+                .or_else(|| walk::check_input(ctx))
-                .or_else(|| wait::check_input(ctx, ground));
+                .or_else(|| wait::check_input(ctx));
         }
 
         if ctx.get_current_animation_frame() > attributes.dash_acceleration_duration {
-            return run::check_input(ctx, ground);
+            return run::check_input(ctx);
         }
 
         None
@@ -106,12 +97,10 @@ impl FighterStateImpl for DashState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.ground_common, true)
+        ground::collision_interrupt(state_context, true)
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
@@ -126,10 +115,6 @@ fn check_smash_input_with_dir(state_context: &InterruptContext) -> Option<Fighte
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
+    check_smash_input_with_dir(state_context).map(|dir| FighterState::Dash(DashState::new(dir)))
-    ground_common: &GroundedStateCommon,
-) -> Option<FighterState> {
-    check_smash_input_with_dir(state_context)
-        .map(|dir| FighterState::Dash(DashState::new(dir, ground_common.clone())))
 }

src/fighter/state/ground.rs

@@ -3,7 +3,8 @@
 //! bit-for-bit deterministic for rollback.
 
 use crate::fighter::state::{
-    CollisionContext, FighterState, InterruptContext, air, dash, fall, ground_attack, turn, wait, walk,
+    CollisionContext, FighterState, InterruptContext, air, dash, fall, ground_attack, turn, wait,
+    walk,
 };
 use crate::fighter::{
     FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
@@ -13,13 +14,6 @@ use crate::math::int::{FGWide, FGi32};
 use crate::math::vec::FGVec2;
 use crate::stage::line::{StageLineID, StagePoly, StagePolyLineSegment, StagePolyLineSegmentType};
 
-use bevy::prelude::*;
-
-#[derive(Reflect, Hash, Clone, Debug)]
-pub struct GroundedStateCommon {
-    pub current_line_id: StageLineID,
-}
-
 pub fn apply_grounded_friction(friction: FGi32, ground_vel: FGi32) -> FGi32 {
     if friction.abs() > ground_vel.abs() {
         -ground_vel
@@ -181,22 +175,23 @@ pub fn update_friction_motion(ctx: &mut crate::fighter::state::UpdateContext) {
 
 pub fn collide_with_stage_grounded(
     state_context: &mut CollisionContext,
-    ground_common: &mut GroundedStateCommon,
     can_walk_off: bool,
 ) -> GroundedMotionResult {
     let translation = &mut state_context.translation;
     let ecb = state_context.ecb;
     let stage_collision = state_context.stage_collision;
 
-    let stage_poly = stage_collision
+    let Some(current_line_id) = state_context.surface.line_id() else {
-        .stage_polys
+        return GroundedMotionResult::InAir;
-        .get(ground_common.current_line_id.polygon);
+    };
+
+    let stage_poly = stage_collision.stage_polys.get(current_line_id.polygon);
 
     if let Some(stage_poly) = stage_poly {
         let ecb_bottom_pos = translation.0 + ecb.get_bottom_point();
         match resolve_grounded_position(
             stage_poly,
-            ground_common.current_line_id.segment,
+            current_line_id.segment,
             ecb_bottom_pos,
             can_walk_off,
         ) {
@@ -216,30 +211,37 @@ pub fn collide_with_stage_grounded(
                             .0
                             .project_onto_normalized(current_segment.normal)
                 };
-                ground_common.current_line_id.segment = segment_idx;
+                state_context.surface.land(StageLineID {
+                    polygon: current_line_id.polygon,
+                    segment: segment_idx,
+                });
                 GroundedMotionResult::InGround
             }
-            GroundedPositionResult::InAir => GroundedMotionResult::InAir,
+            GroundedPositionResult::InAir => {
+                state_context.surface.leave_ground();
+                GroundedMotionResult::InAir
+            }
         }
     } else {
+        state_context.surface.leave_ground();
         GroundedMotionResult::InAir
     }
 }
 
-pub fn collision_interrupt(
+pub fn collision_interrupt(ctx: &mut CollisionContext, can_walk_off: bool) -> Option<FighterState> {
-    ctx: &mut CollisionContext,
+    match collide_with_stage_grounded(ctx, can_walk_off) {
-    common: &mut GroundedStateCommon,
-    can_walk_off: bool,
-) -> Option<FighterState> {
-    match collide_with_stage_grounded(ctx, common, can_walk_off) {
         GroundedMotionResult::InGround => None,
-        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState::new(air::AirborneStateCommon::default()))),
+        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState::new(
+            air::AirborneStateCommon::default(),
+        ))),
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::fighter::ecb::FighterPreviousECB;
+    use crate::fighter::{FighterECB, FighterSurfaceState};
     use crate::stage::line::StagePolyType;
 
     fn two_segment_floor() -> StagePoly {
@@ -346,28 +348,110 @@ mod tests {
             GroundedPositionResult::InAir
         ));
     }
+
+    #[test]
+    fn grounded_collision_updates_surface_segment() {
+        let stage_collision = crate::stage::line::StageCollision {
+            stage_polys: vec![two_segment_floor()],
+        };
+        let mut surface = FighterSurfaceState::Grounded {
+            line_id: StageLineID {
+                polygon: 0,
+                segment: 0,
+            },
+        };
+        let mut translation = FighterTranslation(FGVec2::lit("11", "0"));
+        let previous_translation = FighterPreviousTranslation(translation.0);
+        let mut velocity = FighterVelocity::default();
+        let ecb = FighterECB {
+            vertical_half: FGi32::ONE,
+            horizontal_half: FGi32::ONE,
+        };
+        let previous_ecb = FighterPreviousECB::from(ecb);
+        let mut context = CollisionContext {
+            translation: &mut translation,
+            prev_translation: &previous_translation,
+            velocity: &mut velocity,
+            surface: &mut surface,
+            ecb: &ecb,
+            prev_ecb: &previous_ecb,
+            stage_collision: &stage_collision,
+        };
+
+        assert!(matches!(
+            collide_with_stage_grounded(&mut context, true),
+            GroundedMotionResult::InGround
+        ));
+        assert_eq!(
+            surface.line_id(),
+            Some(StageLineID {
+                polygon: 0,
+                segment: 1,
+            })
+        );
+    }
+
+    #[test]
+    fn walking_off_edge_clears_surface_contact() {
+        let stage_collision = crate::stage::line::StageCollision {
+            stage_polys: vec![StagePoly::build(
+                StagePolyType::Platform,
+                &[
+                    (FGVec2::lit("0", "0"), StagePolyLineSegmentType::Floor),
+                    (FGVec2::lit("10", "0"), StagePolyLineSegmentType::Floor),
+                ],
+            )],
+        };
+        let mut surface = FighterSurfaceState::Grounded {
+            line_id: StageLineID {
+                polygon: 0,
+                segment: 0,
+            },
+        };
+        let mut translation = FighterTranslation(FGVec2::lit("11", "0"));
+        let previous_translation = FighterPreviousTranslation(translation.0);
+        let mut velocity = FighterVelocity::default();
+        let ecb = FighterECB {
+            vertical_half: FGi32::ONE,
+            horizontal_half: FGi32::ONE,
+        };
+        let previous_ecb = FighterPreviousECB::from(ecb);
+        let mut context = CollisionContext {
+            translation: &mut translation,
+            prev_translation: &previous_translation,
+            velocity: &mut velocity,
+            surface: &mut surface,
+            ecb: &ecb,
+            prev_ecb: &previous_ecb,
+            stage_collision: &stage_collision,
+        };
+
+        assert!(matches!(
+            collide_with_stage_grounded(&mut context, true),
+            GroundedMotionResult::InAir
+        ));
+        assert_eq!(surface, FighterSurfaceState::Airborne);
+    }
 }
 
 pub fn grounded_movement_common_interrupts(
     state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
-    super::jump::check_input(state_context, ground_common)
+    super::jump::check_input(state_context)
 }
 
 pub fn grounded_movement_standstill_common_interrupts(
     state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
-    if let Some(state) = ground_attack::check_interrupt(state_context, &ground_common) {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
         Some(state)
-    } else if let Some(state) = dash::check_input(state_context, &ground_common) {
+    } else if let Some(state) = dash::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = turn::check_input(state_context, &ground_common) {
+    } else if let Some(state) = turn::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = walk::check_input(state_context, &ground_common) {
+    } else if let Some(state) = walk::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = wait::check_input(state_context, &ground_common) {
+    } else if let Some(state) = wait::check_input(state_context) {
         Some(state)
     } else {
         None

src/fighter/state/ground_attack.rs

@@ -2,14 +2,13 @@ use crate::fighter::{
     attack::{AttackKind, update_active_hitbox_list},
     state::{
         CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
-        InterruptContext, UpdateContext, ground::GroundedStateCommon, wait::WaitState,
+        InterruptContext, UpdateContext, wait::WaitState,
     },
 };
 
 #[derive(Clone, Debug, Hash)]
 pub struct GroundAttackState {
     pub attack_kind: AttackKind,
-    pub grounded_common: GroundedStateCommon,
 }
 
 impl FighterStateImpl for GroundAttackState {
@@ -17,9 +16,7 @@ impl FighterStateImpl for GroundAttackState {
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
-            Some(FighterState::Wait(WaitState {
+            Some(FighterState::Wait(WaitState))
-                grounded_common: self.grounded_common.clone(),
-            }))
         } else {
             None
         }
@@ -53,7 +50,7 @@ impl FighterStateImpl for GroundAttackState {
             active_hitboxes: Vec::new(),
             solved_hitboxes: Vec::new(),
             hit_fighters: Vec::new(),
-            stalled: false
+            stalled: false,
         });
     }
 
@@ -68,17 +65,12 @@ impl FighterStateImpl for GroundAttackState {
         None
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
 
-pub fn check_interrupt(
+pub fn check_interrupt(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    grounded_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     if state_context
         .input
         .has_command(crate::input::FighterCommands::Attack)
@@ -89,7 +81,6 @@ pub fn check_interrupt(
             .to_attack_kind_grounded();
         Some(FighterState::GroundAttack(GroundAttackState {
             attack_kind,
-            grounded_common: grounded_common.clone(),
         }))
     } else {
         None

src/fighter/state/hitstun.rs

@@ -7,7 +7,7 @@ use crate::{
             InterruptContext, UpdateContext,
             air::{self, AirborneStateCommon},
             fall::FallState,
-            ground::{GroundedStateCommon, collision_interrupt},
+            ground::collision_interrupt,
             land::LandingType,
             wait::WaitState,
         },
@@ -17,7 +17,7 @@ use crate::{
 
 #[derive(Clone, Debug, Hash)]
 pub enum HitstopStateKind {
-    Grounded(GroundedStateCommon),
+    Grounded,
     Airborne,
 }
 
@@ -43,7 +43,7 @@ impl FighterStateImpl for HitstunState {
 
     fn name(&self) -> String {
         let hitstop_kind = match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => "Grounded",
+            HitstopStateKind::Grounded => "Grounded",
             HitstopStateKind::Airborne => "Airborne",
         };
 
@@ -58,14 +58,10 @@ impl FighterStateImpl for HitstunState {
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.get_current_animation_frame() > self.hit_reaction.hitstun_frames {
             match &self.hitstop_kind {
-                HitstopStateKind::Grounded(grounded_state_common) => {
+                HitstopStateKind::Grounded => Some(FighterState::Wait(WaitState)),
-                    Some(FighterState::Wait(WaitState {
+                HitstopStateKind::Airborne => Some(FighterState::Fall(FallState::new(
-                        grounded_common: grounded_state_common.clone(),
+                    AirborneStateCommon::default(),
-                    }))
+                ))),
-                }
-                HitstopStateKind::Airborne => {
-                    Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
-                }
             }
         } else {
             None
@@ -85,8 +81,9 @@ impl FighterStateImpl for HitstunState {
         }
 
         match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => {}
+            HitstopStateKind::Grounded => {}
             HitstopStateKind::Airborne => {
+                ctx.surface.leave_ground();
                 air::integrate_gravity(ctx.velocity, ctx.fighter_attributes, false);
             }
         }
@@ -103,7 +100,7 @@ impl FighterStateImpl for HitstunState {
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         let animation = match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => AnimKind::FlinchGround,
+            HitstopStateKind::Grounded => AnimKind::FlinchGround,
             HitstopStateKind::Airborne => AnimKind::FlinchAir,
         };
         state_context.play_animation(animation, false);
@@ -116,9 +113,7 @@ impl FighterStateImpl for HitstunState {
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
         match &mut self.hitstop_kind {
-            HitstopStateKind::Grounded(grounded_state_common) => {
+            HitstopStateKind::Grounded => collision_interrupt(state_context, true),
-                collision_interrupt(state_context, grounded_state_common, true)
-            }
             HitstopStateKind::Airborne => {
                 air::collision_interrupt(state_context, LandingType::Normal)
             }
@@ -127,7 +122,7 @@ impl FighterStateImpl for HitstunState {
 
     fn is_visually_grounded<'a>(&'a self) -> bool {
         match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => true,
+            HitstopStateKind::Grounded => true,
             HitstopStateKind::Airborne => false,
         }
     }

src/fighter/state/jump.rs

@@ -2,10 +2,17 @@ use bevy::prelude::*;
 
 use crate::{
     fighter::{
-        animation::AnimKind, state::{
+        animation::AnimKind,
-            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, air_dodge::{self, AirDodgeState}, ground::{self, GroundedStateCommon},
+        state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
+            UpdateContext,
+            air::{self, AirborneStateCommon},
+            air_dodge::{self, AirDodgeState},
+            ground,
         },
-    }, input::FighterCommands, math::{int::FGi32, vec::FGVec2},
+    },
+    input::FighterCommands,
+    math::{int::FGi32, vec::FGVec2},
 };
 #[derive(Debug, Hash, Clone, Copy)]
 pub enum JumpType {
@@ -22,14 +29,12 @@ pub struct JumpState {
 
 #[derive(Debug, Clone, Hash)]
 pub struct JumpSquatState {
-    pub grounded_common: GroundedStateCommon,
     pub duration_counter: u32,
 }
 
 impl JumpSquatState {
-    pub fn create(grounded_common: GroundedStateCommon) -> Self {
+    pub fn create() -> Self {
         Self {
-            grounded_common,
             duration_counter: 0,
         }
     }
@@ -69,7 +74,10 @@ impl FighterStateImpl for JumpSquatState {
             } else {
                 JumpType::ShortHop
             };
-            Some(FighterState::Jump(JumpState { jump_type, airborne_state_common: AirborneStateCommon::default() }))
+            Some(FighterState::Jump(JumpState {
+                jump_type,
+                airborne_state_common: AirborneStateCommon::default(),
+            }))
         } else {
             None
         }
@@ -84,7 +92,7 @@ impl FighterStateImpl for JumpSquatState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -92,9 +100,7 @@ impl FighterStateImpl for JumpSquatState {
         state_context.input.clear_command(FighterCommands::Jump);
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
@@ -105,7 +111,7 @@ impl FighterStateImpl for JumpState {
         if state_context.input.has_command(FighterCommands::Jump) {
             Some(FighterState::Jump(JumpState {
                 jump_type: JumpType::DoubleJump,
-                airborne_state_common: AirborneStateCommon::default()
+                airborne_state_common: AirborneStateCommon::default(),
             }))
         } else {
             air_dodge::check_input(state_context)
@@ -177,21 +183,16 @@ impl FighterStateImpl for JumpState {
         )
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         false
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     state_context
         .input
         .has_command(FighterCommands::Jump)
-        .then(|| FighterState::JumpSquat(JumpSquatState::create(ground_common.clone())))
+        .then(|| FighterState::JumpSquat(JumpSquatState::create()))
 }
 
 pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<FighterState> {
@@ -201,7 +202,7 @@ pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<Fight
         .then(|| {
             FighterState::Jump(JumpState {
                 jump_type: JumpType::DoubleJump,
-                airborne_state_common: AirborneStateCommon::default()
+                airborne_state_common: AirborneStateCommon::default(),
             })
         })
 }

src/fighter/state/land.rs

@@ -3,7 +3,7 @@ use crate::fighter::{
     state::{
         CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
         UpdateContext, dash,
-        ground::{self, GroundedStateCommon, grounded_movement_standstill_common_interrupts},
+        ground::{self, grounded_movement_standstill_common_interrupts},
         walk,
     },
 };
@@ -16,16 +16,12 @@ pub enum LandingType {
 
 #[derive(Debug, Clone, Hash)]
 pub struct LandingState {
-    pub grounded_common: GroundedStateCommon,
     pub landing_type: LandingType,
 }
 
 impl LandingState {
-    pub fn create(grounded_common: GroundedStateCommon, landing_type: LandingType) -> Self {
+    pub fn create(landing_type: LandingType) -> Self {
-        Self {
+        Self { landing_type }
-            grounded_common,
-            landing_type,
-        }
     }
 }
 
@@ -34,14 +30,14 @@ impl FighterStateImpl for LandingState {
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
-            grounded_movement_standstill_common_interrupts(state_context, &self.grounded_common)
+            grounded_movement_standstill_common_interrupts(state_context)
         } else if state_context.get_current_animation_frame()
             >= state_context.fighter_attributes.landing_iasa
             && let LandingType::Normal = self.landing_type
         {
-            dash::check_input(state_context, &self.grounded_common).or_else(|| {
+            dash::check_input(state_context).or_else(|| {
-                ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
+                ground::grounded_movement_common_interrupts(state_context)
-                    .or_else(|| walk::check_input(state_context, &self.grounded_common))
+                    .or_else(|| walk::check_input(state_context))
             })
         } else {
             None
@@ -56,7 +52,7 @@ impl FighterStateImpl for LandingState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, true)
+        ground::collision_interrupt(state_context, true)
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -70,9 +66,7 @@ impl FighterStateImpl for LandingState {
         };
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }

src/fighter/state/mod.rs

@@ -7,7 +7,8 @@ use bevy::prelude::*;
 
 use crate::fighter::animation::{AnimKind, FighterAnimationFrame};
 use crate::fighter::attack::{
-    FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction, FighterStaleMoveQueue, HitStop,
+    FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction,
+    FighterStaleMoveQueue, HitStop,
 };
 use crate::fighter::attributes::FighterAttributes;
 use crate::fighter::baked_animation::BakedFighterAnimations;
@@ -16,7 +17,9 @@ use crate::fighter::manifest::FighterManifest;
 use crate::fighter::state::hitstun::HitstunState;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
+    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
+    FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole,
+    FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity,
 };
 use crate::game_settings::GameSettings;
 use crate::input::FighterInput;
@@ -95,9 +98,7 @@ pub trait FighterStateImpl: Sized {
         None
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool;
-        &'a self,
-    ) -> bool;
 }
 
 pub struct AnimationStatus {
@@ -151,6 +152,7 @@ pub struct UpdateContext<'a> {
     pub input: &'a mut FighterInput,
     pub hitboxes: &'a mut FighterHitboxes,
     pub velocity: &'a mut FighterVelocity,
+    pub surface: &'a mut FighterSurfaceState,
     pub knockback_velocity: &'a mut FighterKnockbackVelocity,
     pub game_settings: &'a GameSettings,
     pub animation_frame: u32,
@@ -170,6 +172,7 @@ pub struct CollisionContext<'a> {
     pub translation: &'a mut FighterTranslation,
     pub prev_translation: &'a FighterPreviousTranslation,
     pub velocity: &'a mut FighterVelocity,
+    pub surface: &'a mut FighterSurfaceState,
     pub ecb: &'a FighterECB,
     pub prev_ecb: &'a FighterPreviousECB,
     pub stage_collision: &'a StageCollision,
@@ -212,6 +215,7 @@ pub struct FighterFrameQuery {
     pub input: &'static mut FighterInput,
     pub hitboxes: &'static mut FighterHitboxes,
     pub velocity: &'static mut FighterVelocity,
+    pub surface: &'static mut FighterSurfaceState,
     pub knockback_velocity: &'static mut FighterKnockbackVelocity,
     pub stale_move_queue: &'static mut FighterStaleMoveQueue,
     pub ecb: &'static FighterECB,
@@ -292,13 +296,14 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             input: &mut self.input,
             hitboxes: &mut self.hitboxes,
             velocity: &mut self.velocity,
+            surface: &mut self.surface,
             knockback_velocity: &mut self.knockback_velocity,
             game_settings,
             animation_frame: self.animation_frame.frame,
             fighter_attributes: attributes,
             attack_scripts,
             attack_script_assets,
-            facing_direction: &self.facing_direction
+            facing_direction: &self.facing_direction,
         }
     }
 
@@ -310,6 +315,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             translation: &mut self.translation,
             prev_translation: &self.prev_translation,
             velocity: &mut self.velocity,
+            surface: &mut self.surface,
             ecb: &self.ecb,
             prev_ecb: &self.prev_ecb,
             stage_collision,
@@ -400,7 +406,9 @@ pub fn state_interrupt_system(
 
         let new_state = if let Some(reaction) = pending_hit_reaction.take() {
             hitstop.remaining_frames = *reaction.hitstop_frames;
-            let shake_frames = reaction.hitstop_frames.calculate_shake_frames(&game_settings);
+            let shake_frames = reaction
+                .hitstop_frames
+                .calculate_shake_frames(&game_settings);
             hitstop_shake.role = FighterHitstopShakeRole::Receiver;
             hitstop_shake.total_frames = shake_frames;
             hitstop_shake.remaining_frames = shake_frames;
@@ -410,34 +418,24 @@ pub fn state_interrupt_system(
                 FighterHitstopShakeKind::Vertical
             };
 
-            let mut hitstop_kind = match &*state {
+            let mut hitstop_kind = if frame.surface.is_grounded() {
-                FighterState::Wait(value) => {
+                hitstun::HitstopStateKind::Grounded
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
+            } else {
-                }
+                hitstun::HitstopStateKind::Airborne
-                FighterState::Walk(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                FighterState::Dash(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.ground_common.clone())
-                }
-                FighterState::Run(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                FighterState::Turn(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                FighterState::GroundAttack(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                _ => hitstun::HitstopStateKind::Airborne,
             };
 
-            if let hitstun::HitstopStateKind::Grounded(_) = hitstop_kind {
+            if let hitstun::HitstopStateKind::Grounded = hitstop_kind {
                 let straight_up_angle = FGi32::lit("90.0");
-                if reaction.hitstop_frames >= HitStop::new(game_settings.fighter_common.tumble_bounce_hitstop_threshold) {
+                if reaction.hitstop_frames
+                    >= HitStop::new(game_settings.fighter_common.tumble_bounce_hitstop_threshold)
+                {
                     hitstop_kind = hitstun::HitstopStateKind::Airborne;
                 // TODO: Use floor normal here
-                } else if reaction.launch_angle.abs_diff(straight_up_angle) < game_settings.fighter_common.attack_ground_to_airborne_transition_vertical_angle_threshold {
+                } else if reaction.launch_angle.abs_diff(straight_up_angle)
+                    < game_settings
+                        .fighter_common
+                        .attack_ground_to_airborne_transition_vertical_angle_threshold
+                {
                     hitstop_kind = hitstun::HitstopStateKind::Airborne;
                 } else {
                     // straight down is 270
@@ -450,6 +448,10 @@ pub fn state_interrupt_system(
                 }
             }
 
+            if matches!(hitstop_kind, hitstun::HitstopStateKind::Airborne) {
+                frame.surface.leave_ground();
+            }
+
             info!("Entering hitstop kind: {:?}", hitstop_kind);
             Some(FighterState::Hitstun(HitstunState::new(
                 reaction,

src/fighter/state/run.rs

@@ -6,19 +6,14 @@ use super::{
 };
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Component, Debug, Clone, Hash)]
-pub struct RunState {
+pub struct RunState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for RunState {
     const NAME: &'static str = "Run";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             return Some(state);
         }
 
@@ -28,8 +23,7 @@ impl FighterStateImpl for RunState {
         {
             None
         } else {
-            walk::check_input(state_context, &self.grounded_common)
+            walk::check_input(state_context).or_else(|| wait::check_input(state_context))
-                .or_else(|| wait::check_input(state_context, &self.grounded_common))
         }
     }
 
@@ -62,26 +56,19 @@ impl FighterStateImpl for RunState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, true)
+        ground::collision_interrupt(state_context, true)
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
     if input_frame.movement.x.abs() >= state_context.game_settings.input_common.run_stick_threshold
     {
-        return Some(FighterState::Run(RunState {
+        return Some(FighterState::Run(RunState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/turn.rs

@@ -1,13 +1,11 @@
 use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::ground::{self, GroundedStateCommon};
+use crate::fighter::state::ground;
 use crate::fighter::state::{FighterState, dash, jump, wait, walk};
 use crate::input::FighterCommands;
 
 #[derive(Debug, Clone, Hash)]
-pub struct TurnState {
+pub struct TurnState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for TurnState {
     const NAME: &'static str = "Turn";
@@ -19,19 +17,19 @@ impl FighterStateImpl for TurnState {
                 .input_common
                 .turn_into_dashback_window as u32
         {
-            if let Some(state) = dash::check_input(state_context, &self.grounded_common) {
+            if let Some(state) = dash::check_input(state_context) {
                 return Some(state);
             }
         }
-        if let Some(state) = jump::check_input(state_context, &self.grounded_common) {
+        if let Some(state) = jump::check_input(state_context) {
             *state_context.facing_direction = state_context.facing_direction.reverse();
             Some(state)
         } else if state_context.is_current_animation_finished() {
-            if let Some(state) = dash::check_input(state_context, &self.grounded_common) {
+            if let Some(state) = dash::check_input(state_context) {
                 Some(state)
-            } else if let Some(state) = walk::check_input(state_context, &self.grounded_common) {
+            } else if let Some(state) = walk::check_input(state_context) {
                 Some(state)
-            } else if let Some(state) = wait::check_input(state_context, &self.grounded_common) {
+            } else if let Some(state) = wait::check_input(state_context) {
                 Some(state)
             } else {
                 None
@@ -54,20 +52,15 @@ impl FighterStateImpl for TurnState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    grounded_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 
     let has_smash_input = state_context
@@ -81,9 +74,7 @@ pub fn check_input(
         && input_frame.movement.x.signum() != state_context.facing_direction.to_sign()
         && !has_smash_input
     {
-        return Some(FighterState::Turn(TurnState {
+        return Some(FighterState::Turn(TurnState));
-            grounded_common: grounded_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/wait.rs

@@ -3,24 +3,18 @@ use super::{
 };
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
-pub struct WaitState {
+pub struct WaitState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for WaitState {
     const NAME: &'static str = "Wait";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             Some(state)
-        } else if let Some(state) = ground::grounded_movement_standstill_common_interrupts(
+        } else if let Some(state) =
-            state_context,
+            ground::grounded_movement_standstill_common_interrupts(state_context)
-            &self.grounded_common,
+        {
-        ) {
             // Don't transition into yourself
             if let FighterState::Wait(_) = state {
                 None
@@ -44,26 +38,19 @@ impl FighterStateImpl for WaitState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 
     if input_frame.movement.x.abs() < state_context.game_settings.input_common.stick_deadzone {
-        return Some(FighterState::Wait(WaitState {
+        return Some(FighterState::Wait(WaitState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/walk.rs

@@ -4,23 +4,17 @@ use super::{
 };
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
-pub struct WalkState {
+pub struct WalkState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for WalkState {
     const NAME: &'static str = "Walk";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             return Some(state);
         }
-        wait::check_input(state_context, &self.grounded_common)
+        wait::check_input(state_context).or_else(|| dash::check_input(state_context))
-            .or_else(|| dash::check_input(state_context, &self.grounded_common))
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -54,26 +48,19 @@ impl FighterStateImpl for WalkState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
     }
 
-    fn is_visually_grounded<'a>(
+    fn is_visually_grounded<'a>(&'a self) -> bool {
-        &'a self,
-    ) -> bool {
         true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 
     if !input_frame.movement.x.is_zero() {
-        return Some(FighterState::Walk(WalkState {
+        return Some(FighterState::Walk(WalkState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
 
     None

src/fighter/surface.rs

@@ -0,0 +1,62 @@
+use bevy::prelude::*;
+
+use crate::stage::line::StageLineID;
+
+/// The stage surface currently supporting a fighter.
+///
+/// This is physics state rather than fighter-state-machine state. Keeping it
+/// separate means grounded, landing, and hitstun states all share one source
+/// of truth for stage contact.
+#[derive(Component, Clone, Copy, Debug, Default, Hash, PartialEq, Eq)]
+pub enum FighterSurfaceState {
+    #[default]
+    Airborne,
+    Grounded {
+        line_id: StageLineID,
+    },
+}
+
+impl FighterSurfaceState {
+    pub fn is_grounded(self) -> bool {
+        matches!(self, Self::Grounded { .. })
+    }
+
+    pub fn line_id(self) -> Option<StageLineID> {
+        match self {
+            Self::Airborne => None,
+            Self::Grounded { line_id } => Some(line_id),
+        }
+    }
+
+    pub(crate) fn land(&mut self, line_id: StageLineID) {
+        *self = Self::Grounded { line_id };
+    }
+
+    pub(crate) fn leave_ground(&mut self) {
+        *self = Self::Airborne;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn contact_lifecycle_has_one_source_of_truth() {
+        let mut surface = FighterSurfaceState::default();
+        assert!(!surface.is_grounded());
+        assert_eq!(surface.line_id(), None);
+
+        let line_id = StageLineID {
+            polygon: 2,
+            segment: 3,
+        };
+        surface.land(line_id);
+        assert!(surface.is_grounded());
+        assert_eq!(surface.line_id(), Some(line_id));
+
+        surface.leave_ground();
+        assert!(!surface.is_grounded());
+        assert_eq!(surface.line_id(), None);
+    }
+}

src/input/gamecube/poll.rs

@@ -1,6 +1,8 @@
 use std::panic::{self, AssertUnwindSafe};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
+use std::thread::JoinHandle;
+use std::time::{Duration, Instant};
 
 use bevy::prelude::*;
 use gc_adapter_neo::{Controller, GcAdapter};
@@ -55,10 +57,11 @@ impl GcPortState {
 /// Shared, `Send + Sync` handle to the latest snapshot from the poll
 /// thread. Safe to store as an ordinary [`Resource`] (no `NonSend` needed)
 /// because the `GcAdapter` itself never leaves its thread.
-#[derive(Resource, Clone)]
+#[derive(Resource)]
 pub struct GcAdapterSnapshot {
     ports: Arc<Mutex<[GcPortState; 4]>>,
     shutdown: Arc<AtomicBool>,
+    poll_thread: Option<JoinHandle<()>>,
 }
 
 impl GcAdapterSnapshot {
@@ -69,12 +72,36 @@ impl GcAdapterSnapshot {
 
 impl Drop for GcAdapterSnapshot {
     fn drop(&mut self) {
-        // Only actually signals shutdown once the last clone (this resource
+        self.shutdown.store(true, Ordering::Release);
-        // is never cloned in practice, but be defensive) is dropped.
+
-        if Arc::strong_count(&self.shutdown) <= 1 {
+        if let Some(poll_thread) = self.poll_thread.take() {
-            self.shutdown.store(true, Ordering::Relaxed);
+            if let Err(payload) = poll_thread.join() {
+                error!(
+                    "GameCube Controller Adapter poll thread panicked during shutdown: {payload:?}"
+                );
             }
         }
+    }
+}
+
+const INITIAL_ERROR_BACKOFF: Duration = Duration::from_millis(1);
+const MAX_ERROR_BACKOFF: Duration = Duration::from_millis(100);
+
+fn next_error_backoff(backoff: Duration) -> Duration {
+    backoff.saturating_mul(2).min(MAX_ERROR_BACKOFF)
+}
+
+/// Wait for a retry while still allowing the owner to shut the poll thread down promptly.
+fn wait_for_retry(shutdown: &AtomicBool, delay: Duration) -> bool {
+    let deadline = Instant::now() + delay;
+    while !shutdown.load(Ordering::Acquire) {
+        let remaining = deadline.saturating_duration_since(Instant::now());
+        if remaining.is_zero() {
+            return true;
+        }
+        std::thread::sleep(remaining.min(Duration::from_millis(10)));
+    }
+    false
 }
 
 /// Connects to the first GameCube adapter found on the USB bus and starts
@@ -94,7 +121,7 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
 
     let thread_ports = ports.clone();
     let thread_shutdown = shutdown.clone();
-    std::thread::Builder::new()
+    let poll_thread = std::thread::Builder::new()
         .name("gc-adapter-poll".into())
         .spawn(move || {
             // Flush whatever the adapter had buffered before we started
@@ -107,17 +134,27 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
             let mut rate_window_start = std::time::Instant::now();
             #[cfg(debug_assertions)]
             let mut rate_window_count: u32 = 0;
+            let mut error_backoff = INITIAL_ERROR_BACKOFF;
 
-            while !thread_shutdown.load(Ordering::Relaxed) {
+            while !thread_shutdown.load(Ordering::Acquire) {
                 let result = panic::catch_unwind(AssertUnwindSafe(|| adapter.read_controllers()));
 
                 let controllers = match result {
-                    Ok(Ok(controllers)) => controllers,
+                    Ok(Ok(controllers)) => {
+                        error_backoff = INITIAL_ERROR_BACKOFF;
+                        controllers
+                    }
                     // Ignore this, for some reason we get a bunch of these when we start reading
                     Ok(Err(
                         gc_adapter_neo::AdapterError::Parse(_)
                         | gc_adapter_neo::AdapterError::ShortRead(_),
-                    )) => continue,
+                    )) => {
+                        if !wait_for_retry(&thread_shutdown, error_backoff) {
+                            break;
+                        }
+                        error_backoff = next_error_backoff(error_backoff);
+                        continue;
+                    }
                     Ok(Err(gc_adapter_neo::AdapterError::Usb(err))) => {
                         error!(
                             "GameCube Controller Adapter USB read failed ({err:?}); stopping \
@@ -160,5 +197,32 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
         })
         .expect("failed to spawn gc-adapter poll thread");
 
-    Ok(GcAdapterSnapshot { ports, shutdown })
+    Ok(GcAdapterSnapshot {
+        ports,
+        shutdown,
+        poll_thread: Some(poll_thread),
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn error_backoff_is_capped() {
+        let mut backoff = INITIAL_ERROR_BACKOFF;
+        for _ in 0..16 {
+            backoff = next_error_backoff(backoff);
+        }
+
+        assert_eq!(backoff, MAX_ERROR_BACKOFF);
+        assert_eq!(next_error_backoff(MAX_ERROR_BACKOFF), MAX_ERROR_BACKOFF);
+    }
+
+    #[test]
+    fn retry_wait_stops_when_shutdown_is_requested() {
+        let shutdown = AtomicBool::new(true);
+
+        assert!(!wait_for_retry(&shutdown, Duration::from_secs(1)));
+    }
 }

src/menus/character_select/mod.rs

@@ -1,19 +1,8 @@
 use bevy::{picking::pointer::PointerId, prelude::*};
 
 use crate::{
-    AppState,
+    AppState, fighter::manifest::{FighterManifest, FighterManifestRegistry}, game_settings::CommonAssets, input::{LocalInputAssignments, LocalInputSource}, menus::{
-    fighter::manifest::{FighterManifest, FighterManifestRegistry},
+        MenuCameraMarker, MenuMarker, button::FGUiButton, character_select::{character_box::CharacterBox, token::CharacterSelectToken}, cursor::{FGMenuCursor, MenuCursorInputSource}, errors::MenuErrors::FighterManifestNotFound, match_config::{MenuMatchConfig, MenuMatchPlayerSlot}, scaling, spawn_menu, style::{FGUiButtonType, FGUiStyle},
-    game_settings::CommonAssets,
-    input::{LocalInputAssignments, LocalInputSource},
-    menus::{
-        MenuMarker,
-        button::FGUiButton,
-        character_select::{character_box::CharacterBox, token::CharacterSelectToken},
-        cursor::{FGMenuCursor, MenuCursorInputSource},
-        errors::MenuErrors::FighterManifestNotFound,
-        match_config::{MenuMatchConfig, MenuMatchPlayerSlot},
-        scaling, spawn_menu,
-        style::{FGUiButtonType, FGUiStyle},
     },
 };
 
@@ -241,7 +230,7 @@ pub fn copy_cursor_transform_to_token(
     character_boxes: Query<(&CharacterBox, &ComputedNode, &UiGlobalTransform)>,
     match_config: Res<MenuMatchConfig>,
     cursors: Query<&UiGlobalTransform, With<FGMenuCursor>>,
-    cam: Single<&Camera>,
+    cam: Single<&Camera, With<MenuCameraMarker>>,
     ui_scale: Res<UiScale>,
 ) -> Result {
     let camera = cam.into_inner();

src/menus/cursor.rs

@@ -9,11 +9,8 @@ use bevy::{
 };
 
 use crate::{
-    input::{LocalInputAssignments, LocalInputSource},
+    input::{LocalInputAssignments, LocalInputSource}, menus::{
-    menus::{
+        MenuCameraMarker, input::{MenuInput, MenuInputState}, scaling, style::FGUiStyle,
-        input::{MenuInput, MenuInputState},
-        scaling,
-        style::FGUiStyle,
     },
 };
 
@@ -181,7 +178,7 @@ pub fn cursor_input(
 }
 
 pub fn update_cursor_transform(
-    camera: Single<&Camera>,
+    camera: Single<&Camera, With<MenuCameraMarker>>,
     query: Query<(&mut Node, &PointerLocation), With<FGMenuCursor>>,
     ui_scale: Res<UiScale>,
 ) {

src/menus/mod.rs

@@ -53,6 +53,7 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
                 #MenuCamera
                 Camera
                 Camera2d
+                MenuCameraMarker
             ),
             (
                 #MenuContainer
@@ -73,7 +74,6 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
 
 pub fn despawn_menu(
     existing_menu: Option<Single<Entity, With<MenuMarker>>>,
-    existing_menu_camera: Option<Single<Entity, With<MenuCameraMarker>>>,
     mut commands: Commands,
 ) {
     if let Some(entity) = existing_menu {
@@ -82,9 +82,6 @@ pub fn despawn_menu(
             .despawn();
     }
 
-    if let Some(menu_cam) = existing_menu_camera {
-        commands.entity(*menu_cam).despawn();
-    }
 }
 
 pub fn spawn_menu(

src/stage/line.rs

@@ -26,7 +26,7 @@ pub enum StagePolyType {
     Platform,
 }
 
-#[derive(Reflect, Hash, Debug, Clone, Copy, Default)]
+#[derive(Reflect, Hash, Debug, Clone, Copy, Default, PartialEq, Eq)]
 pub struct StageLineID {
     pub polygon: usize,
     pub segment: usize,