Expose LLVM tools to Windows build

Use Clang 19 for Windows cross-builds
Fix blake build
2026-09-19 23:14:03 +02:00 · 2026-09-19 22:53:19 +02:00 · 2026-09-19 22:28:04 +02:00 · 2026-09-19 22:15:16 +02:00 · 2026-09-19 22:12:35 +02:00 · 2026-09-19 22:01:52 +02:00
34 changed files with 81835 additions and 1314 deletions
@@ -42,7 +42,6 @@ jobs:
            libxkbcommon-dev \
            libxkbcommon-x11-0 \
            mesa-vulkan-drivers \
            blender \
            mold \
            pkg-config
@@ -94,7 +93,6 @@ jobs:
            llvm-19 \
            mesa-vulkan-drivers \
            mold \
            blender \
            pkg-config
          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 100
          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 100
@@ -10,7 +10,3 @@ imported_assets
 *_old.glb
 /replay.json
 *.replay.tmp
 # Python debugger formatter tests
 __pycache__/
 *.pyc
@@ -12,7 +12,7 @@ development = ["bevy/dynamic_linking", "bevy/file_watcher"]
 debug_features = ["bevy/free_camera"]
 [dependencies]
-bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "compressed_image_saver", "bevy_settings"] }
+bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "bevy_settings"] }
 # Loads the scenes you author in the editor (assets/*.bsn) and builds
 # physics colliders from them. An ordinary dependency; remove it if you
 # stop using authored scenes.
