Disable Bevy Music completely on Web

benfrankel · Dec 11, 2023 · 28f8fce · 28f8fce
1 parent 6cb16bd
commit 28f8fce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/audio.rs b/src/audio.rs
@@ -9,9 +9,12 @@ pub struct AudioPlugin;
 
 impl Plugin for AudioPlugin {
     fn build(&self, app: &mut App) {
+        app.add_plugins(KiraAudioPlugin)
+            .init_collection::<AudioAssets>();
+
+        // Music will be played by Web Audio API on web.
+        #[cfg(not(feature = "web"))]
         app.register_type::<BackgroundMusic>()
-            .add_plugins(KiraAudioPlugin)
-            .init_collection::<AudioAssets>()
             .init_resource::<BackgroundMusic>()
             .add_systems(Startup, spawn_background_music);
     }
@@ -45,6 +48,7 @@ pub struct AudioAssets {
     pub guitar_sounds: Vec<Handle<AudioSource>>,
     #[asset(paths("audio/unicorn0.ogg", "audio/unicorn1.ogg"), collection(typed))]
     pub unicorn_sounds: Vec<Handle<AudioSource>>,
+    #[cfg(not(feature = "web"))]
     #[asset(path = "music/ingame.ogg")]
     pub music: Handle<AudioSource>,
 }
@@ -67,10 +71,12 @@ impl AudioAssets {
     }
 }
 
+#[cfg(not(feature = "web"))]
 #[derive(Resource, Reflect, Default)]
 #[reflect(Resource)]
 pub struct BackgroundMusic(pub Handle<AudioInstance>);
 
+#[cfg(not(feature = "web"))]
 fn spawn_background_music(
     mut commands: Commands,
     audio: Res<Audio>,

diff --git a/src/upgrade.rs b/src/upgrade.rs
@@ -10,6 +10,7 @@ use rand::thread_rng;
 use strum::EnumCount;
 
 use crate::audio::AudioAssets;
+#[cfg(not(feature = "web"))]
 use crate::audio::BackgroundMusic;
 use crate::audio::SoundEffectKind;
 use crate::config::Config;
@@ -867,7 +868,9 @@ generate_upgrade_list!(
             mut commands: Commands,
             root: Res<AppRoot>,
             config: Res<Config>,
+            #[cfg(not(feature = "web"))]
             music: Res<BackgroundMusic>,
+            #[cfg(not(feature = "web"))]
             mut audio_instances: ResMut<Assets<AudioInstance>>,
         | {
             commands.entity(root.ui).despawn_descendants();
@@ -898,7 +901,9 @@ generate_upgrade_list!(
             mut commands: Commands,
             root: Res<AppRoot>,
             config: Res<Config>,
+            #[cfg(not(feature = "web"))]
             music: Res<BackgroundMusic>,
+            #[cfg(not(feature = "web"))]
             mut audio_instances: ResMut<Assets<AudioInstance>>,
         | {
             commands.entity(root.ui).despawn_descendants();
@@ -929,7 +934,9 @@ generate_upgrade_list!(
             mut commands: Commands,
             root: Res<AppRoot>,
             config: Res<Config>,
+            #[cfg(not(feature = "web"))]
             music: Res<BackgroundMusic>,
+            #[cfg(not(feature = "web"))]
             mut audio_instances: ResMut<Assets<AudioInstance>>,
         | {
             commands.entity(root.ui).despawn_descendants();