This commit is contained in:
2026-08-29 17:49:38 +02:00
parent 07834dcb08
commit 077d168655
17 changed files with 16 additions and 37 deletions
+1 -3
View File
@@ -7,15 +7,13 @@ use bevy_egui::{EguiContexts, egui};
use crate::fighter::animation::FighterAnimationFrame;
use crate::fighter::baked_animation::BakedFighterAnimations;
use crate::fighter::ecb::FighterPreviousECB;
use crate::fighter::manifest::{FighterManifest, FighterManifestRegistry};
use crate::fighter::state::StateNameDebug;
use crate::fighter::visual::FighterAnimations;
use crate::fighter::{
Fighter, FighterECB, FighterFacingDirection, FighterPreviousTranslation, FighterTranslation,
FighterECB, FighterPreviousTranslation, FighterTranslation,
FighterVelocity,
};
use crate::input::FighterInput;
use crate::match_loading::MatchPlayer;
pub fn debug_draw_ecb(
ecbs: Query<(
+1 -1
View File
@@ -171,7 +171,7 @@ pub fn spawn_fighter(
player_handle: usize,
spawn_position: FGVec2,
manifest: (Handle<FighterManifest>, &FighterManifest),
attributes: FighterAttributes,
_attributes: FighterAttributes,
animations: FighterAnimations,
visual_root: WorldAssetRoot,
) {
+2 -6
View File
@@ -1,18 +1,14 @@
use std::time::Duration;
use bevy::prelude::*;
use crate::{
fighter::{
animation::AnimKind,
collision,
state::{
FighterState, FighterStateContext, FighterStateImpl, air, dash,
FighterState, FighterStateContext, FighterStateImpl, air,
fall::FallState,
ground::{self, GroundedMotionResult, GroundedStateCommon},
ground::GroundedStateCommon,
land::LandingState,
wait::WaitState,
walk,
},
},
input,
-1
View File
@@ -1,5 +1,4 @@
use std::hash::{Hash, Hasher};
use std::time::Duration;
use bevy::prelude::*;
-1
View File
@@ -1,4 +1,3 @@
use std::time::Duration;
use bevy::prelude::*;
-2
View File
@@ -1,4 +1,3 @@
use std::time::Duration;
use bevy::prelude::*;
@@ -11,7 +10,6 @@ use crate::fighter::{
self, GroundedMotionResult, GroundedStateCommon,
grounded_movement_standstill_common_interrupts,
},
wait::WaitState,
walk,
},
};
+1 -1
View File
@@ -11,7 +11,7 @@ use crate::fighter::ecb::FighterPreviousECB;
use crate::fighter::manifest::FighterManifest;
use crate::fighter::visual::FighterAnimations;
use crate::fighter::{
Fighter, FighterAttributes, FighterECB, FighterFacingDirection, FighterPreviousTranslation,
Fighter, FighterECB, FighterFacingDirection, FighterPreviousTranslation,
FighterTranslation, FighterVelocity,
};
use crate::game_settings::GameSettings;
-1
View File
@@ -1,4 +1,3 @@
use std::time::Duration;
use bevy::prelude::*;
+1 -3
View File
@@ -1,10 +1,8 @@
use super::{FighterStateContext, FighterStateImpl};
use crate::fighter::animation::AnimKind;
use crate::fighter::collision;
use crate::fighter::state::fall::FallState;
use crate::fighter::state::ground::{self, GroundedMotionResult, GroundedStateCommon};
use crate::fighter::state::land::LandingState;
use crate::fighter::state::{air, dash, jump, wait, walk, FighterState};
use crate::fighter::state::{dash, jump, wait, walk, FighterState};
#[derive(Debug, Clone, Hash)]
pub struct TurnState {
+3 -5
View File
@@ -1,14 +1,12 @@
use std::time::Duration;
use bevy::prelude::*;
use super::{FighterStateContext, FighterStateImpl, ground, walk};
use super::{FighterStateContext, FighterStateImpl, ground};
use crate::fighter::animation::AnimKind;
use crate::fighter::state::fall::FallState;
use crate::fighter::state::ground::{
GroundedMotionResult, GroundedStateCommon, grounded_movement_common_interrupts,
GroundedMotionResult, GroundedStateCommon,
};
use crate::fighter::state::{FighterState, dash, turn};
use crate::fighter::state::FighterState;
#[derive(Debug, Clone, Hash)]
pub struct WaitState {
-1
View File
@@ -1,4 +1,3 @@
use std::time::Duration;
use bevy::prelude::*;