From d9222409ce81770d8b9d110a7b5403f06d535879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Rom=C3=A0n?= Date: Wed, 26 Aug 2026 21:35:43 +0200 Subject: [PATCH] Fix formatting and shit --- src/fighter/animation.rs | 2 +- src/fighter/collision.rs | 7 ++----- src/fighter/debug.rs | 4 ++-- src/fighter/mod.rs | 2 +- src/fighter/motion.rs | 4 ++-- src/fighter/state/air.rs | 1 - src/fighter/state/dash.rs | 10 ++-------- src/fighter/state/fall.rs | 10 +++------- src/fighter/state/ground.rs | 7 +++---- src/fighter/state/jump.rs | 4 ++-- src/fighter/state/land.rs | 10 +++------- src/fighter/state/run.rs | 3 --- src/fighter/state/wait.rs | 3 --- src/fighter/state/walk.rs | 5 +---- src/input/frame.rs | 3 +-- src/math/int.rs | 2 -- src/math/segment.rs | 1 - src/stage/debug.rs | 2 +- src/stage/line.rs | 3 +-- src/stage/scene.rs | 2 +- 20 files changed, 26 insertions(+), 59 deletions(-) diff --git a/src/fighter/animation.rs b/src/fighter/animation.rs index e384790..c555643 100644 --- a/src/fighter/animation.rs +++ b/src/fighter/animation.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use bevy::{mesh::skinning::SkinnedMesh, prelude::*}; +use bevy::prelude::*; use crate::{ fighter::{FighterECB, FighterFacingDirection, FighterTranslation, FighterVisual, visual::FighterAnimations}, player::Player, diff --git a/src/fighter/collision.rs b/src/fighter/collision.rs index 6e62c69..53aeabf 100644 --- a/src/fighter/collision.rs +++ b/src/fighter/collision.rs @@ -1,14 +1,11 @@ //! Resolving an integrated fighter position against the stage. -use bevy::{color::palettes::css::HOT_PINK, prelude::*}; +use bevy::prelude::*; -use crate::fighter::ecb::FighterPreviousECB; use crate::fighter::state::FighterStateContext; -use crate::fighter::{FighterECB, FighterPreviousTranslation, FighterTranslation, FighterVelocity}; use crate::math::segment::FGSegment2d; use crate::math::vec::FGVec2; -use crate::stage::StagePoly; -use crate::stage::line::{StageCollision, StageLineID}; +use crate::stage::line::StageLineID; /* pub fn collide_fighter_with_scene( fighters: Query<(&FighterECB, &mut FighterVelocity, &mut FighterTranslation)>, diff --git a/src/fighter/debug.rs b/src/fighter/debug.rs index 5f778b5..5c1c520 100644 --- a/src/fighter/debug.rs +++ b/src/fighter/debug.rs @@ -49,8 +49,8 @@ pub fn fighter_debug( pub fn update_config( mut config_store: ResMut, keyboard: Res>, - real_time: Res>, - mut virtual_time: ResMut>, + _real_time: Res>, + _virtual_time: ResMut>, ) { if keyboard.just_pressed(KeyCode::KeyT) { for (_, config, _) in config_store.iter_mut() { diff --git a/src/fighter/mod.rs b/src/fighter/mod.rs index 7d14f11..87244a0 100644 --- a/src/fighter/mod.rs +++ b/src/fighter/mod.rs @@ -1,7 +1,7 @@ //! Everything fighter-shaped: the components that describe a fighter, the //! state machine that drives it, and the plugin that schedules it all. -use bevy::{ecs::name::HashedStr, prelude::*}; +use bevy::prelude::*; use bevy_egui::EguiPrimaryContextPass; use bevy_ggrs::prelude::*; diff --git a/src/fighter/motion.rs b/src/fighter/motion.rs index 962ed5b..b6d9876 100644 --- a/src/fighter/motion.rs +++ b/src/fighter/motion.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; -use crate::{fighter::FighterAttributes, math::vec::FGVec2}; +use crate::math::vec::FGVec2; #[derive(Component, Clone, Copy)] pub struct Grounded; @@ -27,7 +27,7 @@ pub fn apply_air_motion( )>, _time: Res>, ) { - for (velocity, mut translation, mut prev_translation, mut transform) in fighters { + for (velocity, mut translation, mut prev_translation, _transform) in fighters { prev_translation.0 = translation.0; translation.0 += velocity.0; } diff --git a/src/fighter/state/air.rs b/src/fighter/state/air.rs index 958277a..ca8682c 100644 --- a/src/fighter/state/air.rs +++ b/src/fighter/state/air.rs @@ -1,4 +1,3 @@ -use bevy::prelude::*; use fixed::traits::Fixed; use crate::fighter::*; diff --git a/src/fighter/state/dash.rs b/src/fighter/state/dash.rs index 3b305dc..a6b709e 100644 --- a/src/fighter/state/dash.rs +++ b/src/fighter/state/dash.rs @@ -8,14 +8,8 @@ use crate::fighter::animation::AnimKind; use crate::fighter::state::FighterState; use crate::fighter::state::fall::FallState; use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon}; -use crate::fighter::state::wait::WaitState; -use crate::fighter::{FighterAttributes, FighterFacingDirection, FighterVelocity, collision}; -use crate::game_settings::GameSettings; -use crate::input::{ - FighterCommands::{SmashMoveLeft, SmashMoveRight}, - FighterInput, -}; -use crate::math::int::FGi32; +use crate::fighter::FighterFacingDirection; +use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight}; #[derive(Debug, Clone)] pub struct DashState { diff --git a/src/fighter/state/fall.rs b/src/fighter/state/fall.rs index 4aa3a39..b23eeb1 100644 --- a/src/fighter/state/fall.rs +++ b/src/fighter/state/fall.rs @@ -1,20 +1,16 @@ -use bevy::prelude::*; -use super::{FighterStateContext, FighterStateImpl, ground, walk}; +use super::{FighterStateContext, FighterStateImpl}; use crate::fighter::state::ground::GroundedStateCommon; use crate::fighter::state::land::LandingState; -use crate::fighter::state::wait::WaitState; use crate::fighter::state::{FighterState, air}; -use crate::fighter::{FighterAttributes, FighterVelocity, collision, motion}; -use crate::game_settings::GameSettings; -use crate::stage::line::StageCollision; +use crate::fighter::collision; #[derive(Debug, Clone, Copy, Hash)] pub struct FallState; impl FighterStateImpl for FallState { const NAME: &'static str = "Fall"; - fn check_interrupt(&self, state_context: &FighterStateContext) -> Option { + fn check_interrupt(&self, _state_context: &FighterStateContext) -> Option { None } diff --git a/src/fighter/state/ground.rs b/src/fighter/state/ground.rs index e292d5c..083f37c 100644 --- a/src/fighter/state/ground.rs +++ b/src/fighter/state/ground.rs @@ -4,14 +4,13 @@ use crate::fighter::state::{FighterState, FighterStateContext}; use crate::fighter::{ - FighterAttributes, FighterECB, FighterPreviousTranslation, FighterTranslation, FighterVelocity, + FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity, }; use crate::game_settings::GameSettings; use crate::math::int::FGi32; use crate::math::vec::FGVec2; -use crate::stage::StagePoly; use crate::stage::line::{ - StageCollision, StageLineID, StagePolyLineSegment, StagePolyLineSegmentType, + StageLineID, StagePolyLineSegmentType, }; use bevy::prelude::*; @@ -89,7 +88,7 @@ pub fn apply_grounded_motion( pub fn collide_with_stage_grounded( state_context: &mut FighterStateContext, ground_common: &mut GroundedStateCommon, - can_walk_off: bool, + _can_walk_off: bool, ) -> GroundedMotionResult { let translation = &mut state_context.translation; let ecb = &state_context.ecb; diff --git a/src/fighter/state/jump.rs b/src/fighter/state/jump.rs index 9db6b94..791c684 100644 --- a/src/fighter/state/jump.rs +++ b/src/fighter/state/jump.rs @@ -5,7 +5,7 @@ use bevy::prelude::*; use crate::{ fighter::{ animation::AnimKind, collision, state::{ - FighterState, FighterStateContext, FighterStateImpl, air, fall::FallState, ground::{self, GroundedMotionResult, GroundedStateCommon}, land::LandingState, wait::WaitState, + FighterState, FighterStateContext, FighterStateImpl, air, fall::FallState, ground::{self, GroundedMotionResult, GroundedStateCommon}, land::LandingState, }, }, input::FighterCommands, }; @@ -98,7 +98,7 @@ impl FighterStateImpl for JumpSquatState { impl FighterStateImpl for JumpState { const NAME: &'static str = "Jump"; - fn check_interrupt(&self, state_context: &FighterStateContext) -> Option { + fn check_interrupt(&self, _state_context: &FighterStateContext) -> Option { None } diff --git a/src/fighter/state/land.rs b/src/fighter/state/land.rs index 816c0b9..43d25f1 100644 --- a/src/fighter/state/land.rs +++ b/src/fighter/state/land.rs @@ -2,20 +2,16 @@ use std::time::Duration; use bevy::prelude::*; -use crate::{ - fighter::{ +use crate::fighter::{ animation::AnimKind, - collision, state::{ - FighterState, FighterStateContext, FighterStateImpl, air, dash, + FighterState, FighterStateContext, FighterStateImpl, dash, fall::FallState, ground::{self, GroundedMotionResult, GroundedStateCommon}, wait::WaitState, walk, }, - }, - input::FighterCommands, -}; + }; #[derive(Debug, Clone, Hash)] pub struct LandingState { diff --git a/src/fighter/state/run.rs b/src/fighter/state/run.rs index 178ea25..82b1434 100644 --- a/src/fighter/state/run.rs +++ b/src/fighter/state/run.rs @@ -7,9 +7,6 @@ use crate::fighter::animation::AnimKind; use crate::fighter::state::FighterState; use crate::fighter::state::fall::FallState; use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon}; -use crate::fighter::{FighterAttributes, FighterVelocity}; -use crate::game_settings::GameSettings; -use crate::input::FighterInput; use crate::math::int::FGi32; #[derive(Component, Debug, Clone, Hash)] diff --git a/src/fighter/state/wait.rs b/src/fighter/state/wait.rs index 7f72f23..d1b61db 100644 --- a/src/fighter/state/wait.rs +++ b/src/fighter/state/wait.rs @@ -9,9 +9,6 @@ use crate::fighter::state::ground::{ GroundedMotionResult, GroundedStateCommon, grounded_movement_common_interrupts, }; use crate::fighter::state::{FighterState, dash}; -use crate::fighter::{FighterAttributes, FighterVelocity}; -use crate::game_settings::GameSettings; -use crate::stage::line::StageLineID; #[derive(Debug, Clone, Hash)] pub struct WaitState { diff --git a/src/fighter/state/walk.rs b/src/fighter/state/walk.rs index 8d0f592..f61334b 100644 --- a/src/fighter/state/walk.rs +++ b/src/fighter/state/walk.rs @@ -6,10 +6,7 @@ use super::{FighterStateContext, FighterStateImpl, dash, ground, wait}; use crate::fighter::animation::AnimKind; use crate::fighter::state::fall::FallState; use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon}; -use crate::fighter::state::{self, FighterState}; -use crate::fighter::{FighterAttributes, FighterVelocity}; -use crate::game_settings::GameSettings; -use crate::input::FighterInput; +use crate::fighter::state::FighterState; #[derive(Debug, Clone, Hash)] pub struct WalkState { diff --git a/src/input/frame.rs b/src/input/frame.rs index 825397a..4493dbb 100644 --- a/src/input/frame.rs +++ b/src/input/frame.rs @@ -1,7 +1,6 @@ -use bevy::prelude::*; use serde::{Deserialize, Serialize}; -use crate::{input::InputActionState, math::vec::FGVec2}; +use crate::math::vec::FGVec2; /// One frame of a player's raw input. This is the type GGRS serializes and /// sends over the wire, so keep it small and keep it `PartialEq`. diff --git a/src/math/int.rs b/src/math/int.rs index 23c6b73..a54ebb7 100644 --- a/src/math/int.rs +++ b/src/math/int.rs @@ -1,6 +1,4 @@ -use bevy::math::{Vec2, primitives::Segment2d}; -use fixed::prelude::*; pub type FGi32 = fixed::FixedI32; pub type FGWide = fixed::FixedI128; diff --git a/src/math/segment.rs b/src/math/segment.rs index bd9d643..67d0269 100644 --- a/src/math/segment.rs +++ b/src/math/segment.rs @@ -1,4 +1,3 @@ -use bevy::math::{Vec2, primitives::Segment2d}; use bevy::prelude::*; use fixed::prelude::*; diff --git a/src/stage/debug.rs b/src/stage/debug.rs index 074e6c8..3bb8737 100644 --- a/src/stage/debug.rs +++ b/src/stage/debug.rs @@ -1,6 +1,6 @@ use bevy::{color::palettes::css::RED, prelude::*}; -use crate::stage::{StagePoly, line::StageCollision}; +use crate::stage::line::StageCollision; pub fn debug_draw_scene(mut gizmos: Gizmos, stage_collision: Res) { for poly in stage_collision.stage_polys.iter() { diff --git a/src/stage/line.rs b/src/stage/line.rs index 737b345..bd00be5 100644 --- a/src/stage/line.rs +++ b/src/stage/line.rs @@ -1,8 +1,7 @@ //! Stage collision geometry. -use std::default; -use bevy::{math::InvalidDirectionError, prelude::*}; +use bevy::prelude::*; use crate::math::{segment::FGSegment2d, vec::FGVec2}; diff --git a/src/stage/scene.rs b/src/stage/scene.rs index 0599d49..1a67409 100644 --- a/src/stage/scene.rs +++ b/src/stage/scene.rs @@ -2,7 +2,7 @@ use std::f32::consts::PI; -use bevy::{camera_controller::free_camera::FreeCamera, prelude::*}; +use bevy::prelude::*; use crate::{ math::vec::FGVec2,