Embed assets in binary

manuelmauro · Apr 18, 2024 · 1d442a2 · 1d442a2
1 parent 380f8c2
commit 1d442a2
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ bevy_egui = { version = "0.26.0", default-features = false, features = [
     "default_fonts",
     "render",
 ] }
+bevy_embedded_assets = "0.10.2"
 bevy_kira_audio = "0.19.0"
 image = "0.25.0"
 rand = "0.8.5"

diff --git a/src/asset.rs b/src/asset.rs
@@ -4,20 +4,20 @@ use bevy_kira_audio::AudioSource;
 
 #[derive(AssetCollection, Resource)]
 pub struct AudioAssets {
-    #[asset(path = "audio/c.ogg")]
+    #[asset(path = "embedded://audio/c.ogg")]
     pub c: Handle<AudioSource>,
-    #[asset(path = "audio/h.ogg")]
+    #[asset(path = "embedded://audio/h.ogg")]
     pub h: Handle<AudioSource>,
-    #[asset(path = "audio/k.ogg")]
+    #[asset(path = "embedded://audio/k.ogg")]
     pub k: Handle<AudioSource>,
-    #[asset(path = "audio/l.ogg")]
+    #[asset(path = "embedded://audio/l.ogg")]
     pub l: Handle<AudioSource>,
-    #[asset(path = "audio/q.ogg")]
+    #[asset(path = "embedded://audio/q.ogg")]
     pub q: Handle<AudioSource>,
-    #[asset(path = "audio/r.ogg")]
+    #[asset(path = "embedded://audio/r.ogg")]
     pub r: Handle<AudioSource>,
-    #[asset(path = "audio/s.ogg")]
+    #[asset(path = "embedded://audio/s.ogg")]
     pub s: Handle<AudioSource>,
-    #[asset(path = "audio/t.ogg")]
+    #[asset(path = "embedded://audio/t.ogg")]
     pub t: Handle<AudioSource>,
 }
diff --git a/src/game/ui/mod.rs b/src/game/ui/mod.rs
@@ -22,6 +22,8 @@ impl Plugin for UiPlugin {
 }
 
 pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server: Res<AssetServer>) {
+    let font = asset_server.load("embedded://fonts/FiraSans-Bold.ttf");
+
     commands
         .spawn((
             NodeBundle {
@@ -56,7 +58,7 @@ pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server:
                     parent.spawn(TextBundle::from_section(
                         format!("{}-Back", settings.n),
                         TextStyle {
-                            font: asset_server.load("fonts/FiraSans-Bold.ttf"),
+                            font: font.clone(),
                             font_size: 40.0,
                             color: Color::rgb(0.9, 0.9, 0.9),
                         },
@@ -65,7 +67,7 @@ pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server:
                         TextBundle::from_section(
                             "11/24",
                             TextStyle {
-                                font: asset_server.load("fonts/FiraSans-Bold.ttf"),
+                                font: font.clone(),
                                 font_size: 40.0,
                                 color: Color::rgb(0.9, 0.9, 0.9),
                             },
@@ -109,7 +111,7 @@ pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server:
                             parent.spawn(TextBundle::from_section(
                                 "Position (A)",
                                 TextStyle {
-                                    font: asset_server.load("fonts/FiraSans-Bold.ttf"),
+                                    font: font.clone(),
                                     font_size: 20.0,
                                     color: Color::rgb(0.9, 0.9, 0.9),
                                 },
@@ -137,7 +139,7 @@ pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server:
                             parent.spawn(TextBundle::from_section(
                                 "Sound (S)",
                                 TextStyle {
-                                    font: asset_server.load("fonts/FiraSans-Bold.ttf"),
+                                    font: font.clone(),
                                     font_size: 20.0,
                                     color: Color::rgb(0.9, 0.9, 0.9),
                                 },
@@ -165,7 +167,7 @@ pub fn setup(mut commands: Commands, settings: Res<GameSettings>, asset_server:
                             parent.spawn(TextBundle::from_section(
                                 "Color (D)",
                                 TextStyle {
-                                    font: asset_server.load("fonts/FiraSans-Bold.ttf"),
+                                    font: font.clone(),
                                     font_size: 20.0,
                                     color: Color::rgb(0.9, 0.9, 0.9),
                                 },

diff --git a/src/main.rs b/src/main.rs
@@ -3,6 +3,7 @@ use bevy_asset_loader::loading_state::{
     config::ConfigureLoadingState, LoadingState, LoadingStateAppExt,
 };
 use bevy_egui::EguiPlugin;
+use bevy_embedded_assets::EmbeddedAssetPlugin;
 use bevy_kira_audio::AudioPlugin;
 use nback::{
     asset::AudioAssets, game::GamePlugin, menu::MenuPlugin, palette, splash::SplashPlugin,
@@ -18,6 +19,7 @@ fn main() {
                 .load_collection::<AudioAssets>(),
         )
         .insert_resource(ClearColor(palette::SLATE_800))
+        .add_plugins(EmbeddedAssetPlugin::default())
         .add_plugins(DefaultPlugins.set(WindowPlugin {
             primary_window: Some(Window {
                 resolution: WindowResolution::new(504., 896.).with_scale_factor_override(1.2),

diff --git a/src/menu/ui.rs b/src/menu/ui.rs
@@ -33,7 +33,7 @@ pub fn menu_ui(
     settings: Res<GameSettings>,
     scores: ResMut<LatestGameScores>,
 ) {
-    let font = asset_server.load("fonts/FiraSans-Bold.ttf");
+    let font = asset_server.load("embedded://fonts/FiraSans-Bold.ttf");
 
     commands
         .spawn((

diff --git a/src/splash/mod.rs b/src/splash/mod.rs
@@ -14,7 +14,7 @@ impl Plugin for SplashPlugin {
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let icon = asset_server.load("icon.png");
+    let icon = asset_server.load("embedded://icon.png");
 
     commands
         .spawn((