Fix processed RON assets being ignored #48

Merged
EIREXE merged 1 commits from fix/processed-asset-loaders into master 2026-09-19 18:09:41 +00:00
3 changed files with 30 additions and 10 deletions
+4
View File
@@ -1,8 +1,11 @@
use bevy::{
app::ScheduleRunnerPlugin,
asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
gltf::GltfPlugin,
image::ImagePlugin,
prelude::*,
tasks::block_on,
text::TextPlugin,
};
use shinespark::AssetProcessingPlugin;
use std::{process::ExitCode, time::Duration};
@@ -15,6 +18,7 @@ fn main() -> ExitCode {
use_asset_processor_override: Some(true),
..default()
})
.add_plugins((ImagePlugin::default(), TextPlugin, GltfPlugin::default()))
.add_plugins(AssetProcessingPlugin)
.add_systems(Update, finish_when_processed);
+25 -6
View File
@@ -32,7 +32,13 @@ use clap::Parser;
use ron_asset_manager::RonAssetPlugin;
use crate::{
camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest, ui::InGameUIPlugin,
camera::MatchCameraPlugin,
fighter::manifest::FighterManifest,
game_settings::GameSettings,
menus::style::FGUiStyle,
schedule::GameplaySchedulePlugin,
stage::manifest::StageManifest,
ui::InGameUIPlugin,
};
mod args;
@@ -80,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
@@ -99,9 +119,7 @@ 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)
@@ -155,13 +173,14 @@ impl Plugin for GamePlugin {
}
}
/// Registers only the custom asset processors used by CI and release builds.
/// The processing binary adds this plugin without starting the game.
/// 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,
));
+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,
(