Add authoritative fighter surface state
CI / production-build (pull_request) Canceled after 0s
CI / build-and-test (pull_request) Canceled after 9s

This commit is contained in:
2026-09-25 10:45:18 +00:00
committed by EIREXE
parent 3daf8f2e21
commit 0ddf019ed5
18 changed files with 411 additions and 301 deletions
+17 -10
View File
@@ -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) % game_settings.fighter_common.visual_shake_table.len();
let access_index = (hitstop_shake.remaining_frames as usize)
% 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 = game_settings.fighter_common.visual_shake_table[access_index] * shake_amount * shake_multiplier;
let shake_amount: f32 =
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),