Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e10f0848bc |
@@ -21,8 +21,6 @@ jobs:
|
|||||||
sh -s -- -y --profile minimal
|
sh -s -- -y --profile minimal
|
||||||
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
||||||
"$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
|
"$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
|
||||||
"$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 Rust dependencies and build artifacts
|
- name: Cache Rust dependencies and build artifacts
|
||||||
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
|
||||||
@@ -43,7 +41,6 @@ jobs:
|
|||||||
libx11-dev \
|
libx11-dev \
|
||||||
libxkbcommon-dev \
|
libxkbcommon-dev \
|
||||||
libxkbcommon-x11-0 \
|
libxkbcommon-x11-0 \
|
||||||
lld \
|
|
||||||
mesa-vulkan-drivers \
|
mesa-vulkan-drivers \
|
||||||
mold \
|
mold \
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -97,37 +94,6 @@ jobs:
|
|||||||
- name: Build production binary
|
- name: Build production binary
|
||||||
run: cargo build --locked --profile production --no-default-features --features debug_features -j 4
|
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
|
- name: Verify production binary is not Bevy/Rust dynamically linked
|
||||||
run: |
|
run: |
|
||||||
! readelf -d target/production/shinespark | grep -E 'libbevy_dylib|libstd-.*\.so'
|
! 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
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
@@ -1,11 +1,8 @@
|
|||||||
use bevy::{
|
use bevy::{
|
||||||
app::ScheduleRunnerPlugin,
|
app::ScheduleRunnerPlugin,
|
||||||
asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
|
asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
|
||||||
gltf::GltfPlugin,
|
|
||||||
image::{CompressedImageFormats, ImageLoader, ImagePlugin},
|
|
||||||
prelude::*,
|
prelude::*,
|
||||||
tasks::block_on,
|
tasks::block_on,
|
||||||
text::TextPlugin,
|
|
||||||
};
|
};
|
||||||
use shinespark::AssetProcessingPlugin;
|
use shinespark::AssetProcessingPlugin;
|
||||||
use std::{process::ExitCode, time::Duration};
|
use std::{process::ExitCode, time::Duration};
|
||||||
@@ -18,8 +15,6 @@ fn main() -> ExitCode {
|
|||||||
use_asset_processor_override: Some(true),
|
use_asset_processor_override: Some(true),
|
||||||
..default()
|
..default()
|
||||||
})
|
})
|
||||||
.add_plugins((ImagePlugin::default(), TextPlugin, GltfPlugin::default()))
|
|
||||||
.register_asset_loader(ImageLoader::new(CompressedImageFormats::NONE))
|
|
||||||
.add_plugins(AssetProcessingPlugin)
|
.add_plugins(AssetProcessingPlugin)
|
||||||
.add_systems(Update, finish_when_processed);
|
.add_systems(Update, finish_when_processed);
|
||||||
|
|
||||||
|
|||||||
+6
-25
@@ -32,13 +32,7 @@ use clap::Parser;
|
|||||||
use ron_asset_manager::RonAssetPlugin;
|
use ron_asset_manager::RonAssetPlugin;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
camera::MatchCameraPlugin,
|
camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest, ui::InGameUIPlugin,
|
||||||
fighter::manifest::FighterManifest,
|
|
||||||
game_settings::GameSettings,
|
|
||||||
menus::style::FGUiStyle,
|
|
||||||
schedule::GameplaySchedulePlugin,
|
|
||||||
stage::manifest::StageManifest,
|
|
||||||
ui::InGameUIPlugin,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mod args;
|
mod args;
|
||||||
@@ -86,20 +80,6 @@ pub enum AppState {
|
|||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct GamePlugin;
|
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 {
|
impl Plugin for GamePlugin {
|
||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
// Each module owns its own systems, rollback registrations and
|
// Each module owns its own systems, rollback registrations and
|
||||||
@@ -119,7 +99,9 @@ impl Plugin for GamePlugin {
|
|||||||
scripting::importer::FighterScriptImportPlugin,
|
scripting::importer::FighterScriptImportPlugin,
|
||||||
stage::StagePlugin,
|
stage::StagePlugin,
|
||||||
MatchCameraPlugin,
|
MatchCameraPlugin,
|
||||||
GameAssetPlugin,
|
RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
|
||||||
|
RonAssetPlugin::<StageManifest>::create("stage.ron"),
|
||||||
|
RonAssetPlugin::<GameSettings>::create("ron"),
|
||||||
InGameUIPlugin,
|
InGameUIPlugin,
|
||||||
))
|
))
|
||||||
.add_plugins(menus::MenuPlugin)
|
.add_plugins(menus::MenuPlugin)
|
||||||
@@ -173,14 +155,13 @@ impl Plugin for GamePlugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Registers the custom asset loaders and processors used by CI and release
|
/// Registers only the custom asset processors used by CI and release builds.
|
||||||
/// builds. The processing binary adds this plugin without starting the game.
|
/// The processing binary adds this plugin without starting the game.
|
||||||
pub struct AssetProcessingPlugin;
|
pub struct AssetProcessingPlugin;
|
||||||
|
|
||||||
impl Plugin for AssetProcessingPlugin {
|
impl Plugin for AssetProcessingPlugin {
|
||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
app.add_plugins((
|
app.add_plugins((
|
||||||
GameAssetPlugin,
|
|
||||||
scripting::importer::FighterScriptImportPlugin,
|
scripting::importer::FighterScriptImportPlugin,
|
||||||
fighter::baked_animation::BakedAnimationAssetProcessingPlugin,
|
fighter::baked_animation::BakedAnimationAssetProcessingPlugin,
|
||||||
));
|
));
|
||||||
|
|||||||
+4
-1
@@ -6,10 +6,12 @@ use bevy::{
|
|||||||
prelude::*,
|
prelude::*,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use ron_asset_manager::RonAssetPlugin;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
AppState,
|
AppState,
|
||||||
game_settings::CommonAssets,
|
game_settings::CommonAssets,
|
||||||
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
|
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle},
|
||||||
};
|
};
|
||||||
pub mod button;
|
pub mod button;
|
||||||
pub mod character_select;
|
pub mod character_select;
|
||||||
@@ -220,6 +222,7 @@ impl Plugin for MenuPlugin {
|
|||||||
//---------
|
//---------
|
||||||
// STAGE SELECT END
|
// STAGE SELECT END
|
||||||
//---------
|
//---------
|
||||||
|
.add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
|
||||||
.add_systems(
|
.add_systems(
|
||||||
Update,
|
Update,
|
||||||
(
|
(
|
||||||
|
|||||||
Reference in New Issue
Block a user