Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e10f0848bc |
@@ -97,31 +97,3 @@ jobs:
|
||||
- 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/linux
|
||||
cp target/production/shinespark build/linux/shinespark
|
||||
cp -R assets build/linux/assets
|
||||
cp -R imported_assets build/linux/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: linux
|
||||
releaseBranch: master
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
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};
|
||||
@@ -18,8 +15,6 @@ fn main() -> ExitCode {
|
||||
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);
|
||||
|
||||
|
||||
+6
-25
@@ -32,13 +32,7 @@ use clap::Parser;
|
||||
use ron_asset_manager::RonAssetPlugin;
|
||||
|
||||
use crate::{
|
||||
camera::MatchCameraPlugin,
|
||||
fighter::manifest::FighterManifest,
|
||||
game_settings::GameSettings,
|
||||
menus::style::FGUiStyle,
|
||||
schedule::GameplaySchedulePlugin,
|
||||
stage::manifest::StageManifest,
|
||||
ui::InGameUIPlugin,
|
||||
camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest, ui::InGameUIPlugin,
|
||||
};
|
||||
|
||||
mod args;
|
||||
@@ -86,20 +80,6 @@ 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
|
||||
@@ -119,7 +99,9 @@ impl Plugin for GamePlugin {
|
||||
scripting::importer::FighterScriptImportPlugin,
|
||||
stage::StagePlugin,
|
||||
MatchCameraPlugin,
|
||||
GameAssetPlugin,
|
||||
RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
|
||||
RonAssetPlugin::<StageManifest>::create("stage.ron"),
|
||||
RonAssetPlugin::<GameSettings>::create("ron"),
|
||||
InGameUIPlugin,
|
||||
))
|
||||
.add_plugins(menus::MenuPlugin)
|
||||
@@ -173,14 +155,13 @@ 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.
|
||||
/// Registers only the custom asset 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,
|
||||
));
|
||||
|
||||
+4
-1
@@ -6,10 +6,12 @@ use bevy::{
|
||||
prelude::*,
|
||||
};
|
||||
|
||||
use ron_asset_manager::RonAssetPlugin;
|
||||
|
||||
use crate::{
|
||||
AppState,
|
||||
game_settings::CommonAssets,
|
||||
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
|
||||
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle},
|
||||
};
|
||||
pub mod button;
|
||||
pub mod character_select;
|
||||
@@ -220,6 +222,7 @@ impl Plugin for MenuPlugin {
|
||||
//---------
|
||||
// STAGE SELECT END
|
||||
//---------
|
||||
.add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
|
||||
.add_systems(
|
||||
Update,
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user