Compare commits

...
9 Commits
Author SHA1 Message Date
EIREXE 4d474227cc Install Windows tooling in production job
CI / build-and-test (pull_request) Successful in 3m10s
CI / production-build (pull_request) Failing after 8m23s
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
CI / production-build (pull_request) Failing after 4m50s
2026-09-19 22:01:52 +02:00
EIREXE 9ba8697d57 Include missing battlefield icon
CI / build-and-test (push) Successful in 1m10s
CI / production-build (push) Successful in 5m5s
2026-09-19 21:54:33 +02:00
EIREXE 7d9b6aeafc Fix headless asset preprocessing hang (#49)
CI / build-and-test (push) Successful in 1m9s
CI / production-build (push) Successful in 5m23s
## Summary
- register Bevy's image loader explicitly in the headless asset processor
- use no GPU-compressed image formats because the processor has no render device
- allow PNG processing tasks to complete so `ProcessorState` reaches `Finished`

Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 19:07:39 +00:00
EIREXE ab6aec70c5 Fix processed RON assets being ignored (#48)
CI / build-and-test (push) Successful in 1m9s
CI / production-build (push) Canceled after 10m37s
## Summary
- share custom RON asset loaders between the game and asset processor
- register image, font, and glTF loaders in the headless processor
- prevent `game_settings.ron` and `game.stylesheet.ron` from receiving ignored processed metadata

Reviewed-on: #48
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 18:09:40 +00:00
EIREXE de5d8eb030 Deploy production Linux builds to Steam (#47)
CI / production-build (push) Successful in 5m15s
CI / build-and-test (push) Successful in 1m8s
## Summary
- package the production Linux binary and Bevy assets under `build/linux`
- generate Steam TOTP credentials in CI
- deploy app 3409670 to the Steam `master` branch using the latest commit hash as the build description
- restrict packaging and deployment to pushes on `master`, excluding pull requests and manual runs

Reviewed-on: #47
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 17:32:04 +00:00
EIREXE 0dc5d0392d Add production build pipeline (#46)
CI / build-and-test (push) Successful in 1m8s
CI / production-build (push) Successful in 4m39s
## Summary
- split development dynamic linking from production builds
- add headless processed-asset generation
- add a separate production CI cache and static Bevy/Rust linkage verification
- keep custom debug features enabled for production builds behind a feature gate

Reviewed-on: #46
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 17:04:18 +00:00
EIREXE 804e5e37e0 Implement damage UI, damage and stale moves. (#45)
CI / build-and-test (push) Successful in 1m30s
Reviewed-on: #45
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 15:40:44 +00:00
19 changed files with 402 additions and 151 deletions
+84
View File
@@ -50,3 +50,87 @@ jobs:
- name: Run unit tests
run: cargo test --locked --lib -j 4
production-build:
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- name: Check out source
uses: actions/checkout@v4
- name: Install Rust toolchain
run: |
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-2026-09-14 --profile minimal
- name: Install Windows build tooling
run: |
"$HOME/.cargo/bin/rustup" target add x86_64-pc-windows-msvc --toolchain nightly-2026-09-14
"$HOME/.cargo/bin/cargo" install cargo-xwin --locked
- name: Cache production Rust dependencies and build artifacts
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
with:
prefix-key: v2-rust
shared-key: linux-nightly-production
cache-bin: false
- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends -y \
clang \
libasound2-dev \
libudev-dev \
libusb-1.0-0-dev \
libwayland-dev \
libx11-dev \
libxkbcommon-dev \
libxkbcommon-x11-0 \
lld \
mesa-vulkan-drivers \
mold \
pkg-config
- name: Preprocess assets
run: cargo run --locked --bin process-assets --no-default-features --features debug_features -j 4
- name: Build production binary
run: cargo build --locked --profile production --no-default-features --features debug_features -j 4
- name: Build Windows production binary
run: cargo xwin build --locked --target x86_64-pc-windows-msvc --profile production --no-default-features --features debug_features -j 4 --bin shinespark
- name: Verify production binary is not Bevy/Rust dynamically linked
run: |
! readelf -d target/production/shinespark | grep -E 'libbevy_dylib|libstd-.*\.so'
- name: Package Linux Steam depot
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
run: |
mkdir -p build/game
cp target/production/shinespark build/game/shinespark
cp target/x86_64-pc-windows-msvc/production/shinespark.exe build/game/shinespark.exe
cp -R imported_assets build/game/imported_assets
- if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: CyberAndrii/steam-totp@v1
name: Generate Steam TOTP
id: steam-totp
with:
shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
- name: Deploy Linux build to Steam
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: game-ci/steam-deploy@v3
with:
username: ${{ secrets.STEAM_USERNAME }}
password: ${{ secrets.STEAM_PASSWORD }}
totp: ${{ steps.steam-totp.outputs.code }}
appId: 3409670
buildDescription: ${{ github.sha }}
rootPath: build
depot1Path: game
releaseBranch: master
Generated
+6 -118
View File
@@ -94,12 +94,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "adler32"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "ahash"
version = "0.8.12"
@@ -2096,14 +2090,6 @@ dependencies = [
"thread_local",
]
[[package]]
name = "bevy_wind_waker_shader"
version = "0.6.0"
source = "git+https://github.com/lavaeater/bevy_wind_waker_shader.git#1b017c3ef6a4fbdaff115df9ec5ae4954b2fb6ba"
dependencies = [
"bevy",
]
[[package]]
name = "bevy_window"
version = "0.19.0"
@@ -2232,32 +2218,6 @@ dependencies = [
"varinteger",
]
[[package]]
name = "bitfields"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca5a55e8cbc3b75d1f002a3b62261ab67954755f7e7866f079b8aa63a409b549"
dependencies = [
"bitfields-impl",
]
[[package]]
name = "bitfields-impl"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "797cb6b6e8d5e8c2ecbb5ef52b7c273596d58ce1ab79ef2a6c38fa8dca0817c5"
dependencies = [
"derive_more",
"getset",
"proc-macro2",
"quote",
"rustversion",
"strum",
"strum_macros",
"syn 2.0.119",
"thiserror 2.0.19",
]
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -3242,16 +3202,6 @@ dependencies = [
"windows-sys 0.60.2",
]
[[package]]
name = "filetime"
version = "0.2.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
dependencies = [
"cfg-if",
"libc",
]
[[package]]
name = "find-msvc-tools"
version = "0.1.9"
@@ -3468,9 +3418,9 @@ dependencies = [
[[package]]
name = "gc-adapter-neo"
version = "1.1.0"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "120a5b3858ae854c4674ae41a38173e8ea04b814fb3212fd3bdd1b04d414a9d7"
checksum = "a8d3e10c6c4b928cb559f641765ebaa40f5f099bf51bc0227af7431859f8bd84"
dependencies = [
"binread",
"modular-bitfield",
@@ -3523,17 +3473,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "getset"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cf442baaabe4213ce7d1239afc26c039180b6456da2cededa316ae2c8a77a77"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.119",
]
[[package]]
name = "ggrs"
version = "0.13.0"
@@ -4311,26 +4250,6 @@ version = "0.2.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
[[package]]
name = "libflate"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
dependencies = [
"adler32",
"crc32fast",
"libflate_lz77",
]
[[package]]
name = "libflate_lz77"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
dependencies = [
"rle-decode-fast",
]
[[package]]
name = "libloading"
version = "0.8.9"
@@ -4371,15 +4290,13 @@ dependencies = [
[[package]]
name = "libusb1-sys"
version = "0.4.4"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703"
checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f"
dependencies = [
"cc",
"libc",
"libflate",
"pkg-config",
"tar",
"vcpkg",
]
@@ -5885,12 +5802,6 @@ dependencies = [
"syn 2.0.119",
]
[[package]]
name = "rle-decode-fast"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "robust"
version = "1.2.0"
@@ -5961,9 +5872,9 @@ dependencies = [
[[package]]
name = "rusb"
version = "0.6.5"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f32cd45962594f9f8cd4547b5757132715600e2c8840aa9ccd3d1a9ed6fdc6"
checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4"
dependencies = [
"libc",
"libusb1-sys",
@@ -6170,9 +6081,7 @@ dependencies = [
"bevy_asset_loader",
"bevy_egui",
"bevy_ggrs",
"bevy_wind_waker_shader",
"bincode",
"bitfields",
"clap",
"enum_cycling",
"enum_cycling_derive",
@@ -6542,17 +6451,6 @@ dependencies = [
"slotmap",
]
[[package]]
name = "tar"
version = "0.4.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
dependencies = [
"filetime",
"libc",
"xattr",
]
[[package]]
name = "termcolor"
version = "1.4.1"
@@ -7958,16 +7856,6 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
[[package]]
name = "xattr"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
dependencies = [
"libc",
"rustix 1.1.4",
]
[[package]]
name = "xcursor"
version = "0.3.11"
+13 -4
View File
@@ -6,8 +6,13 @@ authors = [""]
[workspace]
[features]
default = ["development", "debug_features"]
development = ["bevy/dynamic_linking", "bevy/file_watcher"]
debug_features = ["bevy/free_camera"]
[dependencies]
bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "dynamic_linking", "free_camera", "file_watcher", "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.
@@ -22,15 +27,13 @@ serde_json = "1.0.145"
bincode = "1.3.3"
gltf = "1.4.1"
ron = "0.12.0"
bitfields = "3.0.0"
clap = { version = "4.6.6", features = ["derive"] }
bevy_wind_waker_shader = { git = "https://github.com/lavaeater/bevy_wind_waker_shader.git" }
fixed = { version = "1.31.0", features = ["serde", "serde-str"] }
strum = "0.28.0"
strum_macros = "0.28.0"
bevy_asset_loader = "0.27.0"
ron_asset_manager = "0.9.0"
gc-adapter-neo = { version = "1.1.0", features = ["libusb"] }
gc-adapter-neo = { version = "1.1.1", features = ["libusb"] }
rhai = "1.26.0"
enum_cycling = "0.2.1"
enum_cycling_derive = "0.2.1"
@@ -39,3 +42,9 @@ fixed_math = "0.4.1"
# Enable a large amount of optimization in the dev profile for dependencies.
[profile.dev.package."*"]
opt-level = 3
[profile.production]
inherits = "release"
lto = "thin"
codegen-units = 1
strip = "symbols"
+18
View File
@@ -13,3 +13,21 @@ cargo run -- --debug-match --players 2 --local-port 7000 \
cargo run -- --debug-match --players 2 --local-port 7001 \
--net-player 0=127.0.0.1:7000 --net-player 1=local
```
## 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.
Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

+36
View File
@@ -0,0 +1,36 @@
use bevy::{
app::ScheduleRunnerPlugin,
asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
gltf::GltfPlugin,
image::{CompressedImageFormats, ImageLoader, ImagePlugin},
prelude::*,
tasks::block_on,
text::TextPlugin,
};
use shinespark::AssetProcessingPlugin;
use std::{process::ExitCode, time::Duration};
fn main() -> ExitCode {
let mut app = App::new();
app.add_plugins(MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_millis(50))))
.add_plugins(AssetPlugin {
mode: AssetMode::Processed,
use_asset_processor_override: Some(true),
..default()
})
.add_plugins((ImagePlugin::default(), TextPlugin, GltfPlugin::default()))
.register_asset_loader(ImageLoader::new(CompressedImageFormats::NONE))
.add_plugins(AssetProcessingPlugin)
.add_systems(Update, finish_when_processed);
app.run();
ExitCode::SUCCESS
}
fn finish_when_processed(processor: Option<Res<AssetProcessor>>, mut exit: MessageWriter<AppExit>) {
if processor
.is_some_and(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
{
exit.write(AppExit::Success);
}
}
+8 -1
View File
@@ -32,9 +32,15 @@ use crate::{
#[derive(Deref, Component, Default, Hash, Debug, Copy, Clone)]
pub struct FighterKnockbackVelocity(pub FGVec2);
#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash)]
#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash, PartialEq)]
pub struct FighterDamage(FGi32);
impl std::fmt::Display for FighterDamage {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:.2}", self.0)
}
}
#[derive(Debug, Hash, Clone)]
pub enum HitReactionKind {
Flinch,
@@ -48,6 +54,7 @@ pub struct FighterHitReaction {
pub hitstop_frames: HitStop,
pub hitstun_frames: u32,
pub kind: HitReactionKind,
pub damage: FighterDamage,
}
#[derive(Component, DerefMut, Deref, Debug, Default, Hash, Clone)]
+19 -5
View File
@@ -11,9 +11,9 @@ use crate::{
pub fn resolve_fighter_hits(
mut pending_hits: ResMut<FighterPendingHits>,
mut attacker: Query<(
&FighterStaleMoveQueue,
&mut FighterStaleMoveQueue,
&FighterFacingDirection,
&FighterHitboxes,
&mut FighterHitboxes,
&Player,
&mut FighterHitstop,
&mut FighterHitstopShake,
@@ -42,7 +42,7 @@ pub fn resolve_fighter_hits(
let damage_data = hits[hit_offset..next_defender]
.iter()
.filter_map(|hit| {
let Ok((stale_move_queue, facing_dir, _hitboxes, player, _, _)) =
let Ok((stale_move_queue, facing_dir, _, player, _, _)) =
attacker.get(hit.attacker)
else {
return None;
@@ -52,7 +52,6 @@ pub fn resolve_fighter_hits(
let damage_received = stale_move_queue
.get_attack_damage_multiplier(hit.attack_kind)
* hitbox.damage.0;
Some((
hit.attacker,
damage_received,
@@ -90,6 +89,7 @@ pub fn resolve_fighter_hits(
angle
};
// Attacker hitstop and data
let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
reactions.push((
attacker_entity,
@@ -100,6 +100,7 @@ pub fn resolve_fighter_hits(
hitstun_frames: knockback.get_hitstun_frames(&game_settings),
hitstop_frames: hitstop,
kind: HitReactionKind::Flinch,
damage: FighterDamage(attack_damage)
},
));
}
@@ -107,7 +108,7 @@ pub fn resolve_fighter_hits(
receiver_damage.0 += total_damage_received_this_frame;
for (attacker_entity, _, reaction) in &reactions {
let Ok((.., mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
let Ok((.., _, mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
continue;
};
@@ -134,6 +135,19 @@ pub fn resolve_fighter_hits(
hit_offset = next_defender;
}
for hit in hits {
let Ok((mut stale_move_queue, _facing_direction, mut hitboxes, ..)) = attacker.get_mut(hit.attacker) else {
continue;
};
if let Some(ref mut hitbox) = hitboxes.0 {
if !hitbox.stalled {
hitbox.stalled = true;
stale_move_queue.push(hitbox.kind);
}
}
}
Ok(())
}
+11 -2
View File
@@ -151,7 +151,10 @@ type FighterBakeProcessor = LoadTransformAndSave<
>;
pub struct BakedAnimationPlugin;
impl Plugin for BakedAnimationPlugin {
pub struct BakedAnimationAssetProcessingPlugin;
impl Plugin for BakedAnimationAssetProcessingPlugin {
fn build(&self, app: &mut App) {
app.init_asset::<BakedFighterAnimations>()
.register_asset_loader(FighterBakeSourceLoader)
@@ -160,7 +163,13 @@ impl Plugin for BakedAnimationPlugin {
FighterBakeTransformer,
BakedFighterAnimationsSaver,
))
.set_default_asset_processor::<FighterBakeProcessor>("fighterbake")
.set_default_asset_processor::<FighterBakeProcessor>("fighterbake");
}
}
impl Plugin for BakedAnimationPlugin {
fn build(&self, app: &mut App) {
app.add_plugins(BakedAnimationAssetProcessingPlugin)
.add_systems(
bevy_ggrs::prelude::GgrsSchedule,
super::runtime::update_fighter_bone_matrices
+1 -1
View File
@@ -4,7 +4,7 @@ mod asset_baking;
mod runtime;
mod visual_binding;
pub use asset_baking::BakedAnimationPlugin;
pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
pub use crate::math::fixed_transform::FixedMat4;
pub use runtime::{
BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
+1
View File
@@ -259,6 +259,7 @@ pub struct FighterActiveAttack {
pub active_hitboxes: Vec<usize>,
pub solved_hitboxes: Vec<attack::FighterSolvedHitbox>,
pub hit_fighters: Vec<Entity>,
pub stalled: bool
}
#[derive(Component, Clone, Debug, Default, Hash)]
+1 -1
View File
@@ -47,13 +47,13 @@ impl FighterStateImpl for GroundAttackState {
fn on_enter(&mut self, state_context: &mut EnterContext) {
state_context.play_animation(self.attack_kind.get_animation(), false);
let script = state_context.attack_script_assets.scripts[&self.attack_kind].clone();
state_context.stale_move_queue.push(self.attack_kind);
state_context.hitboxes.0 = Some(crate::fighter::FighterActiveAttack {
kind: self.attack_kind,
script,
active_hitboxes: Vec::new(),
solved_hitboxes: Vec::new(),
hit_fighters: Vec::new(),
stalled: false
});
}
+41 -8
View File
@@ -28,13 +28,17 @@ use bevy::{
tasks::block_on,
};
use bevy_asset_loader::prelude::*;
use bevy_wind_waker_shader::prelude::*;
use clap::Parser;
use ron_asset_manager::RonAssetPlugin;
use crate::{
camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
camera::MatchCameraPlugin,
fighter::manifest::FighterManifest,
game_settings::GameSettings,
menus::style::FGUiStyle,
schedule::GameplaySchedulePlugin,
stage::manifest::StageManifest,
ui::InGameUIPlugin,
};
mod args;
@@ -53,6 +57,7 @@ pub mod schedule;
pub mod scripting;
pub mod stage;
pub mod texture_reference;
pub mod ui;
#[derive(States, Debug, Clone, Copy, Eq, PartialEq, Hash, Default)]
pub enum AppState {
@@ -81,6 +86,20 @@ pub enum AppState {
#[derive(Default)]
pub struct GamePlugin;
/// Registers every custom asset loader used by the game and asset processor.
pub struct GameAssetPlugin;
impl Plugin for GameAssetPlugin {
fn build(&self, app: &mut App) {
app.add_plugins((
RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
RonAssetPlugin::<StageManifest>::create("stage.ron"),
RonAssetPlugin::<GameSettings>::create("ron"),
RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"),
));
}
}
impl Plugin for GamePlugin {
fn build(&self, app: &mut App) {
// Each module owns its own systems, rollback registrations and
@@ -89,7 +108,6 @@ impl Plugin for GamePlugin {
app.init_state::<AppState>()
.add_plugins((
SettingsPlugin::new("moe.eirteam.shinespark.debug_settings"),
WindWakerShaderPlugin::default(),
// Brings up GGRS (and with it `GgrsSchedule`), so it goes first.
netcode::FighterNetcodePlugin::default(),
GameplaySchedulePlugin,
@@ -101,9 +119,8 @@ impl Plugin for GamePlugin {
scripting::importer::FighterScriptImportPlugin,
stage::StagePlugin,
MatchCameraPlugin,
RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
RonAssetPlugin::<StageManifest>::create("stage.ron"),
RonAssetPlugin::<GameSettings>::create("ron"),
GameAssetPlugin,
InGameUIPlugin,
))
.add_plugins(menus::MenuPlugin)
.add_loading_state(
@@ -156,11 +173,27 @@ impl Plugin for GamePlugin {
}
}
/// Registers the custom asset loaders and processors used by CI and release
/// builds. The processing binary adds this plugin without starting the game.
pub struct AssetProcessingPlugin;
impl Plugin for AssetProcessingPlugin {
fn build(&self, app: &mut App) {
app.add_plugins((
GameAssetPlugin,
scripting::importer::FighterScriptImportPlugin,
fighter::baked_animation::BakedAnimationAssetProcessingPlugin,
));
}
}
fn wait_for_asset_processor(
processor: Option<Res<AssetProcessor>>,
mut next_state: ResMut<NextState<AppState>>,
) {
if processor.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
if !cfg!(feature = "development")
|| processor
.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
{
next_state.set(AppState::LoadCommonAssets);
}
+16 -7
View File
@@ -1,8 +1,11 @@
use bevy::asset::AssetMode::Processed;
#[cfg(feature = "debug_features")]
use bevy::camera_controller::free_camera::FreeCameraPlugin;
use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor};
use bevy::prelude::*;
#[cfg(feature = "debug_features")]
use bevy_egui::EguiPlugin;
#[cfg(feature = "debug_features")]
use bevy_inspector_egui::quick::WorldInspectorPlugin;
fn main() -> AppExit {
@@ -20,16 +23,22 @@ fn main() -> AppExit {
})
.set(AssetPlugin {
mode: Processed,
use_asset_processor_override: Some(cfg!(feature = "development")),
..default()
});
App::new()
.add_plugins(default_plugins)
let mut app = App::new();
app.add_plugins(default_plugins)
.add_plugins(avian3d::prelude::PhysicsPlugins::default())
.add_plugins(shinespark::GamePlugin)
.add_plugins(FreeCameraPlugin)
.add_plugins(EguiPlugin::default())
.add_plugins(WorldInspectorPlugin::default()) // adds default options and `InspectorEguiImpl`s
.insert_resource(Time::<Fixed>::from_hz(60.0))
.run()
.insert_resource(Time::<Fixed>::from_hz(60.0));
#[cfg(feature = "debug_features")]
app.add_plugins((
FreeCameraPlugin,
EguiPlugin::default(),
WorldInspectorPlugin::default(),
));
app.run()
}
+1 -4
View File
@@ -6,12 +6,10 @@ use bevy::{
prelude::*,
};
use ron_asset_manager::RonAssetPlugin;
use crate::{
AppState,
game_settings::CommonAssets,
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle},
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
};
pub mod button;
pub mod character_select;
@@ -222,7 +220,6 @@ impl Plugin for MenuPlugin {
//---------
// STAGE SELECT END
//---------
.add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
.add_systems(
Update,
(
+57
View File
@@ -0,0 +1,57 @@
use bevy::prelude::*;
use crate::{
fighter::manifest::{FighterManifest, FighterManifestRegistry}, match_loading::{PendingMatch}, ui::{errors::UIErrors, fighter_info::FighterInfoUI},
};
#[derive(Component, FromTemplate)]
pub struct BattleUI {
}
pub fn spawn_battle_ui(mut commands: Commands, request: Res<PendingMatch>, fighter_registry: Res<FighterManifestRegistry>, manifests: Res<Assets<FighterManifest>>) -> Result {
let mut fighter_uis = vec![];
for player in &request.players {
let manifest = fighter_registry.get(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));
}
let scene = bsn! {
BattleUI {
}
Node {
width: percent(100),
height: percent(100),
flex_direction: FlexDirection::Column,
align_items: AlignItems::Center,
justify_content: JustifyContent::End,
}
Children [
(
#FighterInfos
Node {
width: percent(100),
flex_direction: FlexDirection::Row,
align_items: AlignItems::End,
justify_content: JustifyContent::SpaceEvenly,
}
Children [
{fighter_uis}
]
)
]
};
commands.spawn_scene(scene);
Ok(())
}
pub fn cleanup_battle_ui(mut commands: Commands, battle_ui: Query<Entity, With<BattleUI>>) {
for entity in battle_ui {
commands.entity(entity).despawn();
}
}
+14
View File
@@ -0,0 +1,14 @@
use bevy::{scene::SpawnSceneError};
use crate::{fighter::FighterId};
#[derive(thiserror::Error, Debug)]
pub enum UIErrors {
#[error("Scene spawn failed: {0:?}")]
SceneSpawnFailed(#[from] SpawnSceneError),
#[error("Fighter manifest handle not found for fighter id {0:?}")]
FighterManifestHandleNotFound(FighterId),
#[error("Fighter manifest not found for fighter id {0:?}")]
FighterManifestNotFound(FighterId),
}
+57
View File
@@ -0,0 +1,57 @@
use bevy::prelude::*;
use crate::{fighter::{attack::FighterDamage, manifest::{FighterManifest}}, match_loading::MatchPlayer, player::Player};
#[derive(Component, FromTemplate)]
pub struct FighterInfoUI {
percentage_text: Entity,
_name_text: Entity,
player_handle: usize,
visible_damage: FighterDamage,
}
impl FighterInfoUI {
pub fn build(_manifest: &FighterManifest, match_player: &MatchPlayer) -> impl Scene {
let fighter_name = "El grande padre";
bsn! {
FighterInfoUI {
percentage_text: #PercentageText,
_name_text: #NameText,
player_handle: {match_player.handle}
}
Node {
flex_direction: FlexDirection::Column,
align_items: AlignItems::Center,
justify_content: JustifyContent::Center,
}
Children [
(
#PercentageText
Text("0.00%")
TextFont {
font_size: px(crate::menus::style::H2_SIZE),
}
),
(
#NameText
Text({fighter_name})
)
]
}
}
}
pub fn update_fighter_info_damage(fighters: Query<(&Player, &FighterDamage)>, ui_elements: Query<&mut FighterInfoUI>, mut commands: Commands) {
for mut ui_element in ui_elements {
let Some((_, damage)) = fighters.iter().find(|(player, _)| {
player.handle == ui_element.player_handle
}) else {
continue;
};
if *damage != ui_element.visible_damage {
commands.entity(ui_element.percentage_text).insert(Text(format!("{}%", damage)));
ui_element.visible_damage = damage.clone();
}
}
}
+18
View File
@@ -0,0 +1,18 @@
use bevy::prelude::*;
use crate::AppState;
pub mod battle_ui;
pub mod errors;
pub mod fighter_info;
#[derive(Default)]
pub struct InGameUIPlugin;
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);
}
}