@@ -2,15 +2,6 @@
 Fancy heavily advanced platform fighting game
 ## Debugging fixed-point values with lldb
 If using CodeLLDB:
 ```json
 "preRunCommands": [
    "command script import ${workspaceFolder}/tools/lldb_fixed.py"
 ]
 ```
 ## Direct P2P Debugging
 ```text
@@ -25,9 +16,18 @@ cargo run -- --debug-match --players 2 --local-port 7001 \
 ## Production Build
 Production builds use the `production` Cargo profile and do not dynamically
 link Bevy or Rust. Development builds retain Bevy dynamic linking for faster
 iteration. Cargo stores the production profile under `target/production`,
 separate from development artifacts under `target/debug`.
 ```sh
 cargo run --locked \
  --bin process-assets --no-default-features --features debug_features
 cargo build --locked \
  --profile production --no-default-features --features debug_features
 ```
 The asset preprocessing command must be run from the repository root. It
 populates `imported_assets/Default`, which is then consumed by the production
 game without running the asset processor at startup.
@@ -1,6 +1,6 @@
 (
    id: TestFighter,
-    model_path: "fighters/test/test.blend",
+    model_path: "fighters/test/test_fighter.gltf",
    model_scale: "10.0",
    baked_animation_path: "fighters/test/test.fighterbake",
    icon: (
@@ -1,6 +1,6 @@
 (
    id: TestStage,
-    model_path: "stages/battlefield/bf2.blend#Scene0",
+    model_path: "stages/battlefield/battlefield.glb#Scene0",
    icon: (
        path: "stages/battlefield/icon.png"
    ),
@@ -1,376 +0,0 @@
 //! Blender `.blend` source processing.
 //!
 //! Blender is used as an offline importer. The processed result is a normal
 //! GLB, so the runtime continues to use Bevy's built-in glTF loader.
 use bevy::{
    asset::{
        AssetLoader, AssetPath, AsyncWriteExt, LoadContext,
        io::{Reader, Writer},
        processor::LoadTransformAndSave,
        saver::{AssetSaver, SavedAsset},
        transformer::{AssetTransformer, TransformedAsset},
    },
    gltf::GltfLoader,
    prelude::*,
    reflect::TypePath,
 };
 use serde::Deserialize;
 use std::{
    collections::HashMap,
    fs, io,
    path::{Path, PathBuf},
    process::Command,
    time::{SystemTime, UNIX_EPOCH},
 };
 use crate::fighter::animation::AnimKind;
 const EXPORT_SCRIPT: &str = include_str!("blend_asset/export.py");
 #[derive(Asset, TypePath)]
 struct BlendSource {
    glb: Vec<u8>,
 }
 #[derive(Default, TypePath)]
 struct BlendSourceLoader;
 #[derive(Debug, Deserialize)]
 struct ExportManifest {
    dependencies: Vec<String>,
 }
 #[derive(Debug, Deserialize)]
 struct AnimationManifest {
    animations: HashMap<AnimKind, String>,
 }
 impl AssetLoader for BlendSourceLoader {
    type Asset = BlendSource;
    type Settings = ();
    type Error = io::Error;
    async fn load(
        &self,
        reader: &mut dyn Reader,
        _: &Self::Settings,
        load_context: &mut LoadContext<'_>,
    ) -> Result<Self::Asset, Self::Error> {
        let mut source_bytes = Vec::new();
        reader.read_to_end(&mut source_bytes).await?;
        let temp = TempDir::new()?;
        let source_path = locate_source(load_context.path().path());
        let blend_path = if let Some(path) = source_path.as_deref() {
            path.to_path_buf()
        } else {
            let path = temp.path().join("source.blend");
            fs::write(&path, source_bytes)?;
            path
        };
        let output = temp.path().join("export.gltf");
        let script = temp.path().join("export.py");
        let actions = referenced_actions(load_context, &asset_root()).await?;
        let actions_path = temp.path().join("actions.json");
        fs::write(
            &actions_path,
            serde_json::to_vec(&actions).map_err(io::Error::other)?,
        )?;
        fs::write(&script, EXPORT_SCRIPT)?;
        let result = Command::new(std::env::var_os("BLENDER").unwrap_or_else(|| "blender".into()))
            .arg("--background")
            .arg(&blend_path)
            .arg("--python")
            .arg(&script)
        .arg("--")
        .arg(&output)
        .arg(&actions_path)
        .output()
            .map_err(|error| io::Error::other(format!("failed to start Blender: {error}")))?;
        if !result.status.success() {
            return Err(io::Error::other(format!(
                "Blender export failed with {}:\n{}\n{}",
                result.status,
                String::from_utf8_lossy(&result.stdout),
                String::from_utf8_lossy(&result.stderr)
            )));
        }
        let manifest: ExportManifest =
            serde_json::from_slice(&fs::read(temp.path().join("export-manifest.json"))?)
                .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
        let asset_root = asset_root();
        let mut dependencies = manifest.dependencies;
        let document: serde_json::Value = serde_json::from_slice(&fs::read(&output)?)
            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
        if let Some(images) = document.get("images").and_then(serde_json::Value::as_array) {
            for image in images {
                if let Some(uri) = image.get("uri").and_then(serde_json::Value::as_str) {
                    let path = temp.path().join(uri);
                    dependencies.push(path.to_string_lossy().into_owned());
                }
            }
        }
        let mut seen = std::collections::HashSet::new();
        for dependency in dependencies {
            let physical = PathBuf::from(&dependency);
            let Some(asset_path) = physical_to_asset_path(&physical, &asset_root) else {
                continue;
            };
            if seen.insert(asset_path.clone()) {
                // This read is intentionally discarded: it registers the file and
                // its processed hash as a processor dependency.
                load_context
                    .read_asset_bytes(asset_path)
                    .await
                    .map_err(|error| {
                        io::Error::other(format!("failed to read blend dependency: {error}"))
                    })?;
            }
        }
        let glb = make_glb(&output, &temp, load_context.path().path(), &asset_root)?;
        Ok(BlendSource { glb })
    }
    fn extensions(&self) -> &[&str] {
        &["blend"]
    }
 }
 async fn referenced_actions(
    load_context: &mut LoadContext<'_>,
    root: &Path,
 ) -> io::Result<Vec<String>> {
    let model_path = load_context.path().path();
    let Some(stem) = model_path.file_stem().and_then(|stem| stem.to_str()) else {
        return Ok(Vec::new());
    };
    let manifest_path = model_path
        .parent()
        .unwrap_or_else(|| Path::new(""))
        .join(format!("{stem}.fighter.ron"));
    if !root.join(&manifest_path).is_file() {
        return Ok(Vec::new());
    }
    let bytes = load_context
        .read_asset_bytes(manifest_path)
        .await
        .map_err(|error| io::Error::other(error.to_string()))?;
    let manifest: AnimationManifest = ron::de::from_bytes(&bytes)
        .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
    Ok(manifest.animations.into_values().collect())
 }
 #[derive(Asset, TypePath)]
 struct ProcessedBlend {
    bytes: Vec<u8>,
 }
 #[derive(Default, TypePath)]
 struct BlendTransformer;
 impl AssetTransformer for BlendTransformer {
    type AssetInput = BlendSource;
    type AssetOutput = ProcessedBlend;
    type Settings = ();
    type Error = io::Error;
    async fn transform<'a>(
        &'a self,
        source: TransformedAsset<Self::AssetInput>,
        _: &'a Self::Settings,
    ) -> Result<TransformedAsset<Self::AssetOutput>, Self::Error> {
        let bytes = source.glb.clone();
        Ok(source.replace_asset(ProcessedBlend { bytes }))
    }
 }
 #[derive(Default, TypePath)]
 struct BlendSaver;
 impl AssetSaver for BlendSaver {
    type Asset = ProcessedBlend;
    type Settings = ();
    type OutputLoader = GltfLoader;
    type Error = io::Error;
    async fn save(
        &self,
        writer: &mut Writer,
        asset: SavedAsset<'_, '_, Self::Asset>,
        _: &Self::Settings,
        _: AssetPath<'_>,
    ) -> Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error> {
        writer.write_all(&asset.bytes).await?;
        Ok(default())
    }
 }
 type BlendProcessor = LoadTransformAndSave<BlendSourceLoader, BlendTransformer, BlendSaver>;
 pub struct BlendAssetProcessingPlugin;
 impl Plugin for BlendAssetProcessingPlugin {
    fn build(&self, app: &mut App) {
        app.init_asset::<BlendSource>()
            .init_asset::<ProcessedBlend>()
            .register_asset_loader(BlendSourceLoader)
            .register_asset_processor(BlendProcessor::new(BlendTransformer, BlendSaver))
            .set_default_asset_processor::<BlendProcessor>("blend");
    }
 }
 struct TempDir(PathBuf);
 impl TempDir {
    fn new() -> io::Result<Self> {
        let stamp = SystemTime::now()
            .duration_since(UNIX_EPOCH)
            .unwrap_or_default()
            .as_nanos();
        let path =
            std::env::temp_dir().join(format!("shinespark-blend-{}-{stamp}", std::process::id()));
        fs::create_dir_all(&path)?;
        Ok(Self(path))
    }
    fn path(&self) -> &Path {
        &self.0
    }
 }
 impl Drop for TempDir {
    fn drop(&mut self) {
        let _ = fs::remove_dir_all(&self.0);
    }
 }
 fn asset_root() -> PathBuf {
    std::env::var_os("BEVY_ASSET_ROOT")
        .map(PathBuf::from)
        .unwrap_or_else(|| std::env::current_dir().unwrap_or_default().join("assets"))
 }
 fn locate_source(path: &Path) -> Option<PathBuf> {
    let root = asset_root();
    [root.join(path), PathBuf::from(path)]
        .into_iter()
        .find(|candidate| candidate.is_file())
 }
 fn physical_to_asset_path(path: &Path, root: &Path) -> Option<String> {
    let canonical = fs::canonicalize(path).ok()?;
    let root = fs::canonicalize(root).ok()?;
    let relative = canonical.strip_prefix(root).ok()?;
    Some(relative.to_string_lossy().replace('\\', "/"))
 }
 fn make_glb(
    gltf_path: &Path,
    temp: &TempDir,
    model_asset_path: &Path,
    asset_root: &Path,
 ) -> io::Result<Vec<u8>> {
    let mut json: serde_json::Value = serde_json::from_slice(&fs::read(gltf_path)?)
        .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
    let bin_name = json["buffers"][0]["uri"].as_str().ok_or_else(|| {
        io::Error::new(io::ErrorKind::InvalidData, "glTF has no binary buffer URI")
    })?;
    let mut bin = fs::read(temp.path().join(bin_name))?;
    let model_parent = model_asset_path.parent().unwrap_or_else(|| Path::new(""));
    let image_count = json["images"].as_array().map_or(0, Vec::len);
    if image_count > 0 && !json["bufferViews"].is_array() {
        return Err(io::Error::new(
            io::ErrorKind::InvalidData,
            "glTF bufferViews are not an array",
        ));
    }
    for index in 0..image_count {
        let uri = json["images"][index]
            .get("uri")
            .and_then(serde_json::Value::as_str)
            .map(str::to_owned);
        let Some(uri) = uri else { continue };
        if uri.starts_with("data:") {
            continue;
        }
        let uri_path = temp.path().join(uri);
        if let Some(asset_path) = physical_to_asset_path(&uri_path, asset_root) {
            json["images"][index]["uri"] =
                serde_json::Value::String(relative_uri(model_parent, Path::new(&asset_path)));
        } else {
            let bytes = fs::read(&uri_path)?;
            while bin.len() % 4 != 0 {
                bin.push(0);
            }
            let offset = bin.len();
            bin.extend_from_slice(&bytes);
            let mime = mime_type(&uri_path);
            let view = json["bufferViews"].as_array().unwrap().len();
            json["bufferViews"]
                .as_array_mut()
                .unwrap()
                .push(serde_json::json!({
                    "buffer": 0,
                    "byteOffset": offset,
                    "byteLength": bytes.len(),
                }));
            json["images"][index].as_object_mut().unwrap().remove("uri");
            json["images"][index]["bufferView"] = serde_json::Value::from(view);
            json["images"][index]["mimeType"] = serde_json::Value::String(mime.to_owned());
        }
    }
    json["buffers"][0]["byteLength"] = serde_json::Value::from(bin.len());
    json["buffers"][0].as_object_mut().unwrap().remove("uri");
    let mut json_bytes = serde_json::to_vec(&json).map_err(io::Error::other)?;
    while json_bytes.len() % 4 != 0 {
        json_bytes.push(b' ');
    }
    while bin.len() % 4 != 0 {
        bin.push(0);
    }
    let length = 12 + 8 + json_bytes.len() + 8 + bin.len();
    let mut glb = Vec::with_capacity(length);
    glb.extend_from_slice(b"glTF");
    glb.extend_from_slice(&2u32.to_le_bytes());
    glb.extend_from_slice(&(length as u32).to_le_bytes());
    glb.extend_from_slice(&(json_bytes.len() as u32).to_le_bytes());
    glb.extend_from_slice(b"JSON");
    glb.extend_from_slice(&json_bytes);
    glb.extend_from_slice(&(bin.len() as u32).to_le_bytes());
    glb.extend_from_slice(b"BIN\0");
    glb.extend_from_slice(&bin);
    Ok(glb)
 }
 fn relative_uri(from: &Path, to: &Path) -> String {
    let from: Vec<_> = from.components().collect();
    let to: Vec<_> = to.components().collect();
    let common = from.iter().zip(&to).take_while(|(a, b)| a == b).count();
    let mut result = PathBuf::new();
    for _ in common..from.len() {
        result.push("..");
    }
    for component in &to[common..] {
        result.push(component.as_os_str());
    }
    result.to_string_lossy().replace('\\', "/")
 }
 fn mime_type(path: &Path) -> &'static str {
    match path
        .extension()
        .and_then(|e| e.to_str())
        .unwrap_or_default()
        .to_ascii_lowercase()
        .as_str()
    {
        "jpg" | "jpeg" => "image/jpeg",
        "webp" => "image/webp",
        _ => "image/png",
    }
 }
@@ -1,71 +0,0 @@
 import bpy
 import json
 import os
 import sys
 def main():
    output = sys.argv[sys.argv.index("--") + 1]
    actions_path = sys.argv[sys.argv.index("--") + 2]
    with open(actions_path) as file:
        actions_to_keep = set(json.load(file))
    for obj in bpy.data.objects:
        if not obj.animation_data:
            continue
        for track in list(obj.animation_data.nla_tracks):
            if track.name.startswith("[Action Stash]"):
                obj.animation_data.nla_tracks.remove(track)
    nla_tracks = [
        track
        for obj in bpy.data.objects
        if obj.animation_data
        for track in obj.animation_data.nla_tracks
    ]
    use_nla_tracks = bool(nla_tracks)
    # For blends without NLA tracks, use the actions referenced by the fighter
    # manifest instead of sampling every source action.
    if not use_nla_tracks and actions_to_keep:
        from io_scene_gltf2 import GLTF2_filter_action
        if not hasattr(bpy.types.Scene, "gltf_action_filter"):
            bpy.types.Scene.gltf_action_filter = bpy.props.CollectionProperty(
                type=GLTF2_filter_action
            )
        scene = bpy.context.scene
        scene.gltf_action_filter.clear()
        for action in bpy.data.actions:
            item = scene.gltf_action_filter.add()
            item.action = action
            item.keep = action.name in actions_to_keep
    bpy.ops.export_scene.gltf(
        filepath=output,
        export_format="GLTF_SEPARATE",
        export_keep_originals=True,
        export_extras=True,
        export_animations=True,
        export_skins=True,
        export_morph=True,
        export_yup=True,
        export_def_bones=True,
        export_action_filter=False,
        export_animation_mode="NLA_TRACKS" if use_nla_tracks else "ACTIONS",
    )
    dependencies = []
    for image in bpy.data.images:
        if image.source not in {"FILE", "TILED"}:
            continue
        path = image.filepath_raw or image.filepath
        if path and not image.packed_file:
            dependencies.append(bpy.path.abspath(path))
    with open(os.path.join(os.path.dirname(output), "export-manifest.json"), "w") as file:
        json.dump({"dependencies": sorted(set(dependencies))}, file)
 if __name__ == "__main__":
    main()
@@ -2,8 +2,8 @@ use super::{
    BAKED_ANIMATION_FPS,
    runtime::{BakedAnimationClip, BakedFighterAnimations},
 };
 use crate::fighter::{animation::AnimKind, manifest::FighterManifest};
 use crate::math::fixed_transform::FixedMat4;
 use crate::fighter::{animation::AnimKind, manifest::FighterManifest};
 use bevy::{
    asset::{
        AssetLoader, AssetPath, AsyncWriteExt, LoadContext,
@@ -51,9 +51,6 @@ impl AssetLoader for FighterBakeSourceLoader {
            .map_err(|error| io::Error::other(error.to_string()))?;
        let manifest: FighterManifest = ron::de::from_bytes(&manifest_bytes)
            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
        // `read_asset_bytes` uses the processor's processed asset source. This
        // deliberately allows `model_path` to point at a `.blend`: the blend
        // processor has already converted it to a hybrid GLB by this point.
        let model_bytes = load_context
            .read_asset_bytes(&manifest.model_path)
            .await
@@ -4,8 +4,8 @@ mod asset_baking;
 mod runtime;
 mod visual_binding;
 pub use crate::math::fixed_transform::FixedMat4;
 pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
 pub use crate::math::fixed_transform::FixedMat4;
 pub use runtime::{
    BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
    update_fighter_bone_matrices,
@@ -21,7 +21,6 @@ mod tests {
    use asset_baking::{
        Channel, ChannelValues, bake_gltf_document, baked_frame_count, sample_vec3,
    };
    use serde_json::json;
    use std::collections::HashMap;
    #[test]
@@ -30,7 +29,11 @@ mod tests {
            "../../../assets/fighters/test/test.fighter.ron"
        ))
        .unwrap();
-        let (document, buffers) = test_gltf(&manifest.animations);
+        let (document, buffers, _) = gltf::import(concat!(
            env!("CARGO_MANIFEST_DIR"),
            "/assets/fighters/test/test_fighter.gltf"
        ))
        .unwrap();
        let baked = bake_gltf_document(document, buffers, &manifest.animations).unwrap();
        assert_eq!(baked.frame_rate, BAKED_ANIMATION_FPS);
@@ -48,104 +51,6 @@ mod tests {
        assert_eq!(baked.parents.len(), baked.bone_names.len());
    }
    /// Builds the smallest glTF document that still exercises the complete
    /// animation-baking path. Keeping this fixture in memory avoids making
    /// unit tests depend on the production Blender asset or Blender itself.
    fn test_gltf(
        animations: &HashMap<AnimKind, String>,
    ) -> (gltf::Document, Vec<gltf::buffer::Data>) {
        let mut names: Vec<_> = animations.values().cloned().collect();
        names.sort();
        names.dedup();
        let mut data = Vec::new();
        let mut buffer_views = Vec::new();
        let mut accessors = Vec::new();
        let mut gltf_animations = Vec::new();
        for name in names {
            let duration: f32 = match name.as_str() {
                "Idle_Loop_Game" => 2.0,
                "Walk_Loop_IK_Game" | "Run_Game" => 0.533333361,
                "Dash_Game" => 0.333333343,
                "Jump_Land_Game" => 0.133333340,
                "JumpB_Game" => 56.0 / 60.0,
                _ => 0.0,
            };
            let input_offset = data.len();
            data.extend_from_slice(&0.0_f32.to_le_bytes());
            data.extend_from_slice(&duration.to_le_bytes());
            let output_offset = data.len();
            data.extend_from_slice(
                &[0.0_f32, 0.0, 0.0]
                    .into_iter()
                    .flat_map(f32::to_le_bytes)
                    .collect::<Vec<_>>(),
            );
            data.extend_from_slice(
                &[1.0_f32, 0.0, 0.0]
                    .into_iter()
                    .flat_map(f32::to_le_bytes)
                    .collect::<Vec<_>>(),
            );
            let input_view = buffer_views.len();
            buffer_views.push(json!({
                "buffer": 0,
                "byteOffset": input_offset,
                "byteLength": 8
            }));
            let output_view = buffer_views.len();
            buffer_views.push(json!({
                "buffer": 0,
                "byteOffset": output_offset,
                "byteLength": 24
            }));
            let input_accessor = accessors.len();
            accessors.push(json!({
                "bufferView": input_view,
                "componentType": 5126,
                "count": 2,
                "type": "SCALAR",
                "min": [0.0],
                "max": [duration]
            }));
            let output_accessor = accessors.len();
            accessors.push(json!({
                "bufferView": output_view,
                "componentType": 5126,
                "count": 2,
                "type": "VEC3"
            }));
            gltf_animations.push(json!({
                "name": name,
                "samplers": [{
                    "input": input_accessor,
                    "output": output_accessor,
                    "interpolation": "LINEAR"
                }],
                "channels": [{
                    "sampler": 0,
                    "target": { "node": 0, "path": "translation" }
                }]
            }));
        }
        let document = json!({
            "asset": { "version": "2.0" },
            "scene": 0,
            "scenes": [{ "nodes": [0] }],
            "nodes": [{ "name": "root", "children": [1] }, { "name": "hand" }],
            "buffers": [{ "byteLength": data.len() }],
            "bufferViews": buffer_views,
            "accessors": accessors,
            "animations": gltf_animations
        });
        let bytes = serde_json::to_vec(&document).unwrap();
        let gltf = gltf::Gltf::from_slice(&bytes).unwrap();
        (gltf.document, vec![gltf::buffer::Data(data)])
    }
    #[test]
    fn pose_sampling_wraps_repeating_frames_and_clamps_finished_frames() {
        let first = FixedMat4::IDENTITY;
@@ -259,20 +164,6 @@ mod tests {
        );
    }
    #[test]
    fn repeated_pose_updates_reuse_scratch_and_output_buffers() {
        let mut matrices = FighterBoneMatrices::default();
        let names = ["root".into(), "hand".into()];
        let parents = [None, Some(0)];
        let pose = [FixedMat4::IDENTITY, FixedMat4::IDENTITY];
        matrices.set_pose(&names, &parents, &pose, FGi32::ONE);
        let capacities = matrices.buffer_capacities();
        matrices.set_pose(&names, &parents, &pose, FGi32::ONE);
        assert_eq!(capacities, matrices.buffer_capacities());
    }
    #[test]
    fn model_scale_affects_gameplay_bones_without_changing_visual_locals() {
        let mut root = FixedMat4::IDENTITY;
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
-use super::BAKED_ANIMATION_FPS;
+use super::{BAKED_ANIMATION_FPS};
 use crate::{
    fighter::{
@@ -12,8 +12,8 @@ use crate::{
        manifest::FighterManifest,
        visual::FighterAnimations,
    },
    math::fixed_transform::FixedMat4,
    math::int::FGi32,
    math::fixed_transform::FixedMat4
 };
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -70,24 +70,12 @@ pub struct FighterBoneMatrices {
    previous_frame_matrices: Vec<FixedMat4>,
    local_matrices: Vec<FixedMat4>,
    previous_local_matrices: Vec<FixedMat4>,
    model_matrices: Vec<Option<FixedMat4>>,
 }
 #[derive(Component, Clone, Debug, Default)]
 pub struct FighterBoneIndexMap(pub HashMap<String, usize>);
 impl FighterBoneMatrices {
    #[cfg(test)]
    pub(super) fn buffer_capacities(&self) -> [usize; 5] {
        [
            self.matrices.capacity(),
            self.local_matrices.capacity(),
            self.previous_frame_matrices.capacity(),
            self.previous_local_matrices.capacity(),
            self.model_matrices.capacity(),
        ]
    }
    pub fn get(&self, bone: &str) -> Option<(FixedMat4, FixedMat4)> {
        let index = self.bone_names.iter().position(|name| name == bone)?;
        Some((
@@ -154,19 +142,13 @@ impl FighterBoneMatrices {
            assert_eq!(self.bone_names, bone_names, "baked bone names changed");
            assert_eq!(self.parents, parents, "baked bone parents changed");
        }
        self.matrices.reserve(local.len());
        self.previous_frame_matrices.reserve(local.len());
        self.local_matrices.reserve(local.len());
        self.previous_local_matrices.reserve(local.len());
        self.model_matrices.reserve(local.len());
        std::mem::swap(&mut self.matrices, &mut self.previous_frame_matrices);
        std::mem::swap(&mut self.local_matrices, &mut self.previous_local_matrices);
        self.local_matrices.clear();
        self.local_matrices.extend_from_slice(local);
-        self.model_matrices.resize(local.len(), None);
+        let mut model = vec![None; local.len()];
        self.model_matrices.fill(None);
        for index in 0..local.len() {
-            resolve_model_transform(index, parents, local, &mut self.model_matrices)
+            resolve_model_transform(index, parents, local, &mut model)
                .expect("baked bone hierarchy should be valid");
        }
        let model_scale = FixedMat4 {
@@ -177,12 +159,10 @@ impl FighterBoneMatrices {
                [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
            ],
        };
-        self.matrices.clear();
+        self.matrices = model
-        self.matrices.extend(
+            .into_iter()
-            self.model_matrices.iter().map(|matrix| {
+            .map(|matrix| model_scale.mul(matrix.expect("baked bone hierarchy should be valid")))
-                model_scale.mul(matrix.expect("baked bone hierarchy should be valid"))
+            .collect();
            }),
        );
    }
 }
@@ -50,13 +50,11 @@ pub fn air_collide_with_stage(
        translation.0 + ecb.get_bottom_point(),
    );
-    stage_collision
+    let mut intersect_results = vec![];
-        .stage_polys
+
-        .iter()
+    for (poly_idx, poly) in stage_collision.stage_polys.iter().enumerate() {
-        .enumerate()
+        if let Some(intersect_result) = poly.intersect_ray(ray_segment) {
-        .filter_map(|(poly_idx, poly)| {
+            intersect_results.push((
            poly.intersect_ray(ray_segment).map(|intersect_result| {
                (
                AirCollisionWithStageResult {
                    line_id: {
                        StageLineID {
@@ -70,9 +68,13 @@ pub fn air_collide_with_stage(
                intersect_result
                    .position
                    .distance_squared(ray_segment.point2()),
-                )
+            ));
-            })
+        }
-        })
+    }
-        .max_by(|(_, a), (_, b)| a.cmp(b))
+    intersect_results.sort_by(|(_, a), (_, b)| a.cmp(b));
-        .map(|(result, _)| result)
+
    intersect_results
        .iter()
        .last()
        .map(|(val, _)| val.to_owned().clone())
 }
@@ -32,20 +32,22 @@ use clap::Parser;
 use ron_asset_manager::RonAssetPlugin;
 use crate::{
-    camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
+    camera::MatchCameraPlugin,
-    match_runtime::MatchRuntimePlugin, menus::style::FGUiStyle, schedule::GameplaySchedulePlugin,
+    fighter::manifest::FighterManifest,
-    stage::manifest::StageManifest, ui::InGameUIPlugin,
+    game_settings::GameSettings,
    menus::style::FGUiStyle,
    schedule::GameplaySchedulePlugin,
    stage::manifest::StageManifest,
    ui::InGameUIPlugin,
 };
 mod args;
 pub mod blend_asset;
 pub mod camera;
 pub mod debug_tools;
 pub mod fighter;
 pub mod game_settings;
 pub mod input;
 pub mod match_loading;
 pub mod match_runtime;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -90,7 +92,6 @@ pub struct GameAssetPlugin;
 impl Plugin for GameAssetPlugin {
    fn build(&self, app: &mut App) {
        app.add_plugins((
            blend_asset::BlendAssetProcessingPlugin,
            RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
            RonAssetPlugin::<StageManifest>::create("stage.ron"),
            RonAssetPlugin::<GameSettings>::create("ron"),
@@ -110,7 +111,6 @@ impl Plugin for GamePlugin {
                // Brings up GGRS (and with it `GgrsSchedule`), so it goes first.
                netcode::FighterNetcodePlugin::default(),
                GameplaySchedulePlugin,
                MatchRuntimePlugin,
                input::FighterInputPlugin,
                replay::ReplayPlugin,
                debug_tools::DebugToolsPlugin,
@@ -1,7 +1,6 @@
 use bevy::asset::AssetMode::Processed;
 #[cfg(feature = "debug_features")]
 use bevy::camera_controller::free_camera::FreeCameraPlugin;
 use bevy::gltf::GltfPlugin;
 use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor};
 use bevy::prelude::*;
 #[cfg(feature = "debug_features")]
@@ -13,18 +12,14 @@ fn main() -> AppExit {
    // A `Repeat` sampler so the tileable materials authored in the
    // editor render the same way at runtime; Bevy's default
    // `ClampToEdge` smears texture edges on brush geometry.
    let default_sampler = ImageSamplerDescriptor::linear()
        .set_address_mode(ImageAddressMode::Repeat)
        .set_anisotropic_filter(16)
        .clone();
    let default_plugins = DefaultPlugins
        .set(ImagePlugin {
-            default_sampler: default_sampler.clone(),
+            default_sampler: ImageSamplerDescriptor {
-        })
+                address_mode_u: ImageAddressMode::Repeat,
-        .set(GltfPlugin {
+                address_mode_v: ImageAddressMode::Repeat,
-            default_sampler,
+                address_mode_w: ImageAddressMode::Repeat,
-            ..default()
+                ..ImageSamplerDescriptor::linear()
            },
        })
        .set(AssetPlugin {
            mode: Processed,
@@ -8,29 +8,28 @@ use bevy_ggrs::prelude::Session;
 use serde::{Deserialize, Serialize};
 use crate::{
    AppState,
    args::Args,
    fighter::{
        FighterId, FighterRoster,
        animation::AnimKind,
        attack::{AttackKind, FighterAttackScriptAssets},
-        baked_animation::{BAKED_ANIMATION_FPS, BakedFighterAnimations},
+        baked_animation::{BakedFighterAnimations, BAKED_ANIMATION_FPS},
        manifest::{FighterManifest, FighterManifestRegistry},
        spawn_fighter,
        visual::FighterAnimations,
        FighterId, FighterRoster,
    },
    input::{LocalInputAssignments, LocalInputSource},
    match_runtime::MatchState,
    math::{int::FGi32, vec::FGVec2},
    netcode::{
        session::{create_session, ConnectionStatus, SessionConfig},
        GGRSCfg,
        session::{ConnectionStatus, SessionConfig, create_session},
    },
    scripting::FighterAttackScript,
    stage::{
        self,
        manifest::{StageId, StageManifest, StageManifestRegistry},
    },
    AppState,
 };
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -39,49 +38,10 @@ pub struct MatchPlayer {
    pub fighter: FighterId,
 }
-#[derive(Resource, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Resource, Debug, Clone, PartialEq, Eq)]
-pub struct MatchConfig {
+pub struct PendingMatch {
    pub stage: StageId,
    pub players: Vec<MatchPlayer>,
    pub rules: MatchRules,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum MatchRules {
    Stock {
        starting_stocks: u8,
        time_limit_frames: Option<u32>,
    },
    Timed {
        time_limit_frames: u32,
    },
 }
 impl Default for MatchRules {
    fn default() -> Self {
        Self::Stock {
            starting_stocks: 3,
            time_limit_frames: None,
        }
    }
 }
 impl MatchRules {
    fn validate(&self) -> Result<(), &'static str> {
        match self {
            Self::Stock {
                starting_stocks: 0, ..
            } => Err("stock matches must start with at least one stock"),
            Self::Stock {
                time_limit_frames: Some(0),
                ..
            } => Err("stock match time limits must be greater than zero frames"),
            Self::Timed {
                time_limit_frames: 0,
            } => Err("timed match limits must be greater than zero frames"),
            _ => Ok(()),
        }
    }
 }
 pub struct SelectedFighterAssets {
@@ -99,7 +59,7 @@ pub struct MatchAssets {
 impl MatchAssets {
    fn requested(world: &World) -> Self {
-        let config = world.resource::<MatchConfig>();
+        let request = world.resource::<PendingMatch>();
        let asset_server = world.resource::<AssetServer>();
        let registry = world.resource::<FighterManifestRegistry>();
        let stage_registry = world.resource::<StageManifestRegistry>();
@@ -107,7 +67,7 @@ impl MatchAssets {
        let stage_manifests = world.resource::<Assets<StageManifest>>();
        let stage_handle = stage_registry
-            .get(config.stage)
+            .get(request.stage)
            .expect("Startup validation guarantees every stage has a manifest");
        let stage_manifest = stage_manifests
            .get(&stage_handle)
@@ -115,7 +75,7 @@ impl MatchAssets {
        Self {
            stage: asset_server.load(stage_manifest.model_path.clone()),
-            fighters: config
+            fighters: request
                .players
                .iter()
                .map(|player| {
@@ -181,10 +141,10 @@ pub struct MatchRoot;
 pub fn initiate_match(
    commands: &mut Commands,
    next_state: &mut NextState<AppState>,
-    config: MatchConfig,
+    request: PendingMatch,
 ) {
    commands.remove_resource::<crate::netcode::session::MatchDisconnected>();
-    commands.insert_resource(config);
+    commands.insert_resource(request);
    next_state.set(AppState::LoadingMatch);
 }
@@ -206,9 +166,12 @@ pub fn initiate_default_match(
    if let Some(path) = &args.play_replay {
        match crate::replay::load(path) {
            Ok(replay) => {
-                let config = replay.match_config.clone();
+                let request = PendingMatch {
                    stage: replay.match_config.stage,
                    players: replay.match_config.players.clone(),
                };
                commands.insert_resource(crate::replay::LoadedReplay(replay));
-                initiate_match(&mut commands, &mut next_state, config);
+                initiate_match(&mut commands, &mut next_state, request);
            }
            Err(error) => {
                error!("Replay load failed: {error}");
@@ -252,17 +215,16 @@ pub fn initiate_default_match(
    initiate_match(
        &mut commands,
        &mut next_state,
-        MatchConfig {
+        PendingMatch {
            stage: StageId::TestStage,
            players,
            rules: MatchRules::default(),
        },
    );
 }
 pub fn prepare_match(
    mut commands: Commands,
-    config: Res<MatchConfig>,
+    request: Res<PendingMatch>,
    assets: Res<MatchAssets>,
    gltfs: Res<Assets<Gltf>>,
    baked_animations: Res<Assets<BakedFighterAnimations>>,
@@ -274,7 +236,7 @@ pub fn prepare_match(
    args: Res<Args>,
    mut next_state: ResMut<NextState<AppState>>,
 ) {
-    if !valid_player_handles(&config.players) {
+    if !valid_player_handles(&request.players) {
        fail_match(
            &mut next_state,
            "player handles must be unique and cover 0..player_count",
@@ -282,12 +244,7 @@ pub fn prepare_match(
        return;
    }
-    if let Err(error) = config.rules.validate() {
+    if assets.fighters.len() != request.players.len() {
        fail_match(&mut next_state, error);
        return;
    }
    if assets.fighters.len() != config.players.len() {
        fail_match(
            &mut next_state,
            "loaded character assets do not match the requested player slots",
@@ -439,7 +396,7 @@ pub fn prepare_match(
        ));
    }
-    let session_config = match SessionConfig::from_args(&args, config.players.len()) {
+    let session_config = match SessionConfig::from_args(&args, request.players.len()) {
        Ok(config) => config,
        Err(error) => {
            fail_match(
@@ -449,7 +406,7 @@ pub fn prepare_match(
            return;
        }
    };
-    let session = match create_session(&args, config.players.len()) {
+    let session = match create_session(&args, request.players.len()) {
        Ok(session) => session,
        Err(error) => {
            fail_match(
@@ -463,7 +420,7 @@ pub fn prepare_match(
    let root = commands.spawn((Name::new("Match"), MatchRoot)).id();
    let stage_handle = stage_registry
-        .get(config.stage)
+        .get(request.stage)
        .expect("Initialization check should ensure all stages exist");
    let stage_manifest = stage_manifests
        .get(&stage_handle)
@@ -476,11 +433,11 @@ pub fn prepare_match(
        stage_manifest.camera.clone(),
    );
-    let mut fighter_roster = Vec::with_capacity(config.players.len());
+    let mut fighter_roster = Vec::with_capacity(request.players.len());
    for (index, (player, (scene, animations, attack_scripts, manifest_handle, model_scale))) in
-        config.players.iter().zip(prepared).enumerate()
+        request.players.iter().zip(prepared).enumerate()
    {
-        let spawn_x = (index as i32 * 2 + 1 - config.players.len() as i32) * 5;
+        let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5;
        fighter_roster.push(spawn_fighter(
            &mut commands,
            player.handle,
@@ -494,7 +451,6 @@ pub fn prepare_match(
    }
    commands.insert_resource(FighterRoster(fighter_roster));
    commands.insert_resource(MatchState::from_config(&config));
    commands.insert_resource(session_config);
    commands.insert_resource(ConnectionStatus::default());
    commands.insert_resource::<Session<GGRSCfg>>(session);
@@ -531,8 +487,7 @@ pub fn cleanup_match(
    commands.remove_resource::<ConnectionStatus>();
    commands.remove_resource::<stage::line::StageCollision>();
    commands.remove_resource::<MatchAssets>();
-    commands.remove_resource::<MatchConfig>();
+    commands.remove_resource::<PendingMatch>();
    commands.remove_resource::<MatchState>();
    commands.remove_resource::<FighterRoster>();
 }
@@ -541,8 +496,8 @@ mod tests {
    use super::*;
    #[test]
-    fn match_config_keeps_duplicate_fighter_slots() {
+    fn match_request_keeps_duplicate_fighter_slots() {
-        let config = MatchConfig {
+        let request = PendingMatch {
            stage: StageId::TestStage,
            players: vec![
                MatchPlayer {
@@ -554,13 +509,12 @@ mod tests {
                    fighter: FighterId::TestFighter,
                },
            ],
            rules: MatchRules::default(),
        };
-        assert_eq!(config.players.len(), 2);
+        assert_eq!(request.players.len(), 2);
-        assert_eq!(config.players[0].handle, 0);
+        assert_eq!(request.players[0].handle, 0);
-        assert_eq!(config.players[1].handle, 1);
+        assert_eq!(request.players[1].handle, 1);
-        assert!(valid_player_handles(&config.players));
+        assert!(valid_player_handles(&request.players));
    }
    #[test]
@@ -579,53 +533,6 @@ mod tests {
        assert!(!valid_player_handles(&players));
    }
    #[test]
    fn match_rules_reject_zero_limits() {
        assert!(
            MatchRules::Stock {
                starting_stocks: 0,
                time_limit_frames: None,
            }
            .validate()
            .is_err()
        );
        assert!(
            MatchRules::Stock {
                starting_stocks: 3,
                time_limit_frames: Some(0),
            }
            .validate()
            .is_err()
        );
        assert!(
            MatchRules::Timed {
                time_limit_frames: 0,
            }
            .validate()
            .is_err()
        );
    }
    #[test]
    fn match_rules_accept_valid_modes() {
        assert!(MatchRules::default().validate().is_ok());
        assert!(
            MatchRules::Stock {
                starting_stocks: 3,
                time_limit_frames: Some(60),
            }
            .validate()
            .is_ok()
        );
        assert!(
            MatchRules::Timed {
                time_limit_frames: 60,
            }
            .validate()
            .is_ok()
        );
    }
    #[test]
    fn match_loading_waits_for_attack_scripts() {
        let mut attack_scripts = HashMap::new();
@@ -1,102 +0,0 @@
 //! Rollback-simulated state for an active match.
 use bevy::prelude::*;
 use bevy_ggrs::prelude::*;
 use crate::match_loading::{MatchConfig, MatchRules};
 #[derive(Resource, Clone, Debug, Hash, PartialEq, Eq)]
 pub struct MatchState {
    pub elapsed_frames: u32,
    /// Indexed by the player's session handle.
    pub players: Vec<PlayerMatchState>,
 }
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct PlayerMatchState {
    pub stocks_remaining: Option<u8>,
    pub score: i32,
    pub deaths: u32,
 }
 impl MatchState {
    pub fn from_config(config: &MatchConfig) -> Self {
        let stocks_remaining = match &config.rules {
            MatchRules::Stock {
                starting_stocks, ..
            } => Some(*starting_stocks),
            MatchRules::Timed { .. } => None,
        };
        Self {
            elapsed_frames: 0,
            players: (0..config.players.len())
                .map(|_| PlayerMatchState {
                    stocks_remaining,
                    score: 0,
                    deaths: 0,
                })
                .collect(),
        }
    }
 }
 pub struct MatchRuntimePlugin;
 impl Plugin for MatchRuntimePlugin {
    fn build(&self, app: &mut App) {
        app.rollback_resource_with_clone::<MatchState>()
            .checksum_resource_with_hash::<MatchState>();
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    use crate::{fighter::FighterId, match_loading::MatchPlayer, stage::manifest::StageId};
    fn config(rules: MatchRules) -> MatchConfig {
        MatchConfig {
            stage: StageId::TestStage,
            players: vec![
                MatchPlayer {
                    handle: 1,
                    fighter: FighterId::TestFighter,
                },
                MatchPlayer {
                    handle: 0,
                    fighter: FighterId::TestFighter,
                },
            ],
            rules,
        }
    }
    #[test]
    fn stock_state_starts_with_configured_stocks() {
        let state = MatchState::from_config(&config(MatchRules::Stock {
            starting_stocks: 4,
            time_limit_frames: Some(60),
        }));
        assert_eq!(state.elapsed_frames, 0);
        assert_eq!(state.players.len(), 2);
        assert!(state.players.iter().all(|player| {
            player.stocks_remaining == Some(4) && player.score == 0 && player.deaths == 0
        }));
    }
    #[test]
    fn timed_state_has_no_stock_counter() {
        let state = MatchState::from_config(&config(MatchRules::Timed {
            time_limit_frames: 60,
        }));
        assert!(
            state
                .players
                .iter()
                .all(|player| player.stocks_remaining.is_none())
        );
    }
 }
@@ -241,7 +241,7 @@ pub fn copy_cursor_transform_to_token(
    character_boxes: Query<(&CharacterBox, &ComputedNode, &UiGlobalTransform)>,
    match_config: Res<MenuMatchConfig>,
    cursors: Query<&UiGlobalTransform, With<FGMenuCursor>>,
-    cam: Single<&Camera>,
+    cam: Single<&Camera, With<IsDefaultUiCamera>>,
    ui_scale: Res<UiScale>,
 ) -> Result {
    let camera = cam.into_inner();
@@ -181,7 +181,7 @@ pub fn cursor_input(
 }
 pub fn update_cursor_transform(
-    camera: Single<&Camera>,
+    camera: Single<&Camera, With<IsDefaultUiCamera>>,
    query: Query<(&mut Node, &PointerLocation), With<FGMenuCursor>>,
    ui_scale: Res<UiScale>,
 ) {
@@ -3,7 +3,7 @@ use thiserror::Error;
 use crate::{
    fighter::FighterId,
-    match_loading::{MatchConfig, MatchPlayer, MatchRules},
+    match_loading::{MatchPlayer, PendingMatch},
    stage::manifest::StageId,
 };
@@ -60,7 +60,7 @@ impl MenuMatchConfig {
        !has_unselected_fighter
    }
-    pub fn to_match_config(&self) -> Result<MatchConfig, MenuMatchConfigErrors> {
+    pub fn to_pending_match(&self) -> Result<PendingMatch, MenuMatchConfigErrors> {
        let mut match_players = vec![];
        let stage = self.stage.ok_or(MenuMatchConfigErrors::StageNotSelected)?;
@@ -78,28 +78,9 @@ impl MenuMatchConfig {
            });
        }
-        Ok(MatchConfig {
+        Ok(PendingMatch {
            players: match_players,
            stage,
            rules: MatchRules::default(),
        })
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn menu_config_uses_default_match_rules() {
        let menu = MenuMatchConfig {
            stage: Some(StageId::TestStage),
            players: vec![MenuMatchPlayerSlot {
                slot: 0,
                fighter: Some(FighterId::TestFighter),
            }],
        };
        assert_eq!(menu.to_match_config().unwrap().rules, MatchRules::default());
    }
 }
@@ -25,8 +25,6 @@ pub mod style;
 #[derive(Component, Clone, Default)]
 pub struct MenuMarker {}
 #[derive(Component, Clone, Default)]
 pub struct MenuCameraMarker {}
 pub struct MenuPlugin;
@@ -40,7 +38,6 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
    bsn! {
        #MenuRoot
        MenuMarker
        Transform
        Node {
            width: percent(100),
            height: percent(100),
@@ -49,11 +46,6 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
            flex_direction: FlexDirection::Column,
        }
        Children [
            (
                #MenuCamera
                Camera
                Camera2d
            ),
            (
                #MenuContainer
                Node {
@@ -73,18 +65,15 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
 pub fn despawn_menu(
    existing_menu: Option<Single<Entity, With<MenuMarker>>>,
    existing_menu_camera: Option<Single<Entity, With<MenuCameraMarker>>>,
    mut commands: Commands,
 ) {
    if let Some(entity) = existing_menu {
        commands
            .entity(entity.into_inner())
            .remove::<Camera2d>()
            .remove::<Camera>()
            .despawn();
    }
    if let Some(menu_cam) = existing_menu_camera {
        commands.entity(*menu_cam).despawn();
    }
 }
 pub fn spawn_menu(
@@ -95,6 +84,8 @@ pub fn spawn_menu(
    if let Some(entity) = existing_menu {
        commands
            .entity(entity.into_inner())
            .remove::<Camera2d>()
            .remove::<Camera>()
            .despawn();
    }
    commands.queue_spawn_scene(wrap_menu(menu));
@@ -122,7 +113,16 @@ impl Plugin for MenuPlugin {
    fn build(&self, app: &mut App) {
        app.add_systems(
            OnEnter(AppState::MainMenu),
-            build_menu::<MainMenu>,
+            (build_menu::<MainMenu>, |mut commands: Commands| {
                commands.spawn((Camera2d, IsDefaultUiCamera));
                commands.spawn((
                    Camera2d,
                    Camera {
                        order: 1,
                        ..default()
                    },
                ));
            }),
        )
        .add_message::<character_select::PlayerSlotAssigned>()
        .init_resource::<navigation::UINavigationActionState>()
@@ -77,7 +77,7 @@ pub fn stage_selected(
        initiate_match(
            &mut commands,
            &mut next_state,
-            match_config.to_match_config()?,
+            match_config.to_pending_match()?,
        );
    }
    Ok(())
@@ -12,12 +12,16 @@ use clap::ValueEnum;
 use serde::{Deserialize, Serialize};
 use crate::{
-    AppState, args::Args, input::FighterInputFrame, match_loading::MatchConfig, netcode::GGRSCfg,
+    AppState,
    args::Args,
    input::FighterInputFrame,
    match_loading::{MatchPlayer, PendingMatch},
    netcode::GGRSCfg,
    schedule::GameplaySet,
 };
 const MAGIC: &[u8; 8] = b"SPRPLY01";
-pub const REPLAY_VERSION: u32 = 2;
+pub const REPLAY_VERSION: u32 = 1;
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, ValueEnum)]
 pub enum ReplayFormat {
@@ -30,11 +34,17 @@ pub enum ReplayFormat {
 pub struct Replay {
    pub replay_version: u32,
    pub game_version: String,
-    pub match_config: MatchConfig,
+    pub match_config: ReplayMatch,
    pub frames: Vec<ReplayFrame>,
    pub checksums: Vec<ReplayChecksum>,
 }
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ReplayMatch {
    pub stage: crate::stage::manifest::StageId,
    pub players: Vec<MatchPlayer>,
 }
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ReplayFrame {
    pub frame: i32,
@@ -152,20 +162,6 @@ fn validate(replay: &Replay) -> Result<(), String> {
    {
        return Err("replay frames must be strictly ordered".into());
    }
    if replay
        .frames
        .windows(2)
        .any(|frames| frames[0].frame.checked_add(1) != Some(frames[1].frame))
    {
        return Err("replay frames must be contiguous".into());
    }
    if replay
        .checksums
        .windows(2)
        .any(|checksums| checksums[0].frame >= checksums[1].frame)
    {
        return Err("replay checksums must be strictly ordered".into());
    }
    if replay
        .frames
        .iter()
@@ -187,21 +183,6 @@ impl Replay {
        handles.sort_unstable();
        handles != (0..handles.len()).collect::<Vec<_>>()
    }
    fn frame(&self, frame: i32) -> Option<&ReplayFrame> {
        let first_frame = self.frames.first()?.frame;
        let index = frame.checked_sub(first_frame)? as usize;
        self.frames
            .get(index)
            .filter(|recorded| recorded.frame == frame)
    }
    fn checksum(&self, frame: i32) -> Option<u128> {
        self.checksums
            .binary_search_by_key(&frame, |checksum| checksum.frame)
            .ok()
            .map(|index| self.checksums[index].checksum)
    }
 }
 fn start_replay(mut commands: Commands, args: Res<Args>, loaded: Option<Res<LoadedReplay>>) {
@@ -239,7 +220,11 @@ fn replay_inputs(
                .insert(frame.0, inputs.iter().map(|(input, _)| *input).collect());
        }
        ReplayMode::Playback { replay, mismatch } if !*mismatch => {
-            let Some(recorded) = replay.frame(frame.0) else {
+            let Some(recorded) = replay
                .frames
                .iter()
                .find(|recorded| recorded.frame == frame.0)
            else {
                error!("Replay has no input for frame {}", frame.0);
                *mismatch = true;
                return;
@@ -260,43 +245,49 @@ fn record_checksum(
    let Some(mut runtime) = runtime else { return };
    if matches!(&runtime.mode, ReplayMode::Record { .. }) {
        runtime.checksums.insert(frame.0, checksum.0);
-    } else if let ReplayMode::Playback { replay, mismatch } = &mut runtime.mode
+    } else if let ReplayMode::Playback { replay, mismatch } = &mut runtime.mode {
-        && let Some(expected) = replay.checksum(frame.0)
+        if let Some(expected) = replay
-        && expected != checksum.0
+            .checksums
            .iter()
            .find(|value| value.frame == frame.0)
            .map(|value| value.checksum)
        {
            if expected != checksum.0 {
                error!(
                    "Replay desync at frame {}: expected {:X}, got {:X}",
                    frame.0, expected, checksum.0
                );
                *mismatch = true;
            }
        }
    }
 }
 fn stop_recording(
    mut commands: Commands,
    stop_request: Option<Res<StopReplayRecording>>,
    runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
    if stop_request.is_none() {
        return;
    }
    commands.remove_resource::<StopReplayRecording>();
-    finish_recording_inner(&mut commands, runtime, config);
+    finish_recording_inner(&mut commands, runtime, request);
 }
 fn finish_recording(
    mut commands: Commands,
    runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
-    finish_recording_inner(&mut commands, runtime, config);
+    finish_recording_inner(&mut commands, runtime, request);
 }
 fn finish_recording_inner(
    commands: &mut Commands,
    runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
    let Some(mut runtime) = runtime else { return };
    let ReplayMode::Record { path, format } = &runtime.mode else {
@@ -305,13 +296,16 @@ fn finish_recording_inner(
    if runtime.finished || runtime.frames.is_empty() {
        return;
    }
-    let Some(config) = config else { return };
+    let Some(request) = request else { return };
    let path = path.clone();
    let format = *format;
    let replay = Replay {
        replay_version: REPLAY_VERSION,
        game_version: env!("CARGO_PKG_VERSION").into(),
-        match_config: config.as_ref().clone(),
+        match_config: ReplayMatch {
            stage: request.stage,
            players: request.players.clone(),
        },
        frames: runtime
            .frames
            .iter()
@@ -361,7 +355,7 @@ mod tests {
    use super::*;
    use crate::{
        fighter::FighterId,
-        match_loading::{MatchPlayer, MatchRules},
+        match_loading::MatchPlayer,
        math::{int::FGi32, vec::FGVec2},
        stage::manifest::StageId,
    };
@@ -370,15 +364,12 @@ mod tests {
        Replay {
            replay_version: REPLAY_VERSION,
            game_version: "test".into(),
-            match_config: MatchConfig {
+            match_config: ReplayMatch {
                stage: StageId::TestStage,
                players: vec![MatchPlayer {
                    handle: 0,
                    fighter: FighterId::TestFighter,
                }],
                rules: MatchRules::Timed {
                    time_limit_frames: 21_600,
                },
            },
            frames: vec![ReplayFrame {
                frame: 1,
@@ -415,52 +406,4 @@ mod tests {
        replay.frames[0].inputs.clear();
        assert!(validate(&replay).is_err());
    }
    #[test]
    fn unsupported_replay_version_is_rejected() {
        let mut replay = sample();
        replay.replay_version = 1;
        assert_eq!(
            validate(&replay).unwrap_err(),
            "unsupported replay version 1"
        );
    }
    #[test]
    fn playback_lookups_use_frame_offsets_and_support_sparse_checksums() {
        let mut replay = sample();
        replay.frames[0].frame = 10;
        replay.frames.push(ReplayFrame {
            frame: 11,
            inputs: replay.frames[0].inputs.clone(),
        });
        replay.checksums.push(ReplayChecksum {
            frame: 11,
            checksum: 84,
        });
        replay.checksums[0].frame = 10;
        validate(&replay).unwrap();
        assert_eq!(replay.frame(10).unwrap().frame, 10);
        assert_eq!(replay.frame(11).unwrap().frame, 11);
        assert!(replay.frame(9).is_none());
        assert_eq!(replay.checksum(10), Some(42));
        assert_eq!(replay.checksum(11), Some(84));
        assert_eq!(replay.checksum(12), None);
    }
    #[test]
    fn noncontiguous_input_frames_are_rejected() {
        let mut replay = sample();
        replay.frames.push(ReplayFrame {
            frame: 3,
            inputs: replay.frames[0].inputs.clone(),
        });
        assert_eq!(
            validate(&replay).unwrap_err(),
            "replay frames must be contiguous"
        );
    }
 }
@@ -1,29 +1,20 @@
 use bevy::prelude::*;
 use crate::{
-    fighter::manifest::{FighterManifest, FighterManifestRegistry},
+    fighter::manifest::{FighterManifest, FighterManifestRegistry}, match_loading::{PendingMatch}, ui::{errors::UIErrors, fighter_info::FighterInfoUI},
    match_loading::MatchConfig,
    ui::{errors::UIErrors, fighter_info::FighterInfoUI},
 };
 #[derive(Component, FromTemplate)]
-pub struct BattleUI {}
+pub struct BattleUI {
 }
 pub fn spawn_battle_ui(mut commands: Commands, request: Res<PendingMatch>, fighter_registry: Res<FighterManifestRegistry>, manifests: Res<Assets<FighterManifest>>) -> Result {
 pub fn spawn_battle_ui(
    mut commands: Commands,
    config: Res<MatchConfig>,
    fighter_registry: Res<FighterManifestRegistry>,
    manifests: Res<Assets<FighterManifest>>,
 ) -> Result {
    let mut fighter_uis = vec![];
-    for player in &config.players {
+    for player in &request.players {
-        let manifest = fighter_registry
+        let manifest = fighter_registry.get(player.fighter).ok_or_else(|| UIErrors::FighterManifestHandleNotFound(player.fighter))?;
-            .get(player.fighter)
+        let manifest = manifests.get(manifest).ok_or_else(|| UIErrors::FighterManifestNotFound(player.fighter))?;
            .ok_or_else(|| UIErrors::FighterManifestHandleNotFound(player.fighter))?;
        let manifest = manifests
            .get(manifest)
            .ok_or_else(|| UIErrors::FighterManifestNotFound(player.fighter))?;
        fighter_uis.push(FighterInfoUI::build(manifest, player));
    }
@@ -1,17 +1,13 @@
 use bevy::prelude::*;
-use crate::{
+use crate::{fighter::{attack::FighterDamage, manifest::{FighterManifest}}, match_loading::MatchPlayer, player::Player};
    fighter::{attack::FighterDamage, manifest::FighterManifest}, match_loading::{MatchPlayer}, match_runtime::MatchState, player::Player, ui::stock_icon::BattleUIStockIcon,
 };
 #[derive(Component, FromTemplate)]
 pub struct FighterInfoUI {
    percentage_text: Entity,
    stock_icon_container: Entity,
    _name_text: Entity,
    player_handle: usize,
    visible_damage: FighterDamage,
    visible_stocks: u8,
 }
 impl FighterInfoUI {
@@ -20,7 +16,6 @@ impl FighterInfoUI {
        bsn! {
            FighterInfoUI {
                percentage_text: #PercentageText,
                stock_icon_container: #StockIconContainer,
                _name_text: #NameText,
                player_handle: {match_player.handle}
            }
@@ -30,10 +25,6 @@ impl FighterInfoUI {
                justify_content: JustifyContent::Center,
            }
            Children [
                (
                    #StockIconContainer
                    Node
                )
                (
                    #PercentageText
                    Text("0.00%")
@@ -50,54 +41,17 @@ impl FighterInfoUI {
    }
 }
-pub fn update_fighter_info_damage(
+pub fn update_fighter_info_damage(fighters: Query<(&Player, &FighterDamage)>, ui_elements: Query<&mut FighterInfoUI>, mut commands: Commands) {
    fighters: Query<(&Player, &FighterDamage)>,
    ui_elements: Query<&mut FighterInfoUI>,
    mut commands: Commands,
 ) {
    for mut ui_element in ui_elements {
-        let Some((_, damage)) = fighters
+        let Some((_, damage)) = fighters.iter().find(|(player, _)| {
-            .iter()
+            player.handle == ui_element.player_handle
-            .find(|(player, _)| player.handle == ui_element.player_handle)
+        }) else {
        else {
            continue;
        };
        if *damage != ui_element.visible_damage {
-            commands
+            commands.entity(ui_element.percentage_text).insert(Text(format!("{}%", damage)));
                .entity(ui_element.percentage_text)
                .insert(Text(format!("{}%", damage)));
            ui_element.visible_damage = damage.clone();
        }
    }
 }
 pub fn update_fighter_info_stocks(
    match_state: Res<MatchState>,
    ui_elements: Query<&mut FighterInfoUI>,
    mut commands: Commands,
 ) {
    for mut ui_element in ui_elements {
        let handle = ui_element.player_handle;
        let Some(match_player) = match_state.players.get(handle) else {
            continue;
        };
        let Some(stocks) = match_player.stocks_remaining else {
            continue;
        };
        if stocks != ui_element.visible_stocks {
            commands
                .entity(ui_element.stock_icon_container)
                .despawn_children()
                .with_children(|spawner| {
                    for _ in 0..stocks {
                        spawner.spawn_empty().apply_scene(BattleUIStockIcon::scene());
                    }
                });
            ui_element.visible_stocks = stocks;
        }
    }
 }
@@ -1,15 +1,10 @@
 use bevy::prelude::*;
-use crate::{
+use crate::AppState;
    AppState,
    match_loading::{MatchConfig, MatchRules},
    match_runtime::MatchState,
 };
 pub mod battle_ui;
 pub mod errors;
 pub mod fighter_info;
 pub mod stock_icon;
 #[derive(Default)]
 pub struct InGameUIPlugin;
@@ -18,20 +13,6 @@ impl Plugin for InGameUIPlugin {
    fn build(&self, app: &mut App) {
        app.add_systems(OnEnter(AppState::InMatch), battle_ui::spawn_battle_ui)
            .add_systems(OnExit(AppState::InMatch), battle_ui::cleanup_battle_ui)
-            .add_systems(PostUpdate, fighter_info::update_fighter_info_damage)
+            .add_systems(PostUpdate, fighter_info::update_fighter_info_damage);
            .add_systems(
                PostUpdate,
                fighter_info::update_fighter_info_stocks.run_if(
                    resource_exists::<MatchState>
                        .and_then(resource_exists::<MatchConfig>)
                        .and_then(|match_config: Res<MatchConfig>| {
                            if let MatchRules::Stock { .. } = match_config.rules {
                                true
                            } else {
                                false
                            }
                        }),
                ),
            );
    }
 }
@@ -1,17 +0,0 @@
 use bevy::prelude::*;
 #[derive(SceneComponent, Clone, FromTemplate)]
 pub struct BattleUIStockIcon;
 impl BattleUIStockIcon {
    pub fn scene() -> impl Scene {
        bsn! {
            Node {
                width: px(32),
                height: px(32),
                border_radius: BorderRadius::MAX,
            }
            BackgroundColor({bevy::color::palettes::css::RED})
        }
    }
 }
@@ -1,123 +0,0 @@
 """LLDB summaries for Rust's `fixed` crate.
 Load this file from LLDB with:
    command script import /path/to/shinespark/tools/lldb_fixed.py
 The implementation does not use floating-point arithmetic, so displayed values
 are exact even for FixedI128/FixedU128 values.
 """
 import re
 try:
    import lldb
 except ImportError:
    # Keep the pure parsing and formatting helpers testable without LLDB.
    lldb = None
 _FIXED_TYPE_RE = re.compile(r"(?:^|::)Fixed([IU])(8|16|32|64|128)<(.+)>$")
 _DIRECT_TYPENUM_RE = re.compile(r"(?:^|::)U(\d+)$")
 _TYPENUM_BIT_RE = re.compile(r"(?:^|::)B([01])(?=\s*[,>])")
 def parse_fixed_type(type_name):
    """Return (signed, storage_bits, fractional_bits), or None."""
    if not type_name:
        return None
    match = _FIXED_TYPE_RE.search(type_name.replace(" ", ""))
    if match is None:
        return None
    signed = match.group(1) == "I"
    storage_bits = int(match.group(2))
    fractional_type = match.group(3)
    direct = _DIRECT_TYPENUM_RE.search(fractional_type)
    if direct is not None:
        fractional_bits = int(direct.group(1))
    else:
        # typenum represents UInt<N, B> as a binary tree. Its textual Rust
        # type lists the bits from most significant to least significant.
        digits = _TYPENUM_BIT_RE.findall(fractional_type)
        if not digits:
            return None
        fractional_bits = int("".join(digits), 2)
    if fractional_bits > storage_bits:
        return None
    return signed, storage_bits, fractional_bits
 def normalize_bits(raw_bits, signed, storage_bits):
    """Interpret a possibly unsigned LLDB integer using the fixed type's width."""
    mask = (1 << storage_bits) - 1
    raw_bits &= mask
    if signed and raw_bits >= 1 << (storage_bits - 1):
        raw_bits -= 1 << storage_bits
    return raw_bits
 def format_fixed(raw_bits, fractional_bits):
    """Format a scaled integer exactly as a decimal string."""
    if fractional_bits == 0:
        return str(raw_bits)
    negative = raw_bits < 0
    magnitude = -raw_bits if negative else raw_bits
    whole = magnitude >> fractional_bits
    remainder = magnitude & ((1 << fractional_bits) - 1)
    if remainder == 0:
        result = str(whole)
    else:
        # remainder / 2^n == (remainder * 5^n) / 10^n, which gives a finite,
        # exact decimal representation without converting through a float.
        decimal = str(remainder * 5**fractional_bits).zfill(fractional_bits)
        result = f"{whole}.{decimal.rstrip('0')}"
    return f"-{result}" if negative else result
 def _parse_lldb_integer(value):
    text = value.GetValue()
    if text is not None:
        try:
            return int(text, 0)
        except ValueError:
            pass
    # GetValueAsUnsigned is also useful on LLDB versions that do not render
    # primitive values through GetValue. It is sufficient for all <= 64-bit
    # fixed types; current LLDB versions render i128/u128 through GetValue.
    return value.GetValueAsUnsigned()
 def fixed_summary(value, _internal_dict):
    layout = parse_fixed_type(value.GetTypeName())
    if layout is None:
        return None
    signed, storage_bits, fractional_bits = layout
    bits = value.GetChildMemberWithName("bits")
    if not bits.IsValid():
        return None
    raw_bits = _parse_lldb_integer(bits)
    raw_bits = normalize_bits(raw_bits, signed, storage_bits)
    return format_fixed(raw_bits, fractional_bits)
 def __lldb_init_module(debugger, _internal_dict):
    # LLDB's type-name regex sees the concrete fixed type rather than project
    # aliases such as FGi32 and FGWide.
    debugger.HandleCommand(
        "type summary add --python-function lldb_fixed.fixed_summary "
        "--category Shinespark --regex "
        "'^fixed::Fixed(I|U)(8|16|32|64|128)<.+>$'"
    )
    # A dedicated category makes the formatter work even when CodeLLDB has not
    # enabled rustc's standard `Rust` formatter category yet.
    debugger.HandleCommand("type category enable Shinespark")
@@ -1,58 +0,0 @@
 import unittest
 import lldb_fixed
 class ParseFixedTypeTests(unittest.TestCase):
    def test_direct_typenum_alias(self):
        self.assertEqual(
            lldb_fixed.parse_fixed_type("fixed::FixedI32<typenum::uint::U16>"),
            (True, 32, 16),
        )
    def test_expanded_typenum(self):
        type_name = (
            "fixed::FixedI32<"
            "typenum::uint::UInt<"
            "typenum::uint::UInt<"
            "typenum::uint::UInt<"
            "typenum::uint::UInt<"
            "typenum::uint::UInt<typenum::uint::UTerm, typenum::bit::B1>, "
            "typenum::bit::B0>, typenum::bit::B0>, typenum::bit::B0>, "
            "typenum::bit::B0>>"
        )
        self.assertEqual(lldb_fixed.parse_fixed_type(type_name), (True, 32, 16))
    def test_unsigned_type(self):
        self.assertEqual(
            lldb_fixed.parse_fixed_type("fixed::FixedU64<typenum::uint::U24>"),
            (False, 64, 24),
        )
    def test_unrelated_type(self):
        self.assertIsNone(lldb_fixed.parse_fixed_type("core::primitive::i32"))
 class FormatFixedTests(unittest.TestCase):
    def test_q16_16(self):
        self.assertEqual(lldb_fixed.format_fixed(3 << 15, 16), "1.5")
        self.assertEqual(lldb_fixed.format_fixed(-(3 << 15), 16), "-1.5")
        self.assertEqual(lldb_fixed.format_fixed(1, 16), "0.0000152587890625")
    def test_integer_value_has_no_decimal_suffix(self):
        self.assertEqual(lldb_fixed.format_fixed(12 << 16, 16), "12")
    def test_q96_32(self):
        raw = (1 << 100) + (1 << 31)
        self.assertEqual(
            lldb_fixed.format_fixed(raw, 32),
            "295147905179352825856.5",
        )
    def test_twos_complement_normalization(self):
        self.assertEqual(lldb_fixed.normalize_bits(0xFFFF8000, True, 32), -32768)
        self.assertEqual(lldb_fixed.normalize_bits(0xFFFF8000, False, 32), 0xFFFF8000)
 if __name__ == "__main__":
    unittest.main()
Author	SHA1	Message	Date
EIREXE	15052e7e16	Expose LLVM tools to Windows build CI / production-build (pull_request) Successful in 22m8s Details CI / build-and-test (pull_request) Successful in 1m17s Details	2026-09-19 23:14:03 +02:00
EIREXE	48896d5c1e	Use Clang 19 for Windows cross-builds CI / build-and-test (pull_request) Successful in 1m22s Details CI / production-build (pull_request) Failing after 14m59s Details	2026-09-19 22:53:19 +02:00
EIREXE	350b37a4da	Fix blake build CI / build-and-test (pull_request) Successful in 6m54s Details CI / production-build (pull_request) Failing after 14m15s Details	2026-09-19 22:28:04 +02:00
EIREXE	4d474227cc	Install Windows tooling in production job CI / build-and-test (pull_request) Successful in 3m10s Details CI / production-build (pull_request) Failing after 8m23s Details	2026-09-19 22:15:16 +02:00
EIREXE	b5cc5428d2	Bump gc driver	2026-09-19 22:12:35 +02:00
EIREXE	49b23110ff	Build Windows binary in shared Steam depot CI / build-and-test (pull_request) Successful in 1m46s Details CI / production-build (pull_request) Failing after 4m50s Details	2026-09-19 22:01:52 +02:00