Compare commits

..
Author SHA1 Message Date
EIREXE c849caf5b9 Try and fix CI
CI / build-and-test (pull_request) Successful in 24m33s
2026-09-14 21:34:35 +02:00
EIREXE 9f66d55dcc Add keyboard support and hold to step
CI / build-and-test (pull_request) Failing after 15m7s
2026-09-14 19:12:25 +02:00
EIREXE 578648d2ec Add debug frame stepping
CI / build-and-test (pull_request) Failing after 15m6s
2026-09-14 18:47:55 +02:00
EIREXE 0d96a8aed8 Make warnings an error
CI / build-and-test (push) Failing after 15m6s
2026-09-14 18:25:15 +02:00
EIREXE cebf1148c2 Persist Rust CI cache (#4)
CI / build-and-test (push) Successful in 11m1s
## Summary

- Pin the nightly Rust toolchain used by CI
- Cache Cargo dependencies and build artifacts between Gitea Actions runs
- Share the Linux nightly cache across branches

Reviewed-on: #4
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-14 16:16:48 +00:00
EIREXE 088d594e97 Merge pull request 'Make debug menu usable with mouse and keyboard' (#2) from debug-menu-input into master
CI / build-and-test (push) Successful in 11m29s
Reviewed-on: #2
2026-09-14 13:32:42 +00:00
EIREXE 868df95cd4 wording fixes
CI / build-and-test (pull_request) Successful in 11m31s
2026-09-14 15:20:07 +02:00
EIREXE 504f63be54 Add support for split .gltf and .bin files (#3)
CI / build-and-test (push) Canceled after 15s
Reviewed-on: #3
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-14 13:19:29 +00:00
4 changed files with 116 additions and 17 deletions
+9 -3
View File
@@ -10,7 +10,7 @@ on:
jobs:
build-and-test:
runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 30
steps:
- name: Check out source
uses: actions/checkout@v4
@@ -20,7 +20,13 @@ jobs:
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
sh -s -- -y --profile minimal
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
"$HOME/.cargo/bin/rustup" toolchain install nightly --profile minimal
"$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
- name: Cache Rust dependencies and build artifacts
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
with:
shared-key: linux-nightly
cache-bin: false
- name: Install Linux dependencies
run: |
@@ -39,7 +45,7 @@ jobs:
pkg-config
- name: Build
run: cargo build --locked -j 4
run: RUSTFLAGS="-D warnings" cargo build --locked -j 4
- name: Run unit tests
run: cargo test --locked --lib -j 4
+1 -1
View File
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly"
channel = "nightly-2026-09-14"
+96 -1
View File
@@ -3,11 +3,12 @@
use std::{collections::HashMap, time::Duration};
use bevy::{
input::InputSystems,
prelude::*,
settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
};
use bevy_egui::{EguiContexts, EguiPrimaryContextPass, egui};
use bevy_ggrs::RollbackFrameRate;
use bevy_ggrs::{RollbackFrameRate, RunGgrsSystems};
use enum_cycling::EnumCycle;
use enum_cycling_derive::EnumCycle;
@@ -114,6 +115,7 @@ enum DebugFlag {
Hurtboxes,
Camera,
DrawThroughGeometry,
FrameStepping,
}
#[derive(Clone, Copy)]
@@ -174,6 +176,10 @@ const WORLD_MENU: &[DebugMenuEntry] = &[
DebugMenuEntry::GameSpeed {
label: "Game speed",
},
DebugMenuEntry::Toggle {
label: "Frame stepping",
flag: DebugFlag::FrameStepping,
},
];
const DIAGNOSTICS_MENU: &[DebugMenuEntry] = &[DebugMenuEntry::Toggle {
@@ -233,6 +239,8 @@ pub struct DebugSettings {
selections: Vec<usize>,
#[reflect(ignore)]
pub player_rows: HashMap<usize, [FighterDebugRowKind; PLAYER_DEBUG_ROW_COUNT]>,
#[reflect(ignore)]
pub frame_stepping: bool,
pub network: bool,
pub ecb: bool,
pub stage_collision: bool,
@@ -253,6 +261,7 @@ impl Default for DebugSettings {
pages: vec![DebugMenuPage::Static(ROOT_MENU)],
selections: vec![0],
player_rows: HashMap::new(),
frame_stepping: false,
network: false,
ecb: false,
stage_collision: false,
@@ -325,6 +334,7 @@ impl DebugSettings {
DebugFlag::Hurtboxes => self.hurtboxes,
DebugFlag::DrawThroughGeometry => self.draw_through_geometry,
DebugFlag::Camera => self.camera,
DebugFlag::FrameStepping => self.frame_stepping,
}
}
@@ -340,6 +350,7 @@ impl DebugSettings {
self.draw_through_geometry = !self.draw_through_geometry
}
DebugFlag::Camera => self.camera = !self.camera,
DebugFlag::FrameStepping => self.frame_stepping = !self.frame_stepping,
}
}
@@ -356,9 +367,25 @@ impl DebugSettings {
pub struct DebugToolsPlugin;
#[derive(Resource, Default)]
struct FrameStepState {
requested: bool,
time_backup: Option<Time>,
last_step_time: Time
}
impl Plugin for DebugToolsPlugin {
fn build(&self, app: &mut App) {
app.init_resource::<DebugSettings>()
.init_resource::<FrameStepState>()
.add_systems(
PreUpdate,
prepare_frame_step
.after(InputSystems)
.before(RunGgrsSystems)
.run_if(in_state(AppState::InMatch)),
)
.add_systems(PreUpdate, restore_frame_step_time.after(RunGgrsSystems))
.add_systems(
Update,
(handle_palette_input, sync_gizmo_depth_bias)
@@ -391,6 +418,61 @@ fn queue_settings_save(commands: &mut Commands) {
commands.queue(SaveSettingsDeferred(Duration::from_secs_f32(0.1)));
}
fn frame_step_duration(frame_rate: usize) -> Duration {
Duration::from_nanos(1_000_000_000u64 / frame_rate as u64)
}
fn prepare_frame_step(
settings: Res<DebugSettings>,
gamepads: Query<&Gamepad>,
key: Res<ButtonInput<KeyCode>>,
mut state: ResMut<FrameStepState>,
mut time: ResMut<Time>,
frame_rate: Res<RollbackFrameRate>,
) {
if !settings.frame_stepping {
state.requested = false;
return;
}
let pressed = gamepads
.iter()
.any(|gamepad| gamepad.pressed(GamepadButton::DPadDown));
let just_pressed = gamepads
.iter()
.any(|gamepad| gamepad.just_pressed(GamepadButton::DPadDown));
let just_pressed = key.just_pressed(KeyCode::F4) || just_pressed;
let pressed = key.pressed(KeyCode::F4) || pressed;
if just_pressed {
state.last_step_time = time.clone();
}
let can_repress = pressed && (time.elapsed() - state.last_step_time.elapsed()).as_millis() > 500;
if !settings.menu_open && (just_pressed || can_repress)
{
state.requested = true;
}
state.time_backup = Some(*time);
let delta = if state.requested {
frame_step_duration(**frame_rate)
} else {
Duration::ZERO
};
time.advance_by(delta);
}
fn restore_frame_step_time(mut state: ResMut<FrameStepState>, mut time: ResMut<Time>) {
if let Some(backup) = state.time_backup.take() {
*time = backup;
state.requested = false;
}
}
fn activate_selected(
settings: &mut DebugSettings,
page_len: usize,
@@ -408,8 +490,10 @@ fn activate_selected(
}
DebugMenuEntry::Toggle { flag, .. } => {
settings.toggle_flag(flag);
if !matches!(flag, DebugFlag::FrameStepping) {
queue_settings_save(commands);
}
}
DebugMenuEntry::Submenu { entries, .. } => {
settings.push_page(DebugMenuPage::Static(entries));
}
@@ -623,9 +707,11 @@ fn draw_palette(
let mut value = settings.flag(*flag);
if ui.checkbox(&mut value, *label).changed() {
settings.toggle_flag(*flag);
if !matches!(flag, DebugFlag::FrameStepping) {
queue_settings_save(&mut commands);
}
}
}
DebugMenuEntry::Submenu { label, .. }
| DebugMenuEntry::PlayerSlots { label } => {
if ui.button(format!("{label} >")).clicked() {
@@ -839,6 +925,15 @@ mod tests {
assert_eq!(GameSpeedDebug::Quarter.frame_rate(), 15);
}
#[test]
fn frame_stepping_is_disabled_by_default_and_uses_game_speed_timestep() {
let settings = DebugSettings::default();
assert!(!settings.frame_stepping);
assert_eq!(frame_step_duration(60), Duration::from_nanos(16_666_666));
assert_eq!(frame_step_duration(30), Duration::from_nanos(33_333_333));
}
#[test]
fn empty_player_list_does_not_activate() {
let mut settings = DebugSettings::default();
+8 -10
View File
@@ -3,6 +3,7 @@
use std::{
collections::{HashMap, HashSet},
io,
path::Path,
};
use bevy::{
@@ -547,12 +548,8 @@ impl AssetLoader for FighterBakeSourceLoader {
let manifest: FighterManifest = ron::de::from_bytes(&manifest_bytes)
.map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
let model_path = load_context
.path()
.resolve_embed_str(&manifest.model_path)
.map_err(|error| io::Error::other(error.to_string()))?;
let model_bytes = load_context
.read_asset_bytes(model_path.clone_owned())
.read_asset_bytes(&manifest.model_path)
.await
.map_err(|error| io::Error::other(error.to_string()))?;
@@ -562,11 +559,12 @@ impl AssetLoader for FighterBakeSourceLoader {
for buffer in gltf.buffers() {
let bytes = match buffer.source() {
gltf::buffer::Source::Uri(uri) => load_context
.read_asset_bytes(
model_path
.resolve_embed_str(uri)
.map_err(|error| io::Error::other(error.to_string()))?,
)
.read_asset_bytes(AssetPath::from_path_buf(
Path::new(&manifest.model_path)
.parent()
.unwrap_or_else(|| Path::new(""))
.join(uri),
))
.await
.map_err(|error| io::Error::other(error.to_string()))?,
gltf::buffer::Source::Bin => gltf.blob.clone().ok_or_else(|| {