EIREXE/shinespark
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Spread state context architecture (Fixes #18) (#30)
CI / build-and-test (push) Canceled after 0s
Details

Browse Source 
Reviewed-on: #30
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
This commit was merged in pull request #30.
This commit is contained in:
EIREXE
2026-09-15 17:59:03 +00:00
committed by EIREXE
parent 43a04e9491
commit b8b65e60e9
15 changed files with 384 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fighter/state/air_dodge.rs
+10 -10
View File
@@ -1,9 +1,9 @@
use crate::{
fighter::{
animation::AnimKind,
collision,
state::{
FighterState, FighterStateContext, FighterStateImpl, air,
CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
UpdateContext, air,
fall::FallState,
ground::GroundedStateCommon,
land::{LandingState, LandingType},
@@ -21,7 +21,7 @@ pub struct AirDodgeState {
impl FighterStateImpl for AirDodgeState {
const NAME: &'static str = "AirDodge";
fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
if state_context.is_current_animation_finished() {
Some(FighterState::Fall(FallState))
} else {
@@ -29,8 +29,8 @@ impl FighterStateImpl for AirDodgeState {
}
}
fn update(&mut self, state_context: &mut FighterStateContext) {
state_context.velocity.0 *= state_context.fighter_manifest.attributes.air_dodge_decay;
fn update(&mut self, state_context: &mut UpdateContext) {
state_context.velocity.0 *= state_context.fighter_attributes.air_dodge_decay;
air::apply_air_motion(
state_context.velocity,
@@ -41,9 +41,9 @@ impl FighterStateImpl for AirDodgeState {
fn check_collision_interrupt(
&mut self,
state_context: &mut FighterStateContext,
state_context: &mut CollisionContext,
) -> Option<FighterState> {
if let Some(res) = collision::air_collide_with_stage(state_context) {
if let Some(res) = state_context.air_collide_with_stage() {
// Adjust translation
state_context.translation.0 = res.hit_position - state_context.ecb.get_bottom_point();
let grounded_common = GroundedStateCommon {
@@ -58,15 +58,15 @@ impl FighterStateImpl for AirDodgeState {
}
}
fn on_enter(&mut self, state_context: &mut FighterStateContext) {
fn on_enter(&mut self, state_context: &mut EnterContext) {
state_context.play_animation(AnimKind::AirDodge, false);
state_context.velocity.0 =
self.direction * state_context.fighter_manifest.attributes.air_dodge_velocity;
self.direction * state_context.fighter_attributes.air_dodge_velocity;
}
}
pub fn check_input(state_context: &FighterStateContext) -> Option<FighterState> {
pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
state_context
.input
.has_command(input::FighterCommands::Shield)